Menu refactored