navigator: takeoff fixes
Merge branch 'navigator_new' into navigator_new_vector