refactored menus and submenus