Minor UI tweaks and fixes