[ui-overhaul] ui tweaks and some cleanup