navigator update
Merge branch 'navgator'