Refactor for heroku
Fixed some urls