fix nav and active state
Merge branch 'update_nav' into develop
Merge branch 'release-0.5'