Cleaned up the GUI