Fixed up navigation (again)

Refs #681