Further cleaning of the GUI