Minor tweaks to the template