diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 11184e971..11e6a1a2f 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -32,10 +32,10 @@ repos:
       #   language: system
       #   pass_filenames: false
       #   files: \.exs*$
-      - id: mix-dialyzer
-        name: "elixir: mix dialyzer"
-        entry: mix dialyzer
-        language: system
-        pass_filenames: false
-        files: \.exs*$
+      #      - id: mix-dialyzer
+      #        name: "elixir: mix dialyzer"
+      #        entry: mix dialyzer
+      #        language: system
+      #        pass_filenames: false
+      #        files: \.exs*$
       
diff --git a/lib/teiserver/moderation/libs/action_lib.ex b/lib/teiserver/moderation/libs/action_lib.ex
index 25c399808..e077c8a6f 100644
--- a/lib/teiserver/moderation/libs/action_lib.ex
+++ b/lib/teiserver/moderation/libs/action_lib.ex
@@ -7,7 +7,7 @@ defmodule Teiserver.Moderation.ActionLib do
 
   # Functions
   @spec icon :: String.t()
-  def icon, do: "fa-regular fa-exclamation"
+  def icon, do: "fa-regular fa-triangle-exclamation"
 
   @spec colour :: atom
   def colour, do: :primary
diff --git a/lib/teiserver/moderation/queries/report_group_queries.ex b/lib/teiserver/moderation/queries/report_group_queries.ex
index 115a1e56c..f1c594c4e 100644
--- a/lib/teiserver/moderation/queries/report_group_queries.ex
+++ b/lib/teiserver/moderation/queries/report_group_queries.ex
@@ -78,6 +78,14 @@ defmodule Teiserver.Moderation.ReportGroupQueries do
       where: report_groups.inserted_at >= ^datetime
   end
 
+  defp _where(query, :has_reports_of_kind, kind) do
+    from report_groups in query,
+      join: reports in assoc(report_groups, :reports),
+      where: fragment("? ~* ?", reports.type, ^kind)
+  end
+
+  defp _where(query, :has_reports_of_kind, nil), do: query
+
   @spec do_order_by(Ecto.Query.t(), list | nil) :: Ecto.Query.t()
   defp do_order_by(query, nil), do: query
 
@@ -128,6 +136,8 @@ defmodule Teiserver.Moderation.ReportGroupQueries do
     from report_groups in query,
       left_join: reports in assoc(report_groups, :reports),
       preload: [reports: reports]
+
+    # TODO add reporters here
   end
 
   # defp _preload(query, :users) do
diff --git a/lib/teiserver_web/controllers/admin/match_controller.ex b/lib/teiserver_web/controllers/admin/match_controller.ex
index 7da660709..0261e32ea 100644
--- a/lib/teiserver_web/controllers/admin/match_controller.ex
+++ b/lib/teiserver_web/controllers/admin/match_controller.ex
@@ -68,126 +68,12 @@ defmodule TeiserverWeb.Admin.MatchController do
 
   @spec show(Plug.Conn.t(), Map.t()) :: Plug.Conn.t()
   def show(conn, %{"id" => id}) do
-    match =
-      Battle.get_match!(id,
-        joins: [],
-        preload: [:members_and_users]
-      )
-
-    members =
-      match.members
-      |> Enum.sort_by(fn m -> m.user.name end, &<=/2)
-      |> Enum.sort_by(fn m -> m.team_id end, &<=/2)
-
-    match
-    |> MatchLib.make_favourite()
-    |> insert_recently(conn)
-
-    match_name = MatchLib.make_match_name(match)
-
-    rating_logs =
-      Game.list_rating_logs(
-        search: [
-          match_id: match.id
-        ]
-      )
-      |> Map.new(fn log -> {log.user_id, log} end)
-
-    # Creates a map where the party_id refers to an integer
-    # but only includes parties with 2 or more members
-    parties =
-      members
-      |> Enum.group_by(fn m -> m.party_id end)
-      |> Map.drop([nil])
-      |> Map.filter(fn {_id, members} -> Enum.count(members) > 1 end)
-      |> Map.keys()
-      |> Enum.zip(Teiserver.Helper.StylingHelper.bright_hex_colour_list())
-      |> Map.new()
-
-    # Now for balance related stuff
-    partied_players =
-      members
-      |> Enum.group_by(fn p -> p.party_id end, fn p -> p.user_id end)
-
-    groups =
-      partied_players
-      |> Enum.map(fn
-        # The nil group is players without a party, they need to
-        # be broken out of the party
-        {nil, player_id_list} ->
-          player_id_list
-          |> Enum.filter(fn userid -> rating_logs[userid] != nil end)
-          |> Enum.map(fn userid ->
-            %{userid => rating_logs[userid].value["rating_value"]}
-          end)
-
-        {_party_id, player_id_list} ->
-          player_id_list
-          |> Enum.filter(fn userid -> rating_logs[userid] != nil end)
-          |> Map.new(fn userid ->
-            {userid, rating_logs[userid].value["rating_value"]}
-          end)
-      end)
-      |> List.flatten()
-
-    past_balance =
-      BalanceLib.create_balance(groups, match.team_count, mode: :loser_picks)
-      |> Map.put(:balance_mode, :grouped)
-
-    # What about new balance?
-    new_balance = generate_new_balance_data(match)
-
-    raw_events =
-      Telemetry.list_simple_match_events(where: [match_id: match.id], preload: [:event_types])
-
-    events_by_type =
-      raw_events
-      |> Enum.group_by(
-        fn e ->
-          e.event_type.name
-        end,
-        fn _ ->
-          1
-        end
-      )
-      |> Enum.map(fn {name, vs} ->
-        {name, Enum.count(vs)}
-      end)
-      |> Enum.sort_by(fn v -> v end, &<=/2)
-
-    team_lookup =
-      members
-      |> Map.new(fn m ->
-        {m.user_id, m.team_id}
-      end)
-
-    events_by_team_and_type =
-      raw_events
-      |> Enum.group_by(
-        fn e ->
-          {team_lookup[e.user_id] || -1, e.event_type.name}
-        end,
-        fn _ ->
-          1
-        end
-      )
-      |> Enum.map(fn {key, vs} ->
-        {key, Enum.count(vs)}
-      end)
-      |> Enum.sort_by(fn v -> v end, &<=/2)
-
     conn
-    |> assign(:match, match)
-    |> assign(:match_name, match_name)
-    |> assign(:members, members)
-    |> assign(:rating_logs, rating_logs)
-    |> assign(:parties, parties)
-    |> assign(:past_balance, past_balance)
-    |> assign(:new_balance, new_balance)
-    |> assign(:events_by_type, events_by_type)
-    |> assign(:events_by_team_and_type, events_by_team_and_type)
-    |> add_breadcrumb(name: "Show: #{match_name}", url: conn.request_path)
-    |> render("show.html")
+    |> put_flash(
+      :info,
+      "/teiserver/admin/matches/:match_id is deprecated in favor of /battle/:id"
+    )
+    |> redirect(to: ~p"/battle/#{id}")
   end
 
   @spec user_show(Plug.Conn.t(), Map.t()) :: Plug.Conn.t()
@@ -229,34 +115,4 @@ defmodule TeiserverWeb.Admin.MatchController do
     |> assign(:matches, matches)
     |> render("server_index.html")
   end
