Added 2 listeners, moved some GUI around.
Added listeners :)