matches page update, added helper functions to Trade model, fixed :active trade getting
resolve conflicts