Separated View/Edit pages from Match entry pages
Separated match entry from view/edit
Fixed bugs