refactored Matches View to put logic in Model