Refactor of MenuNavigationManager
* forgot to commit BaseMenu class :P