Cleaned up the gui somewhat