Reorganized match page.
Fixed merge conflicts.