refactored the menus