refactored menus.