JS Refactors

- Refactor JS for Matches page.