change progress bar
Merge branch 'change-progress-bar' into develop
fix navbar