-
-  defp generate_new_balance_data(match) do
-    rating_type = MatchLib.game_type(match.team_size, match.team_count)
-
-    partied_players =
-      match.members
-      |> Enum.group_by(fn p -> p.party_id end, fn p -> p.user_id end)
-
-    groups =
-      partied_players
-      |> Enum.map(fn
-        # The nil group is players without a party, they need to
-        # be broken out of the party
-        {nil, player_id_list} ->
-          player_id_list
-          |> Enum.map(fn userid ->
-            %{userid => BalanceLib.get_user_rating_rank(userid, rating_type)}
-          end)
-
-        {_party_id, player_id_list} ->
-          player_id_list
-          |> Map.new(fn userid ->
-            {userid, BalanceLib.get_user_rating_rank(userid, rating_type)}
-          end)
-      end)
-      |> List.flatten()
-
-    BalanceLib.create_balance(groups, match.team_count, mode: :loser_picks)
-    |> Map.put(:balance_mode, :grouped)
-  end
 end
diff --git a/lib/teiserver_web/controllers/moderation/report_controller.ex b/lib/teiserver_web/controllers/moderation/report_controller.ex
index 2db956243..df03e052c 100644
--- a/lib/teiserver_web/controllers/moderation/report_controller.ex
+++ b/lib/teiserver_web/controllers/moderation/report_controller.ex
@@ -55,6 +55,18 @@ defmodule TeiserverWeb.Moderation.ReportController do
         order_by: params["order"]
       )
 
+    reports =
+      case params["kind"] do
+        "Chat" ->
+          reports |> Enum.filter(fn report -> String.contains?(report.type, "chat") end)
+
+        "Actions" ->
+          reports |> Enum.filter(fn report -> String.contains?(report.type, "actions") end)
+
+        "Any" ->
+          reports
+      end
+
     target =
       if params["target_id"] do
         Account.get_user(params["target_id"])
diff --git a/lib/teiserver_web/live/battles/match/chat.ex b/lib/teiserver_web/live/battles/match/chat.ex
index 36216f19e..6177b548e 100644
--- a/lib/teiserver_web/live/battles/match/chat.ex
+++ b/lib/teiserver_web/live/battles/match/chat.ex
@@ -94,6 +94,14 @@ defmodule TeiserverWeb.Battle.MatchLive.Chat do
       end)
       |> Enum.reject(&(&1 == nil))
 
+    user_exclude_list =
+      String.trim(filters["user-raw-exclude"] || "")
+      |> String.split(",")
+      |> Enum.map(fn username ->
+        Account.get_userid_from_name(username)
+      end)
+      |> Enum.reject(&(&1 == nil))
+
     contains_filter =
       filters["message-contains"]
       |> String.trim()
@@ -102,7 +110,8 @@ defmodule TeiserverWeb.Battle.MatchLive.Chat do
       Chat.list_lobby_messages(
         search: [
           match_id: match_id,
-          user_id_in: user_id_list
+          user_id_in: user_id_list,
+          user_id_not_in: user_exclude_list
         ],
         preload: [:user],
         limit: 1_000,
@@ -183,6 +192,7 @@ defmodule TeiserverWeb.Battle.MatchLive.Chat do
       "bot-messages" => "Include bot messages",
       "message-format" => "Table",
       "user-raw-filter" => "",
+      "user-raw-exclude" => "Coordinator",
       "user-raw-highlight" => highlight_names,
       "message-contains" => "",
       "order_by" => "Oldest first"
diff --git a/lib/teiserver_web/live/battles/match/chat.html.heex b/lib/teiserver_web/live/battles/match/chat.html.heex
index 8052dc7e0..7ec685b10 100644
--- a/lib/teiserver_web/live/battles/match/chat.html.heex
+++ b/lib/teiserver_web/live/battles/match/chat.html.heex
@@ -108,6 +108,17 @@
           />
         </div>
 
+        <div class="col">
+          <.input
+            type="text"
+            label="User exclude (split with commas)"
+            name="user-raw-exclude"
+            value={@filters["user-raw-exclude"]}
+            phx-change="filter-update"
+            phx-debounce="400"
+          />
+        </div>
+
         <div :if={@filters["message-format"] == "Table"} class="col">
           <.input
             type="text"
diff --git a/lib/teiserver_web/live/battles/match/match_components.ex b/lib/teiserver_web/live/battles/match/match_components.ex
index b6a92efcb..45910b47e 100644
--- a/lib/teiserver_web/live/battles/match/match_components.ex
+++ b/lib/teiserver_web/live/battles/match/match_components.ex
@@ -67,7 +67,7 @@ defmodule TeiserverWeb.Battle.MatchComponents do
         bsname={@view_colour}
         icon={StylingHelper.icon(:admin)}
         active={false}
-        url={~p"/teiserver/admin/matches/#{@match_id}"}
+        url={~p"/battle/#{@match_id}"}
       >
         Admin view
       </.section_menu_button>
diff --git a/lib/teiserver_web/live/battles/match/show.ex b/lib/teiserver_web/live/battles/match/show.ex
index a91d119a8..bd02fcf6b 100644
--- a/lib/teiserver_web/live/battles/match/show.ex
+++ b/lib/teiserver_web/live/battles/match/show.ex
@@ -1,8 +1,8 @@
 defmodule TeiserverWeb.Battle.MatchLive.Show do
   @moduledoc false
   use TeiserverWeb, :live_view
-  alias Teiserver.{Battle, Game}
-  alias Teiserver.Battle.MatchLib
+  alias Teiserver.{Battle, Game, Account, Telemetry}
+  alias Teiserver.Battle.{MatchLib, BalanceLib}
 
   @impl true
   def mount(_params, _session, socket) do
@@ -38,10 +38,16 @@ defmodule TeiserverWeb.Battle.MatchLive.Show do
 
   defp apply_action(%{assigns: %{match_name: match_name}} = socket, :ratings, _params) do
     socket
-    |> mount_require_any(["Reviewer"])
+    |> mount_require_any(["Overwatch"])
     |> assign(:page_title, "#{match_name} - Ratings")
   end
 
+  defp apply_action(%{assigns: %{match_name: match_name}} = socket, :events, _params) do
+    socket
+    |> mount_require_any(["Overwatch"])
+    |> assign(:page_title, "#{match_name} - Events")
+  end
+
   defp apply_action(%{assigns: %{match_name: match_name}} = socket, :balance, _params) do
     socket
     |> mount_require_any(["Reviewer"])
@@ -95,12 +101,88 @@ defmodule TeiserverWeb.Battle.MatchLive.Show do
         end)
         |> Map.new()
 
+      # Now for balance related stuff
+      partied_players =
+        members
+        |> Enum.group_by(fn p -> p.party_id end, fn p -> p.user_id end)
+
+      groups =
+        partied_players
+        |> Enum.map(fn
+          # The nil group is players without a party, they need to
+          # be broken out of the party
+          {nil, player_id_list} ->
+            player_id_list
+            |> Enum.filter(fn userid -> rating_logs[userid] != nil end)
+            |> Enum.map(fn userid ->
+              %{userid => rating_logs[userid].value["rating_value"]}
+            end)
+
+          {_party_id, player_id_list} ->
+            player_id_list
+            |> Enum.filter(fn userid -> rating_logs[userid] != nil end)
+            |> Map.new(fn userid ->
+              {userid, rating_logs[userid].value["rating_value"]}
+            end)
+        end)
+        |> List.flatten()
+
+      past_balance =
+        BalanceLib.create_balance(groups, match.team_count, mode: :loser_picks)
+        |> Map.put(:balance_mode, :grouped)
+
+      # What about new balance?
+      new_balance = generate_new_balance_data(match)
+
+      raw_events =
+        Telemetry.list_simple_match_events(where: [match_id: match.id], preload: [:event_types])
+
+      events_by_type =
+        raw_events
+        |> Enum.group_by(
+          fn e ->
+            e.event_type.name
+          end,
+          fn _ ->
+            1
+          end
+        )
+        |> Enum.map(fn {name, vs} ->
+          {name, Enum.count(vs)}
+        end)
+        |> Enum.sort_by(fn v -> v end, &<=/2)
+
+      team_lookup =
+        members
+        |> Map.new(fn m ->
+          {m.user_id, m.team_id}
+        end)
+
+      events_by_team_and_type =
+        raw_events
+        |> Enum.group_by(
+          fn e ->
+            {team_lookup[e.user_id] || -1, e.event_type.name}
+          end,
+          fn _ ->
+            1
+          end
+        )
+        |> Enum.map(fn {key, vs} ->
+          {key, Enum.count(vs)}
+        end)
+        |> Enum.sort_by(fn v -> v end, &<=/2)
+
       socket
       |> assign(:match, match)
       |> assign(:match_name, match_name)
       |> assign(:members, members)
       |> assign(:rating_logs, rating_logs)
       |> assign(:parties, parties)
