Refactor menus