Fixed navigation issues
Merge pull request #239 from nwalters512/navigation_fixes

Fixed navigation issues
Merged in master