+      |> assign(:past_balance, past_balance)
+      |> assign(:new_balance, new_balance)
+      |> assign(:events_by_type, events_by_type)
+      |> assign(:events_by_team_and_type, events_by_team_and_type)
     else
       socket
       |> assign(:match, nil)
@@ -108,6 +190,40 @@ defmodule TeiserverWeb.Battle.MatchLive.Show do
       |> assign(:members, [])
       |> assign(:rating_logs, [])
       |> assign(:parties, %{})
+      |> assign(:past_balance, %{})
+      |> assign(:new_balance, %{})
+      |> assign(:events_by_type, %{})
+      |> assign(:events_by_team_and_type, %{})
     end
   end
+
+  defp generate_new_balance_data(match) do
+    rating_type = MatchLib.game_type(match.team_size, match.team_count)
+
+    partied_players =
+      match.members
+      |> Enum.group_by(fn p -> p.party_id end, fn p -> p.user_id end)
+
+    groups =
+      partied_players
+      |> Enum.map(fn
+        # The nil group is players without a party, they need to
+        # be broken out of the party
+        {nil, player_id_list} ->
+          player_id_list
+          |> Enum.map(fn userid ->
+            %{userid => BalanceLib.get_user_rating_rank(userid, rating_type)}
+          end)
+
+        {_party_id, player_id_list} ->
+          player_id_list
+          |> Map.new(fn userid ->
+            {userid, BalanceLib.get_user_rating_rank(userid, rating_type)}
+          end)
+      end)
+      |> List.flatten()
+
+    BalanceLib.create_balance(groups, match.team_count, mode: :loser_picks)
+    |> Map.put(:balance_mode, :grouped)
+  end
 end
diff --git a/lib/teiserver_web/live/battles/match/show.html.heex b/lib/teiserver_web/live/battles/match/show.html.heex
index eea6a6bc7..a38abbee4 100644
--- a/lib/teiserver_web/live/battles/match/show.html.heex
+++ b/lib/teiserver_web/live/battles/match/show.html.heex
@@ -35,11 +35,24 @@
         <Fontawesome.icon icon="users" style="solid" /> Players
       </.tab_nav>
 
-      <%= if @rating_logs != %{} and allow?(@current_user, "Reviewer") do %>
+      <%= if @rating_logs != %{} and allow?(@current_user, "Overwatch") do %>
         <.tab_nav url={~p"/battle/#{@match.id}/ratings"} selected={@tab == :ratings}>
           <Fontawesome.icon icon={Teiserver.Account.RatingLib.icon()} style="solid" /> Ratings
         </.tab_nav>
       <% end %>
+
+      <%= if @rating_logs != %{} and allow?(@current_user, "Overwatch") do %>
+        <.tab_nav url={~p"/battle/#{@match.id}/balance"} selected={@tab == :balance}>
+          <Fontawesome.icon icon="fa-solid fa-scale-balanced" style="solid" /> Balance
+        </.tab_nav>
+      <% end %>
+
+      <%= if @events_by_type != %{} and allow?(@current_user, "Overwatch") do %>
+        <.tab_nav url={~p"/battle/#{@match.id}/events"} selected={@tab == :events}>
+          <Fontawesome.icon icon={Teiserver.Telemetry.SimpleMatchEventLib.icon()} style="solid" />
+          Events
+        </.tab_nav>
+      <% end %>
     </.tab_header>
 
     <div :if={@tab == :overview} class="p-4">
@@ -204,7 +217,7 @@
       </table>
     </div>
 
-    <%= if allow?(@current_user, "Reviewer") do %>
+    <%= if allow?(@current_user, "Overwatch") do %>
       <div :if={@tab == :ratings and @rating_logs != %{}} class="p-4">
         <table class="table table-sm">
           <thead>
@@ -268,5 +281,74 @@
         </table>
       </div>
     <% end %>
+
+    <%= if allow?(@current_user, "Overwatch") do %>
+      <div :if={@tab == :balance} class="p-4">
+        <h4>Based on data at the time</h4>
+        <table class="table">
+          <tbody>
+            <tr>
+              <td>Team 1</td>
+              <td><%= @past_balance.ratings[1] |> round(2) %></td>
+            </tr>
+            <tr>
+              <td>Team 2</td>
+              <td><%= @past_balance.ratings[2] |> round(2) %></td>
+            </tr>
+            <tr>
+              <td>Deviation</td>
+              <td><%= @past_balance.deviation %></td>
+            </tr>
+          </tbody>
+        </table>
+
+        <textarea name="" id="" rows={Enum.count(@past_balance.logs)} class="form-control"><%= @past_balance.logs |> Enum.join("\n") %></textarea>
+
+        <hr />
+
+        <h4>If balance we made using current ratings</h4>
+        <table class="table">
+          <tbody>
+            <tr>
+              <td>Team 1</td>
+              <td><%= @new_balance.ratings[1] |> round(2) %></td>
+            </tr>
+            <tr>
+              <td>Team 2</td>
+              <td><%= @new_balance.ratings[2] |> round(2) %></td>
+            </tr>
+            <tr>
+              <td>Deviation</td>
+              <td><%= @new_balance.deviation %></td>
+            </tr>
+          </tbody>
+        </table>
+
+        <textarea name="" id="" rows={Enum.count(@new_balance.logs)} class="form-control"><%= @new_balance.logs |> Enum.join("\n") %></textarea>
+      </div>
+    <% end %>
+
+    <%= if allow?(@current_user, "Overwatch") do %>
+      <div :if={@tab == :events} class="p-4">
+        <div class="row">
+          <div class="col">
+            <h4>By type</h4>
+            <.table id="by_type" rows={@events_by_type} table_class="table-sm">
+              <:col :let={{name, _}} label="Event"><%= name %></:col>
+              <:col :let={{_, count}} label="Count"><%= count %></:col>
+            </.table>
+          </div>
+
+          <div class="col">
+            <h4>By team and type</h4>
+            <.table id="by_type" rows={@events_by_team_and_type} table_class="table-sm">
+              <:col :let={{{team, _}, _}} label="Team"><%= team + 1 %></:col>
+              <:col :let={{{_, name}, _}} label="Event"><%= name %></:col>
+              <:col :let={{_, count}} label="Count"><%= count %></:col>
+            </.table>
+          </div>
+        </div>
+      </div>
+    <% end %>
   </div>
 </div>
diff --git a/lib/teiserver_web/live/moderation/overwatch/index.ex b/lib/teiserver_web/live/moderation/overwatch/index.ex
index cd86c0c26..aae0923a0 100644
--- a/lib/teiserver_web/live/moderation/overwatch/index.ex
+++ b/lib/teiserver_web/live/moderation/overwatch/index.ex
@@ -56,6 +56,7 @@ defmodule TeiserverWeb.Moderation.OverwatchLive.Index do
         %{
           "actioned-filter" => "All",
           "closed-filter" => "Open",
+          "kind-filter" => "Any",
           "timeframe-filter" => "standard",
           "target_id" => Map.get(params, "target_id")
         },
