Fix up navigation (again)

Fixes #681