147 - nav fixes

tracker 24765
Merge pull request #563 from gsn/master

147 - nav fixes