Cleaning up the GUI