Menu refactoring;