Refactoring of MenuController