Navigation rework.