Fixed all issues relating to site and heroku