changed layout/layout and navigation to twig