Made many changes to MatchView