Updated Activity code

Primarily in Matches Acivity, Discovery preferences, and the Discovery view.