Various minor UI tweaks