Misc UI tweaks
Merge