improvements with routing and other improvements
Merge branch 'feature/menu-improvements'