updated some pages, working on twig