@@ -90,12 +91,20 @@ defmodule TeiserverWeb.Moderation.OverwatchLive.Index do
         _ -> nil
       end
 
+    kind =
+      case filters["kind-filter"] do
+        "Any" -> nil
+        "Actions" -> "actions"
+        "Chat" -> "chat"
+      end
+
     report_groups =
       Moderation.list_report_groups(
         where: [
           closed: closed_filter,
           actioned: actioned_filter,
           inserted_after: timeframe,
+          has_reports_of_kind: kind,
           target_id: filters["target_id"]
         ],
         order_by: ["Newest first"],
diff --git a/lib/teiserver_web/live/moderation/overwatch/index.html.heex b/lib/teiserver_web/live/moderation/overwatch/index.html.heex
index 2b2d3afb2..0bc995109 100644
--- a/lib/teiserver_web/live/moderation/overwatch/index.html.heex
+++ b/lib/teiserver_web/live/moderation/overwatch/index.html.heex
@@ -57,6 +57,17 @@
           />
         </div>
 
+        <div class="col">
+          <.input
+            type="select"
+            label="Kind"
+            options={["Any", "Actions", "Chat"]}
+            name="kind-filter"
+            value={@filters["kind-filter"]}
+            phx-change="filter-update"
+          />
+        </div>
+
         <div class="col">
           <.input
             type="select"
@@ -132,7 +143,7 @@
     <.link
       :if={report_group.match_id}
       class="btn btn-secondary btn-sm"
-      navigate={~p"/teiserver/admin/matches/#{report_group.match_id}"}
+      navigate={~p"/battle/#{report_group.match_id}"}
     >
       Match
     </.link>
diff --git a/lib/teiserver_web/live/moderation/overwatch/report_group_detail.ex b/lib/teiserver_web/live/moderation/overwatch/report_group_detail.ex
index b6a47f19b..0b6840948 100644
--- a/lib/teiserver_web/live/moderation/overwatch/report_group_detail.ex
+++ b/lib/teiserver_web/live/moderation/overwatch/report_group_detail.ex
@@ -14,6 +14,8 @@ defmodule TeiserverWeb.Moderation.OverwatchLive.ReportGroupDetail do
     |> ReportGroupLib.make_favourite()
     |> insert_recently(socket)
 
+    # TODO also assign reporter info here, it's needed for report authors and chat link
+
     socket =
       socket
       |> assign(:report_group, report_group)
diff --git a/lib/teiserver_web/live/moderation/overwatch/report_group_detail.html.heex b/lib/teiserver_web/live/moderation/overwatch/report_group_detail.html.heex
index c889cc848..4760e2db7 100644
--- a/lib/teiserver_web/live/moderation/overwatch/report_group_detail.html.heex
+++ b/lib/teiserver_web/live/moderation/overwatch/report_group_detail.html.heex
@@ -21,7 +21,7 @@
 
       <%= if @report_group.match_id do %>
         <a
-          href={~p"/teiserver/admin/matches/#{@report_group.match_id}"}
+          href={~p"/battle/#{@report_group.match_id}"}
           class={"btn btn-outline-#{Teiserver.Battle.MatchLib.colours()}"}
         >
           <Fontawesome.icon icon={Teiserver.Battle.MatchLib.icon()} style="solid" /> Match Details
@@ -118,7 +118,7 @@
             row_click={fn report -> JS.navigate(~p"/moderation/report/#{report.id}") end}
           >
             <:col :let={report} label="Type"><%= report.type %>/<%= report.sub_type %></:col>
-            <:col :let={report} label="Type"><%= report.extra_text %></:col>
+            <:col :let={report} label="Description"><%= report.extra_text %></:col>
             <:col :let={report} label="Type">
               <%= date_to_str(report.inserted_at, format: :hms_or_ymd) %>
             </:col>
diff --git a/lib/teiserver_web/live/moderation/overwatch/user.html.heex b/lib/teiserver_web/live/moderation/overwatch/user.html.heex
index e6d455341..b8d5a8040 100644
--- a/lib/teiserver_web/live/moderation/overwatch/user.html.heex
+++ b/lib/teiserver_web/live/moderation/overwatch/user.html.heex
@@ -131,7 +131,7 @@
         <.link
           :if={report_group.match_id}
           class="btn btn-secondary btn-sm"
-          navigate={~p"/teiserver/admin/matches/#{report_group.match_id}"}
+          navigate={~p"/battle/#{report_group.match_id}"}
         >
           Match
         </.link>
diff --git a/lib/teiserver_web/live/moderation/report_user/index.ex b/lib/teiserver_web/live/moderation/report_user/index.ex
index 00db6e7b5..c82f15115 100644
--- a/lib/teiserver_web/live/moderation/report_user/index.ex
+++ b/lib/teiserver_web/live/moderation/report_user/index.ex
@@ -186,7 +186,7 @@ defmodule TeiserverWeb.Moderation.ReportUserLive.Index do
           user_id: user.id
         ],
         order_by: "Newest first",
