Merge pull request #599 from emmanuel-keller/master

Navigation updates