Updated the GUI to work better