Some reorganization in the objects in the menu.