Minor tweaks to UI