Cleaned up some of the GUI