Updated with extended twig layout