matches and detail -  design , new buttons and logic