started refactoring the menus