Reorganizd menus.