A little cleanup on the GUI