Menu generation and fix to module routing