Refactored menus