Moved menu.twig in the right directory + label refactor

fixes #460