Added twig and clean up in index