Updated progress bar
Updated web.js
Fixed web.js
Merge branch 'staging'
Fixed web.js