Assorted UI tweaks