refactored menus