Edited twig templates