MenuConstructor refactoring