Some modifications in app.js