Cleaned up some GUI things