Tweaks to the templates