Improving workflow, adding the matches to admin screen