added third layer for matches, new index and match component