Basic Cleanup and GUI Improv