Fixed up navigation

Fixes #681