More tweaks to template