Move some stuff to fix routing + menu for Cheetah
Merge pull request #1522 from onepercentclub/feature/fix-cheetah-menu

Move some stuff to fix routing + menu for Cheetah