Fixed the GUI a bit