Merge pull request #84 from sammyjopeters/samsam

Navigation fixes