Tweaks to template