Form improved
Settings adjust for heroku