updates to trade views and heroku config
merge fixes