UI Updates

Major rehaul of UI