Edited twig templates
Edited twig templates