Minor ui tweaks and bug fixes