More GUI Layout

Testing event stuff