[WIP] Misc UI fixes

No issue

This fixes a few tiny UI issues I've found.

As always, I've left each commit separate so I can rip any out if desired.
As such, this needs a once-over from @JohnONolan, as there are minor UI changes here.