More UI tweaks and bug fixes