UI rework

Overhaul of the UI