-        select: [:id, :game_type, :team_size, :team_count, :finished, :map]
+        select: [:id, :game_type, :team_size, :team_count, :finished, :map, :game_duration]
       )
       |> Enum.map(fn match ->
         label =
diff --git a/lib/teiserver_web/live/moderation/report_user/index.html.heex b/lib/teiserver_web/live/moderation/report_user/index.html.heex
index 7e6adcc1e..b6dc08f81 100644
--- a/lib/teiserver_web/live/moderation/report_user/index.html.heex
+++ b/lib/teiserver_web/live/moderation/report_user/index.html.heex
@@ -73,7 +73,11 @@
           row_click={fn match -> "select-match-#{match.id}" end}
         >
           <:col :let={match} label="Match"><%= match.label %></:col>
-          <:col :let={match} label=""><%= match.time_ago %></:col>
+          <:col :let={match} label="Map"><%= match.map %></:col>
+          <:col :let={match} label="When?"><%= match.time_ago %></:col>
+          <:col :let={match} label="Match length">
+            <%= duration_to_str_short(match.game_duration) %>
+          </:col>
         </.table>
         If you cannot find the match here then you can submit the report without a match selected but it may mean we cannot find evidence and are thus unable to handle the report.
         <br /><br />
diff --git a/lib/teiserver_web/router.ex b/lib/teiserver_web/router.ex
index 7ff524307..7851b490a 100644
--- a/lib/teiserver_web/router.ex
+++ b/lib/teiserver_web/router.ex
@@ -304,6 +304,7 @@ defmodule TeiserverWeb.Router do
       live "/:id/players", MatchLive.Show, :players
       live "/:id/ratings", MatchLive.Show, :ratings
       live "/:id/balance", MatchLive.Show, :balance
+      live "/:id/events", MatchLive.Show, :events
     end
   end
 
diff --git a/lib/teiserver_web/templates/admin/lobby/lobby_chat.html.heex b/lib/teiserver_web/templates/admin/lobby/lobby_chat.html.heex
index 4f2818a2c..96d9eea60 100644
--- a/lib/teiserver_web/templates/admin/lobby/lobby_chat.html.heex
+++ b/lib/teiserver_web/templates/admin/lobby/lobby_chat.html.heex
@@ -52,7 +52,7 @@
             <% end %>
             &nbsp;&nbsp;&nbsp;
             <a
-              href={Routes.ts_admin_match_path(@conn, :show, @match.id)}
+              href={~p"/battle/#{@match.id}"}
               class={"btn btn-outline-#{Teiserver.Battle.MatchLib.colours()}"}
             >
               <%= central_component("icon", icon: Teiserver.Battle.MatchLib.icon()) %> Match details
@@ -60,10 +60,7 @@
           <% end %>
 
           <%= if not @last_page or @page != 0 do %>
-            <a
-              href={"/teiserver/admin/lobbies/#{@match.id}/lobby_chat/all"}
-              class="btn btn-outline-secondary"
-            >
+            <a href={~p"/battle/chat/#{@match.id}/"} class="btn btn-outline-secondary">
               <i class="fa-fw fa-solid fa-list"></i> &nbsp;
               Full chat
             </a>
diff --git a/lib/teiserver_web/templates/admin/match/index.html.heex b/lib/teiserver_web/templates/admin/match/index.html.heex
index 2665b9bc4..b490f9f17 100644
--- a/lib/teiserver_web/templates/admin/match/index.html.heex
+++ b/lib/teiserver_web/templates/admin/match/index.html.heex
@@ -74,10 +74,7 @@
                 <td><%= date_to_str(match.finished, format: :ymd_hms) %></td>
 
                 <td>
-                  <a
-                    href={Routes.ts_admin_match_path(@conn, :show, match.id)}
-                    class="btn btn-secondary btn-sm"
-                  >
+                  <a href={~p"/battle/#{match.id}"} class="btn btn-secondary btn-sm">
                     Show
                   </a>
                 </td>
diff --git a/lib/teiserver_web/templates/admin/match/server_index.html.heex b/lib/teiserver_web/templates/admin/match/server_index.html.heex
index f02a4b7b1..70b7bb807 100644
--- a/lib/teiserver_web/templates/admin/match/server_index.html.heex
+++ b/lib/teiserver_web/templates/admin/match/server_index.html.heex
@@ -87,10 +87,7 @@
                 <td><%= date_to_str(match.finished, format: :ymd_hms) %></td>
 
                 <td>
-                  <a
-                    href={~p"/teiserver/admin/matches/#{match.id}"}
-                    class="btn btn-secondary btn-sm"
-                  >
+                  <a href={~p"/battle/#{match.id}"} class="btn btn-secondary btn-sm">
                     Show
                   </a>
                 </td>
diff --git a/lib/teiserver_web/templates/admin/match/show.html.heex b/lib/teiserver_web/templates/admin/match/show.html.heex
deleted file mode 100644
index a0912581e..000000000
--- a/lib/teiserver_web/templates/admin/match/show.html.heex
+++ /dev/null
@@ -1,112 +0,0 @@
-<% bsname = view_colour() %>
-
-<script type="text/javascript" charset="utf-8">
-  $(function() {
-    var selected_tab = window.location.hash.substr(1).replace("_tab", "");
-    $('#the_tabs a:first').tab('show');
-    $('#the_tabs [href="#' + selected_tab + '_tab"]').tab('show');
-  });
-</script>
-
-<%= render(
-  TeiserverWeb.Admin.GeneralView,
-  "sub_menu.html",
-  Map.merge(assigns, %{active: "matches"})
-) %>
-
-<div class="row section-menu">
-  <div class="col-md-12">
-    <div class={"card border-#{bsname}"}>
-      <div class="card-body">
-        <%= render(
-          TeiserverWeb.Admin.MatchView,
-          "section_menu.html",
-          Map.merge(assigns, %{
-            show_search: false,
-            active: ""
-          })
-        ) %>
-        <hr />
-
-        <div class="float-end">
-          &nbsp;
-        </div>
-
-        <h3>
-          <%= @match_name %> &nbsp;&nbsp;&nbsp;&nbsp;
-          <%= if @match.winning_team != nil do %>
-            Team <%= @match.winning_team + 1 %> won
-            &nbsp;&nbsp;&nbsp;&nbsp;
-          <% end %>
-          Duration: <%= duration_to_str_short(@match.game_duration) %>
-        </h3>
-        <br />
-        <ul class="nav nav-tabs" role="tablist" id="the_tabs">
-          <li class="nav-item">
-            <a href="#details_tab" role="tab" class="nav-link" data-bs-toggle="tab">
-              <%= central_component("icon", icon: "fa-solid fa-file-alt") %> Details
-            </a>
-          </li>
-
-          <li class="nav-item">
-            <a href="#players_tab" role="tab" class="nav-link" data-bs-toggle="tab">
-              <%= central_component("icon", icon: "fa-solid fa-users") %> Players
-            </a>
-          </li>
-
-          <%= if @rating_logs != %{} and allow?(@conn, "Reviewer") do %>
-            <li class="nav-item">
-              <a href="#ratings_tab" role="tab" class="nav-link" data-bs-toggle="tab">
-                <%= central_component("icon", icon: Teiserver.Account.RatingLib.icon()) %> Ratings
-              </a>
-            </li>
-
-            <li class="nav-item">
-              <a href="#balance_tab" role="tab" class="nav-link" data-bs-toggle="tab">
-                <%= central_component("icon", icon: "fa-solid fa-scale-balanced") %> Balance
-              </a>
-            </li>
-          <% end %>
-
-          <%= if allow?(@conn, "Server") do %>
-            <li class="nav-item">
-              <a href="#events_tab" role="tab" class="nav-link" data-bs-toggle="tab">
-                <Fontawesome.icon
-                  icon={Teiserver.Telemetry.SimpleMatchEventLib.icon()}
-                  style="regular"
-                /> &nbsp;
-                Events
-              </a>
-            </li>
-          <% end %>
-        </ul>
-
-        <div class="tab-content">
-          <div class="tab-pane" id="details_tab" style="padding:5px;">
-            <%= render("tab_details.html", assigns) %>
-          </div>
-
-          <div class="tab-pane" id="players_tab" style="padding:5px;">
-            <%= render("tab_players.html", assigns) %>
-          </div>
-
-          <%= if @rating_logs != %{} and allow?(@conn, "Reviewer") do %>
-            <div class="tab-pane" id="ratings_tab" style="padding:5px;">
-              <%= render("tab_ratings.html", assigns) %>
-            </div>
-
-            <div class="tab-pane" id="balance_tab" style="padding:5px;">
-              <%= render("tab_balance.html", assigns) %>
-            </div>
-          <% end %>
-
-          <%= if @rating_logs != %{} and allow?(@conn, "Reviewer") do %>
-            <div class="tab-pane" id="events_tab" style="padding:5px;">
-              <%= render("tab_events.html", assigns) %>
-            </div>
-          <% end %>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/lib/teiserver_web/templates/admin/match/tab_balance.html.heex b/lib/teiserver_web/templates/admin/match/tab_balance.html.heex
deleted file mode 100644
index e5a47bf31..000000000
--- a/lib/teiserver_web/templates/admin/match/tab_balance.html.heex
+++ /dev/null
@@ -1,41 +0,0 @@
-<h4>Based on data at the time</h4>
-<table class="table">
-  <tbody>
-    <tr>
-      <td>Team 1</td>
-      <td><%= @past_balance.ratings[1] |> round(2) %></td>
-    </tr>
-    <tr>
-      <td>Team 2</td>
-      <td><%= @past_balance.ratings[2] |> round(2) %></td>
-    </tr>
-    <tr>
-      <td>Deviation</td>
-      <td><%= @past_balance.deviation %></td>
-    </tr>
-  </tbody>
-</table>
-
-<textarea name="" id="" rows={Enum.count(@past_balance.logs)} class="form-control"><%= @past_balance.logs |> Enum.join("\n") %></textarea>
-
-<hr />
-
-<h4>If balance we made using current ratings</h4>
-<table class="table">
-  <tbody>
-    <tr>
-      <td>Team 1</td>
-      <td><%= @new_balance.ratings[1] |> round(2) %></td>
-    </tr>
-    <tr>
-      <td>Team 2</td>
-      <td><%= @new_balance.ratings[2] |> round(2) %></td>
-    </tr>
-    <tr>
-      <td>Deviation</td>
-      <td><%= @new_balance.deviation %></td>
-    </tr>
-  </tbody>
-</table>
-
-<textarea name="" id="" rows={Enum.count(@new_balance.logs)} class="form-control"><%= @new_balance.logs |> Enum.join("\n") %></textarea>
diff --git a/lib/teiserver_web/templates/admin/match/tab_details.html.heex b/lib/teiserver_web/templates/admin/match/tab_details.html.heex
deleted file mode 100644
index f583f4e68..000000000
--- a/lib/teiserver_web/templates/admin/match/tab_details.html.heex
+++ /dev/null
@@ -1,37 +0,0 @@
-<%= central_component("detail_line",
-  label: "Team count",
-  value: @match.team_count
-) %>
-
-<%= central_component("detail_line",
-  label: "Team size",
-  value: @match.team_size
-) %>
-
-<hr />
-
-<%= central_component("detail_line",
-  label: "Started",
-  value: date_to_str(@match.started, format: :ymd_hms, tz: @tz)
-) %>
-
-<%= central_component("detail_line",
-  label: "Finished",
-  value: date_to_str(@match.finished, format: :ymd_hms, tz: @tz)
-) %>
-
-<%= if allow?(@conn, "admin.dev") do %>
-  <%= central_component("detail_line",
-    label: "Tag key count",
-    value: Map.keys(@match.tags) |> Enum.count()
-  ) %>
-<% end %>
-
-<%= if allow?(@conn, "Moderator") do %>
-  <hr />
-  Match data <textarea class="form-control" style="font-family: monospace" rows="20"><%= Jason.encode!(@match.data, pretty: true) %></textarea> Match bots <textarea
-    class="form-control"
-    style="font-family: monospace"
-    rows="20"
-  ><%= Jason.encode!(@match.bots, pretty: true) %></textarea>
-<% end %>
diff --git a/lib/teiserver_web/templates/admin/match/tab_events.html.heex b/lib/teiserver_web/templates/admin/match/tab_events.html.heex
deleted file mode 100644
index ed4b8595e..000000000
--- a/lib/teiserver_web/templates/admin/match/tab_events.html.heex
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="row">
-  <div class="col">
-    <h4>By type</h4>
-    <.table id="by_type" rows={@events_by_type} table_class="table-sm">
-      <:col :let={{name, _}} label="Event"><%= name %></:col>
-      <:col :let={{_, count}} label="Count"><%= count %></:col>
-    </.table>
-  </div>
-
-  <div class="col">
-    <h4>By team and type</h4>
-    <.table id="by_type" rows={@events_by_team_and_type} table_class="table-sm">
-      <:col :let={{{team, _}, _}} label="Team"><%= team + 1 %></:col>
-      <:col :let={{{_, name}, _}} label="Event"><%= name %></:col>
-      <:col :let={{_, count}} label="Count"><%= count %></:col>
-    </.table>
-  </div>
-</div>
diff --git a/lib/teiserver_web/templates/admin/match/tab_players.html.heex b/lib/teiserver_web/templates/admin/match/tab_players.html.heex
deleted file mode 100644
index 8652d84ec..000000000
--- a/lib/teiserver_web/templates/admin/match/tab_players.html.heex
+++ /dev/null
@@ -1,109 +0,0 @@
-<% bsname = view_colour() %>
-
-<table class="table table-sm">
-  <thead>
-    <tr>
-      <th colspan="6">&nbsp;</th>
-      <th colspan="2" style="text-align: center; bbackground-color: #FEE;">Damage</th>
-      <th colspan="2" style="text-align: center; bbackground-color: #EFE;">Units</th>
-      <th colspan="2" style="text-align: center; bbackground-color: #EEF;">Metal</th>
-      <th colspan="2" style="text-align: center; bbackground-color: #FFE;">Energy</th>
-
-      <th colspan="2">&nbsp;</th>
-    </tr>
-
-    <tr>
-      <th colspan="4">Name & Party</th>
-      <th>Team</th>
-      <th>Play</th>
-
-      <th>Done</th>
-      <th>Taken</th>
-
-      <th>Killed</th>
-      <th>Prod</th>
-
-      <th>Prod</th>
-      <th>Used</th>
-
-      <th>Prod</th>
-      <th>Used</th>
-
-      <th colspan="1">Rating</th>
-      <th colspan="1">&nbsp;</th>
-    </tr>
-  </thead>
-  <tbody>
-    <%= for m <- @members do %>
-      <% rating = @rating_logs[m.user_id]
-      party_colour = @parties[m.party_id]
-
-      exit_status = calculate_exit_status(m.left_after, @match.game_duration)
-
-      play_percentage =
-        if exit_status != :stayed do
-          (m.left_after / @match.game_duration * 100) |> round
-        end %>
-      <tr>
-        <td style={"background-color: #{m.user.colour}; color: #FFF;"} width="22">
-          <%= if m.team_id == @match.winning_team do %>
-            <i class="fa-fw fa-solid fa-trophy"></i>
-          <% end %>
-        </td>
-        <td style={"background-color: #{m.user.colour}; color: #FFF;"} width="22">
-          <%= central_component("icon", icon: m.user.icon) %>
-        </td>
-        <td style={"background-color: #{rgba_css m.user.colour};"}>
-          <%= m.user.name %>
-        </td>
-
-        <%= if party_colour do %>
-          <td style={"background-color: #{party_colour};"} width="50">&nbsp;</td>
-        <% else %>
-          <td style={"background-color: #{rgba_css m.user.colour};"} width="50">&nbsp;</td>
-        <% end %>
-
-        <td><%= m.team_id + 1 %></td>
-        <td>
-          <%= case exit_status do %>
-            <% :stayed -> %>
-            <% :early -> %>
-              <i class="fa-fw fa-solid fa-clock text-warning"></i> &nbsp; <%= play_percentage %>%
-            <% :abandoned -> %>
-              <i class="fa-fw fa-solid fa-person-running text-danger"></i>
-              &nbsp; <%= play_percentage %>%
-            <% :noshow -> %>
-              <i class="fa-fw fa-solid fa-user-ninja text-info2"></i>
-          <% end %>
-        </td>
-
-        <td><%= normalize(m.stats["damageDealt"]) %></td>
-        <td><%= normalize(m.stats["damageReceived"]) %></td>
-
-        <td><%= normalize(m.stats["unitsKilled"]) %></td>
-        <td><%= normalize(m.stats["unitsProduced"]) %></td>
-
-        <td><%= normalize(m.stats["metalProduced"]) %></td>
-        <td><%= normalize(m.stats["metalUsed"]) %></td>
-
-        <td><%= normalize(m.stats["energyProduced"]) %></td>
-        <td><%= normalize(m.stats["energyUsed"]) %></td>
-
-        <td>
-          <%= if rating != nil do %>
-            <%= rating.value["rating_value"] |> round(2) %>
-          <% end %>
-        </td>
-
-        <td>
-          <a
-            href={Routes.ts_admin_match_path(@conn, :user_show, m.user_id)}
-            class={"btn btn-sm btn-outline-#{bsname}"}
-          >
-            Matches
-          </a>
-        </td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
diff --git a/lib/teiserver_web/templates/admin/match/tab_ratings.html.heex b/lib/teiserver_web/templates/admin/match/tab_ratings.html.heex
deleted file mode 100644
index a4d15fa84..000000000
--- a/lib/teiserver_web/templates/admin/match/tab_ratings.html.heex
+++ /dev/null
@@ -1,81 +0,0 @@
-<%= if @rating_logs != %{} do %>
-  <style type="text/css">
-    .raw-row {
-      display: none;
-    }
-  </style>
-
-  <table class="table table-sm">
-    <thead>
-      <tr>
-        <th colspan="4">&nbsp;</th>
-
-        <th colspan="3" style="text-align: center; bbackground-color: #FEE;">Rating</th>
-
-        <th>&nbsp;</th>
-
-        <th colspan="3" style="text-align: center; bbackground-color: #EEF;">Change</th>
-
-        <th>&nbsp;</th>
-      </tr>
-
-      <tr>
-        <th colspan="3">Name</th>
-        <th>Team</th>
-
-        <th>Rating</th>
-        <th>Skill</th>
-        <th>Uncertainty</th>
-
-        <th>&nbsp;</th>
-
-        <th>Rating</th>
-        <th>Skill</th>
-        <th>Uncertainty</th>
-
-        <th>&nbsp;</th>
-      </tr>
-    </thead>
-    <tbody>
-      <%= for m <- @members do %>
-        <% rating = @rating_logs[m.user_id] %>
-        <tr>
-          <td style={"background-color: #{m.user.colour}; color: #FFF;"} width="22">
-            <%= if m.team_id == @match.winning_team do %>
-              <i class="fa-fw fa-solid fa-trophy"></i>
-            <% end %>
-          </td>
-          <td style={"background-color: #{m.user.colour}; color: #FFF;"} width="22">
-            <%= central_component("icon", icon: m.user.icon) %>
-          </td>
-          <td style={"background-color: #{rgba_css m.user.colour};"}><%= m.user.name %></td>
-          <td><%= m.team_id + 1 %></td>
-
-          <td><%= rating.value["rating_value"] |> round(2) %></td>
-          <td><%= rating.value["skill"] |> round(2) %></td>
-          <td><%= rating.value["uncertainty"] |> round(2) %></td>
-
-          <td>&nbsp;</td>
-
-          <td><%= rating.value["rating_value_change"] |> round(2) %></td>
-          <td><%= rating.value["skill_change"] |> round(2) %></td>
-          <td><%= rating.value["uncertainty_change"] |> round(2) %></td>
-
-          <td>
-            <span
-              class="btn btn-secondary btn-sm"
-              onclick={"$('#raw-row-#{m.user_id}').toggleClass('raw-row');"}
-            >
-              Show/Hide raw
-            </span>
-          </td>
-        </tr>
-        <tr class="raw-row" id={"raw-row-#{m.user_id}"}>
-          <td colspan="12">
-            <textarea name="" id="" rows="8" cols="40" class="form-control monospace"><%= Jason.encode!(rating.value, pretty: true) %></textarea>
-          </td>
-        </tr>
-      <% end %>
-    </tbody>
-  </table>
-<% end %>
diff --git a/lib/teiserver_web/templates/admin/match/user_index.html.heex b/lib/teiserver_web/templates/admin/match/user_index.html.heex
index 4ce294b0c..f924d6a8a 100644
--- a/lib/teiserver_web/templates/admin/match/user_index.html.heex
+++ b/lib/teiserver_web/templates/admin/match/user_index.html.heex
@@ -96,10 +96,7 @@
                 <td><%= date_to_str(match.finished, format: :ymd_hms) %></td>
 
                 <td>
-                  <a
-                    href={Routes.ts_admin_match_path(@conn, :show, match.id)}
-                    class="btn btn-secondary btn-sm"
-                  >
+                  <a href={~p"/battle/#{match.id}"} class="btn btn-secondary btn-sm">
                     Show
                   </a>
                 </td>
diff --git a/lib/teiserver_web/templates/admin/user/ratings.html.heex b/lib/teiserver_web/templates/admin/user/ratings.html.heex
index 73d00b92a..aa0cbdbf6 100644
--- a/lib/teiserver_web/templates/admin/user/ratings.html.heex
+++ b/lib/teiserver_web/templates/admin/user/ratings.html.heex
@@ -184,10 +184,7 @@
                 <td><%= date_to_str(log.inserted_at, format: :hms_or_dmy) %></td>
                 <%= if log.match do %>
                   <td>
-                    <a
-                      href={Routes.ts_admin_match_path(@conn, :show, log.match.id)}
-                      class="btn btn-secondary btn-sm"
-                    >
+                    <a href={~p"/battle/#{log.match.id}"} class="btn btn-secondary btn-sm">
                       Show
                     </a>
                   </td>
diff --git a/lib/teiserver_web/templates/admin/user/smurf_list.html.heex b/lib/teiserver_web/templates/admin/user/smurf_list.html.heex
index 709391758..a857f911b 100644
--- a/lib/teiserver_web/templates/admin/user/smurf_list.html.heex
+++ b/lib/teiserver_web/templates/admin/user/smurf_list.html.heex
@@ -115,6 +115,9 @@ is_moderator = allow?(@conn, "Moderator") %>
 
                   <th>Winrate</th>
                   <th>Recents</th>
+                  <th>Play time</th>
+                  <th>games allied</th>
+                  <th>games vs</th>
 
                   <%= for type <- @key_types do %>
                     <th><%= short_name[type] || type %></th>
@@ -132,17 +135,11 @@ is_moderator = allow?(@conn, "Moderator") %>
               </thead>
               <tbody>
                 <tr class="selected-user-row">
-                  <% email_domain =
-                    @user.email
-                    |> String.split("@")
-                    |> Enum.reverse()
-                    |> hd %>
-
                   <td style={"background-color: #{@user.colour}; color: #FFF;"} width="22">
                     <%= central_component("icon", icon: @user.icon) %>
                   </td>
                   <td><%= @user.name %></td>
-                  <td><%= email_domain %></td>
+                  <td><%= @user.email %></td>
                   <td><%= @user.data["lobby_client"] %></td>
 
                   <td>
@@ -151,6 +148,10 @@ is_moderator = allow?(@conn, "Moderator") %>
 
                   <td><%= @stats["win_rate.team"] %></td>
                   <td><%= @stats["recent_count.team"] %></td>
+                  <% hours = ((@stats["player_minutes"] || 0) / 60) |> round %>
+                  <td>
+                    <%= "#{hours}h" %>
+                  </td>
 
                   <%= for _type <- @key_types do %>
                     <td>
@@ -185,19 +186,15 @@ is_moderator = allow?(@conn, "Moderator") %>
 
                 <%= for user <- @users do %>
                   <% user_stats = @stats_map[user.id]
-
-                  email_domain =
-                    user.email
-                    |> String.split("@")
-                    |> Enum.reverse()
-                    |> hd %>
+                  games_allied = @games_allied[user.id]
+                  games_vs = @games_vs[user.id] %>
 
                   <tr>
                     <td style={"background-color: #{user.colour}; color: #FFF;"} width="22">
                       <%= central_component("icon", icon: user.icon) %>
                     </td>
                     <td><%= user.name %></td>
-                    <td><%= email_domain %></td>
+                    <td><%= user.email %></td>
                     <td><%= user.data["lobby_client"] %></td>
 
                     <td>
@@ -206,6 +203,10 @@ is_moderator = allow?(@conn, "Moderator") %>
 
                     <td><%= user_stats["win_rate.team"] %></td>
                     <td><%= user_stats["recent_count.team"] %></td>
+                    <% hours = ((user_stats["player_minutes"] || 0) / 60) |> round %>
+                    <td>
+                      <%= "#{hours}h" %>
+                    </td>
 
                     <%= for type <- @key_types do %>
                       <td>
@@ -268,9 +269,10 @@ is_moderator = allow?(@conn, "Moderator") %>
                           class: "btn btn-sm btn-warning"
                         ) %>
                       </td>
