Refactoring menu - Phase 3