[#1269] Tweaks to the templates to make them better