Fixed nav
Merge pull request #693 from UM-USElab/nav-fixes

Fixed nav