Merge pull request #472 from franckstauffer/i18n

Various fixes and cleanups
Moved menu.twig in the right directory + label refactor

fixes #460