Refactoring Menus continued