layout fix
matchData in match model improved speed