update navbar
Merge branch 'navbar_update' into develop