fix route generation
Merge branch 'menu'