Tweaks to UI improvements