Update all templates to use same layout