Various tweaks to the UI