more tweaks to template