Cleaned up GUI a bunch.
Merge conflicts