Added match page
Fixed problems with match page