Some work on the GUI