Minor ui tweaks and fixes