More navigation rework