small tweaks on the templates.