Fixes in app.js