Minor UI tweaks

Minor UI tweaks