Menu refactoring