updates to pass cucumber tests, improved trades view