Fixed up the templates