Major overhaul of ui.