Slight tweaking to templates.