More work on UI overhaul