Navigation updates.

See #188.