Major overhaul and flattening of UI