-                    <% else %>
+                    <% else  # TODO if @user.smurf_of_id == nil, link to parent? %>
                       <td></td>
                     <% end %>
+                    <!-- TODO auto-bump or at least propose smurf warning number based on number of linked accounts? -->
                   </tr>
                 <% end %>
               </tbody>
diff --git a/lib/teiserver_web/templates/battle/match/section_menu.html.heex b/lib/teiserver_web/templates/battle/match/section_menu.html.heex
index 96912e1b0..7578d689d 100644
--- a/lib/teiserver_web/templates/battle/match/section_menu.html.heex
+++ b/lib/teiserver_web/templates/battle/match/section_menu.html.heex
@@ -37,7 +37,7 @@
       active: @active,
       icon: Teiserver.Admin.AdminLib.icon(),
       bsname: bsname,
-      url: ~p"/teiserver/admin/matches/#{@match.id}"
+      url: ~p"/battle/#{@match.id}"
     ) %>
   <% end %>
 </div>
diff --git a/lib/teiserver_web/templates/moderation/action/tab_reports.html.heex b/lib/teiserver_web/templates/moderation/action/tab_reports.html.heex
index f332b4f40..cd3e7d0a6 100644
--- a/lib/teiserver_web/templates/moderation/action/tab_reports.html.heex
+++ b/lib/teiserver_web/templates/moderation/action/tab_reports.html.heex
@@ -29,10 +29,7 @@
 
         <td>
           <%= if report.match_id do %>
