navigator: API changes, reparing to move manual modes to navigator, WIP