Navigation fixes
Merge pull request #93 from chcculle/navigation-fixes

Navigation fixes