Refactoring menus