Matches list item design
Merge remote-tracking branch 'origin/team_match' into team_match