Minor ui fixes and tweaks