diff --git a/content/archives/bmt-2025/index.md b/content/archives/bmt-2025/index.md
index 10dc6e8..aff8b29 100644
--- a/content/archives/bmt-2025/index.md
+++ b/content/archives/bmt-2025/index.md
@@ -11,62 +11,68 @@ key = "problems"
 label = "Solutions"
 key = "solutions"
 
-[[extra.archive.tests]]
+[[extra.archive.groups]]
+label = "Round/Test"
+
+[[extra.archive.groups.tests]]
+title = "Power"
+problems = "power-problems.pdf"
+#solutions = "power-solutions.pdf"
+
+[[extra.archive.groups.tests]]
 title = "General"
 problems = "general-problems.pdf"
 #solutions = "general-solutions.pdf"
 
-[[extra.archive.tests]]
+[[extra.archive.groups.tests]]
 title = "Algebra"
 problems = "algebra-problems.pdf"
 #solutions = "algebra-solutions.pdf"
 
-[[extra.archive.tests]]
+[[extra.archive.groups.tests]]
 title = "Calculus"
 problems = "calculus-problems.pdf"
 #solutions = "calculus-solutions.pdf"
 
-[[extra.archive.tests]]
+[[extra.archive.groups.tests]]
 title = "Discrete"
 problems = "discrete-problems.pdf"
 #solutions = "discrete-solutions.pdf"
 
-[[extra.archive.tests]]
+[[extra.archive.groups.tests]]
 title = "Geometry"
 problems = "geometry-problems.pdf"
 #solutions = "geometry-solutions.pdf"
 
-[[extra.archive.tests]]
+[[extra.archive.groups.tests]]
 title = "Guts"
 problems = "guts-problems.pdf"
 #solutions = "guts-solutions.pdf"
 
-[[extra.archive.tests]]
-title = "Power"
-problems = "power-problems.pdf"
-#solutions = "power-solutions.pdf"
+[[extra.archive.groups]]
+label = "Tiebreaker"
 
-[[extra.archive.tests]]
+[[extra.archive.groups.tests]]
 title = "General Tiebreaker"
 problems = "general-tiebreaker-problems.pdf"
 #solutions = "general-tiebreaker-solutions.pdf"
 
-[[extra.archive.tests]]
+[[extra.archive.groups.tests]]
 title = "Algebra Tiebreaker"
 problems = "algebra-tiebreaker-problems.pdf"
 #solutions = "algebra-tiebreaker-solutions.pdf"
 
-[[extra.archive.tests]]
+[[extra.archive.groups.tests]]
 title = "Calculus Tiebreaker"
 problems = "calculus-tiebreaker-problems.pdf"
 #solutions = "calculus-tiebreaker-solutions.pdf"
 
-[[extra.archive.tests]]
+[[extra.archive.groups.tests]]
 title = "Discrete Tiebreaker"
 problems = "discrete-tiebreaker-problems.pdf"
 #solutions = "discrete-tiebreaker-solutions.pdf"
 
-[[extra.archive.tests]]
+[[extra.archive.groups.tests]]
 title = "Geometry Tiebreaker"
 problems = "geometry-tiebreaker-problems.pdf"
 #solutions = "geometry-tiebreaker-solutions.pdf"
diff --git a/templates/resources/page.html b/templates/resources/page.html
index 63b1a45..8b514dd 100644
--- a/templates/resources/page.html
+++ b/templates/resources/page.html
@@ -1,18 +1,18 @@
 {% extends "page.html" %}
 
-{% block before_page_content %}
+{% macro archive_table(label, tests, columns) %}
 <table class="prose">
     <thead>
-        <th>Round</th>
-        {% for column in page.extra.archive.columns %}
+        <th>{{ label }}</th>
+        {% for column in columns %}
         <th>{{ column.label }}</th>
         {% endfor %}
     </thead>
     <tbody>
-        {% for test in page.extra.archive.tests %}
+        {% for test in tests %}
         <tr>
             <td>{{ test.title }}</td>
-            {% for column in page.extra.archive.columns %}
+            {% for column in columns %}
             <td>
                 {% set href = test | get(key=column.key, default="") %}
                 {% if href %}
@@ -24,4 +24,22 @@
         {% endfor %}
     </tbody>
 </table>
+{% endmacro %}
+
+{% block before_page_content %}
+{% if page.extra.archive.groups is defined %}
+{% for group in page.extra.archive.groups %}
+{{ self::archive_table(
+  label=group.label | default(value="Round/Test"),
+  tests=group.tests,
+  columns=page.extra.archive.columns,
+) }}
+{% endfor %}
+{% else %}
+{{ self::archive_table(
+  label="Round/Test",
+  tests=page.extra.archive.tests,
+  columns=page.extra.archive.columns,
+) }}
+{% endif %}
 {% endblock %}