Tweaks to front-end