added expand button and logic to matchs view