Some progress on the GUI

Buttons acting a little strange