Modified twig templates