all templates fixed