Totally fixed up everything in the GUI!