Cleaned up GUI a bit