-            <a
-              href={Routes.ts_admin_match_path(@conn, :show, report.match_id)}
-              class="btn btn-secondary btn-sm"
-            >
+            <a href={~p"/battle/#{report.match_id}"} class="btn btn-secondary btn-sm">
               Match
             </a>
           <% end %>
diff --git a/lib/teiserver_web/templates/moderation/proposal/tab_reports.html.heex b/lib/teiserver_web/templates/moderation/proposal/tab_reports.html.heex
index 0c19aeba5..2f5111735 100644
--- a/lib/teiserver_web/templates/moderation/proposal/tab_reports.html.heex
+++ b/lib/teiserver_web/templates/moderation/proposal/tab_reports.html.heex
@@ -20,10 +20,7 @@
         <%= if report.match_id do %>
           <td><%= report.relationship %></td>
           <td>
-            <a
-              href={Routes.ts_admin_match_path(@conn, :show, report.match_id)}
-              class="btn btn-secondary btn-sm"
-            >
+            <a href={~p"/battle/#{report.match_id}"} class="btn btn-secondary btn-sm">
               Match
             </a>
           </td>
diff --git a/lib/teiserver_web/templates/moderation/report/index.html.heex b/lib/teiserver_web/templates/moderation/report/index.html.heex
index bdbd3275e..dba93fecb 100644
--- a/lib/teiserver_web/templates/moderation/report/index.html.heex
+++ b/lib/teiserver_web/templates/moderation/report/index.html.heex
@@ -112,10 +112,7 @@
 
             <%= if report.match_id do %>
               <td>
