Continued little improvements to UI.
Tweaks