fix bug: fix nav frontend bug
Merge branch 'development'