More changes in twig base layout