Refactoring MenuHandler