second stage of UI overhaul
merging in