Lots of UI changes

Took out a lot of unnecessary UI stuff.