Fixed other templates too. Must remove some boilerplate before itnroducing new features