Ui

Overhaul of UI