fix nav-mode vs hide
Merge branch 'dev' into dist