refactor menus