Refactor of MenuNavigationManager