Fix heroku
Fix heroku
Fix heroku
Fix heroku
Improve few controllers