updated app.js and controllers.js