fix navigation layer problem
Merge branch 'Develop'