Port edited on web.js
Fixed staging bugs in develp branch