Continued work on the GUI