Working match views, cleaner hero routing, deleted a lot of unused code