flight: refactor for separate navigation controller