cleaned up more menus