Updated templates, prepare for heroku deploy