Update for 1.2.5.

Tweak nav logic.