second iteration of UI overhaul