Index and web.js changes