Minor tweaks to the template data