Minor UI tweaks, this and that