navigator rework