added new twig-patern, changes to routing