continuing UI overhaul