-                <a
-                  href={Routes.ts_admin_match_path(@conn, :show, report.match_id)}
-                  class="btn btn-secondary btn-sm"
-                >
+                <a href={~p"/battle/#{report.match_id}"} class="btn btn-secondary btn-sm">
                   Match
                 </a>
               </td>
diff --git a/lib/teiserver_web/templates/moderation/report/search.html.heex b/lib/teiserver_web/templates/moderation/report/search.html.heex
index 7cb163317..41a92067f 100644
--- a/lib/teiserver_web/templates/moderation/report/search.html.heex
+++ b/lib/teiserver_web/templates/moderation/report/search.html.heex
@@ -43,6 +43,20 @@
         }) %>
       </div>
 
+      <div class="col-md-4 col-lg-3 col-xl-2 mt-2">
+        <label for="search_state" class="control-label">Kind: </label>
+        <%= central_component("icon_dropdown", %{
+          name: "search[kind]",
+          id: "search_kind",
+          selected: @params["kind"] || "Any",
+          enumerable: [
+            %{id: "Any", icon: "fas fa-square", colour: fg},
+            %{id: "Chat", icon: "fas fa-comment", colour: fg},
+            %{id: "Actions", icon: "fas #{Teiserver.Moderation.ActionLib.icon()}", colour: fg}
+          ]
+        }) %>
+      </div>
+
       <div class="col-md-4 col-lg-3 col-xl-2 mt-2">
         <label for="search_order" class="control-label">Order by: </label>
         <%= central_component("icon_dropdown", %{
diff --git a/lib/teiserver_web/templates/moderation/report/tab_against.html.heex b/lib/teiserver_web/templates/moderation/report/tab_against.html.heex
index 84578b89b..65a9bcdc2 100644
--- a/lib/teiserver_web/templates/moderation/report/tab_against.html.heex
+++ b/lib/teiserver_web/templates/moderation/report/tab_against.html.heex
@@ -30,7 +30,10 @@
             </a>
           </td>
           <td>
-            <a href={~p"/battle/chat/#{report.match_id}/all"} class="btn btn-secondary btn-sm">
+            <a
+              href={~p"/battle/chat/#{report.match_id}/#{report.target_id}/#{report.reporter_id}"}
+              class="btn btn-secondary btn-sm"
+            >
               Chat
             </a>
           </td>
@@ -52,6 +55,12 @@
               ) %>
             </a>
           <% end %>
+
+          <%= if report.closed do %>
+            <span class="btn btn-sm btn-warning">
+              <Fontawesome.icon icon="folder-closed" style="solid" />
+            </span>
+          <% end %>
         </td>
 
         <td>
diff --git a/lib/teiserver_web/templates/moderation/report/tab_from.html.heex b/lib/teiserver_web/templates/moderation/report/tab_from.html.heex
index 438685a4e..7f3b72334 100644
--- a/lib/teiserver_web/templates/moderation/report/tab_from.html.heex
+++ b/lib/teiserver_web/templates/moderation/report/tab_from.html.heex
@@ -22,10 +22,7 @@
         <%= if report.match_id do %>
           <td><%= report.relationship %></td>
           <td>
-            <a
-              href={Routes.ts_admin_match_path(@conn, :show, report.match_id)}
-              class="btn btn-secondary btn-sm"
-            >
+            <a href={~p"/battle/#{report.match_id}"} class="btn btn-secondary btn-sm">
               Match
             </a>
           </td>
@@ -52,6 +49,12 @@
               ) %>
             </a>
           <% end %>
+
+          <%= if report.closed do %>
+            <span class="btn btn-sm btn-warning">
+              <Fontawesome.icon icon="folder-closed" style="solid" />
+            </span>
+          <% end %>
         </td>
 
         <td>
diff --git a/lib/teiserver_web/templates/telemetry/simple_match_event/detail.html.heex b/lib/teiserver_web/templates/telemetry/simple_match_event/detail.html.heex
index cec50cae1..c2bc205fe 100644
--- a/lib/teiserver_web/templates/telemetry/simple_match_event/detail.html.heex
+++ b/lib/teiserver_web/templates/telemetry/simple_match_event/detail.html.heex
@@ -78,10 +78,7 @@
             <td><%= match_id %></td>
             <td><%= format_number(count) %></td>
             <td>
-              <.link
-                navigate={~p"/teiserver/admin/matches/#{match_id}"}
-                class="btn btn-sm btn-secondary"
-              >
+              <.link navigate={~p"/battle/#{match_id}"} class="btn btn-sm btn-secondary">
                 <Fontawesome.icon icon={:show} style="solid" /> Show
               </.link>
             </td>