Minimal functional Navigator; untested
Merge remote-tracking branch 'origin/master'
some syntax fixes