Cleaned up some stuff
UI looks more like the mockup