Couple more UI tweaks