More work on the GUI