Cleaned up alot of the GUI