Tweaks to get the UI ready for release