Complete overhaul of the UI