Tweaks to public UI