188 - navigation edits

tracker #24668
Merge pull request #489 from gsn/master

188 - navigation edits