Few Tweaks to GUI

Moved some stuff around