major overhaul of UI