Fixed some navigation issues.

It’s in the subject.