diff --git a/bullet/bullet_admin/templates/bullet_admin/results/announce.html b/bullet/bullet_admin/templates/bullet_admin/results/announce.html
index e94e0b36..c95438f8 100644
--- a/bullet/bullet_admin/templates/bullet_admin/results/announce.html
+++ b/bullet/bullet_admin/templates/bullet_admin/results/announce.html
@@ -1,53 +1,57 @@
 {% extends "web/root_base.html" %}
 {% load results %}
+
 {% block title %}
-    Results announcement
+  Results announcement
 {% endblock title %}
 
 {% block root_content %}
-    <div class="w-screen h-screen flex items-center justify-center p-16"
-         id="js-screen"
-         hx-select="#js-screen"
-         hx-target="#js-screen"
-         hx-swap="outerHTML">
-        {% if not hidden %}
-            <div class="text-center">
-                <div class="text-9xl font-bold mb-6 text-gray-600">{{ position }}.</div>
-                {% if team %}
-                    {% if team.school %}
-                        <div class="text-7xl font-bold mb-4">
-                            {{ team.school.name }}
-                            {% if team.in_school_symbol %}
-                                <span class="text-primary">{{ team.in_school_symbol }}</span>
-                            {% endif %}
-                        </div>
-                        <div class="text-5xl font-bold mb-6">{{ team.school.address }}</div>
-                    {% else %}
-                        <div class="text-5xl font-bold mb-6">{{ team.name }}</div>
-                    {% endif %}
-                    <div class="text-3xl">{{ team.contestants_names }}</div>
-                    <div class="flex justify-center">{% big_squares result_row %}</div>
-                    <div class="text-4xl mt-4">{{ result_row.solved_count }}</div>
-                {% endif %}
-            </div>
+  <div class="w-screen h-screen flex items-center justify-center p-16"
+       id="js-screen"
+       hx-select="#js-screen"
+       hx-target="#js-screen"
+       hx-swap="outerHTML">
+    {% if not hidden %}
+    <div class="text-center">
+      <div class="text-9xl font-bold mb-6 text-gray-600">{{ position }}.</div>
+      {% if team %}
+        {% if team.school %}
+          {# TODO: #998 Unify team display #}
+          <div class="text-7xl font-bold mb-4">
+            {{ team.school.name }}
+            {% if team.in_school_symbol %}
+              <span class="text-primary">{{ team.in_school_symbol }}</span>
+            {% endif %}
+          </div>
+          <div class="text-5xl font-bold mb-6">{{ team.school.address }}</div>
+        {% else %}
+          <div class="text-5xl font-bold mb-6">{{ team.name }}</div>
         {% endif %}
-        <div class="p-2 fixed bottom-0 right-0 space-x-1">
-            <span>{{ position }}.</span>
-            <button class="btn-admin-sm bg-primary hover:bg-primary-dark"
-                    hx-get="{{ links.prev }}"
-                    hx-trigger="click, keyup[key=='ArrowDown'||key=='Backspace'] from:body">
-                <i class="fas fa-arrow-down"></i>
-            </button>
-            <button class="btn-admin-sm bg-primary hover:bg-primary-dark"
-                    hx-get="{{ links.hide }}"
-                    hx-trigger="click, keyup[key=='h'] from:body">
-                <i class="fas fa-eye-slash"></i>
-            </button>
-            <button class="btn-admin-sm bg-primary hover:bg-primary-dark"
-                    hx-get="{{ links.next }}"
-                    hx-trigger="click, keyup[key=='ArrowUp'||key==' '] from:body">
-                <i class="fas fa-arrow-up"></i>
-            </button>
-        </div>
+
+        <div class="text-3xl">{{ team.contestants_names }}</div>
+        <div class="flex justify-center">{% squares result_row big=True %}</div>
+        <div class="text-4xl mt-4">{{ result_row.solved_count }}</div>
+      {% endif %}
+    </div>
+    {% endif %}
+ 
+    <div class="p-2 fixed bottom-0 right-0 space-x-1">
+      <span>{{ position }}.</span>
+      <button class="btn-admin-sm bg-primary hover:bg-primary-dark"
+              hx-get="{{ links.prev }}"
+              hx-trigger="click, keyup[key=='ArrowDown'||key=='Backspace'] from:body">
+        <i class="fas fa-arrow-down"></i>
+      </button>
+      <button class="btn-admin-sm bg-primary hover:bg-primary-dark"
+              hx-get="{{ links.hide }}"
+              hx-trigger="click, keyup[key=='h'] from:body">
+        <i class="fas fa-eye-slash"></i>
+      </button>
+      <button class="btn-admin-sm bg-primary hover:bg-primary-dark"
+              hx-get="{{ links.next }}"
+              hx-trigger="click, keyup[key=='ArrowUp'||key==' '] from:body">
+        <i class="fas fa-arrow-up"></i>
+      </button>
     </div>
+  </div>
 {% endblock root_content %}
diff --git a/bullet/competitions/templates/teams/list.html b/bullet/competitions/templates/teams/list.html
index d6d6e647..cca9c6e4 100644
--- a/bullet/competitions/templates/teams/list.html
+++ b/bullet/competitions/templates/teams/list.html
@@ -1,27 +1,27 @@
 {% extends "web/base.html" %}
-{% load content_blocks countries country_url i18n static %}
+{% load content_blocks countries country_url i18n static teams %}
 {% block title %}
-    {% if is_waitinglist %}
-        {% translate "Waiting list" %}
-    {% else %}
-        {% translate "Team list" %}
-    {% endif %}
+  {% if is_waitinglist %}
+    {% translate "Waiting list" %}
+  {% else %}
+    {% translate "Team list" %}
+  {% endif %}
 {% endblock title %}
 
 {% block hero %}
-    <h1 class="text-4xl md:text-6xl font-bold mt-8 md:mt-24 mb-4 md:mb-16">
-        {% if is_waitinglist %}
-            {% translate "Waiting list" %}
-        {% else %}
-            {% translate "Team list" %}
-        {% endif %}
-    </h1>
+  <h1 class="text-4xl md:text-6xl font-bold mt-8 md:mt-24 mb-4 md:mb-16">
+    {% if is_waitinglist %}
+      {% translate "Waiting list" %}
+    {% else %}
+      {% translate "Team list" %}
+    {% endif %}
+  </h1>
 {% endblock hero %}
 
 {% block content %}
     {% load_blocks "category" %}
-    <div class="container mx-auto px-2 mt-8">
-        <div class="flex flex-wrap justify-center gap-1 mb-2">
+    <div class="max-w-7xl mx-auto px-6 lg:px-8 mt-8">
+        <div class="flex flex-wrap gap-1 mb-2">
             {% for c in countries %}
                 <a href="?country={{ c }}"
                    class="{% if c == country %} bg-primary text-white font-bold {% else %} bg-gray-100 {% endif %} whitespace-nowrap py-1 px-2 rounded flex gap-2 items-center flex-wrap">
@@ -32,47 +32,45 @@ <h1 class="text-4xl md:text-6xl font-bold mt-8 md:mt-24 mb-4 md:mb-16">
                 </a>
             {% endfor %}
         </div>
-        <div class="mb-4 text-center">
-            {% if is_waitinglist %}
-                <a href="{% country_url "team_list" %}?country={{ country }}"
-                   class="link-primary">{% translate "Team list" %}</a>
-            {% else %}
-                <a href="{% country_url "waiting_list" %}?country={{ country }}"
-                   class="link-primary">{% translate "Waiting list" %}</a>
-            {% endif %}
+
+        <div class="mb-4">
+          {% if is_waitinglist %}
+            <a href="{% country_url "team_list" %}?country={{ country }}" class="link-primary">{% translate "Team list" %}</a>
+          {% else %}
+            <a href="{% country_url "waiting_list" %}?country={{ country }}" class="link-primary">{% translate "Waiting list" %}</a>
+          {% endif %}
         </div>
+
+        <div class="mb-8">
+          <ul class="list-disc list-inside">
+            {% for v in venues %}
+            <li><a href="#{{ v.venue.shortcode }}" class="link-primary">{{ v.venue.name }} ({% content_block "category:name_"|add:v.venue.category.identifier %})</a></li>
+            {% endfor %}
+          </ul>
+        </div>
+
         {% for v in venues %}
-            <div class="mb-8">
-                <div class="flex flex-col md:flex-row md:items-baseline md:justify-between px-4 py-2 rounded">
-                    <h2 class="font-bold text-2xl">
-                        {{ v.venue.name }}
-                        <span class="text-lg text-gray-600">({% content_block "category:name_"|add:v.venue.category.identifier %})</span>
-                    </h2>
-                    {% if not is_waitinglist %}
-                        <div class="shrink-0 text-gray-600">
-                            {% blocktranslate with teams=v.teams|length capacity=v.venue.capacity %}Teams: {{ teams }} / {{ capacity }}{% endblocktranslate %}
-                        </div>
-                    {% endif %}
-                </div>
-                {% for team in v.teams %}
-                    <div class="flex flex-col md:flex-row md:items-center px-4 py-2 {% cycle "bg-gray-50" "" %} rounded-md">
-                        <div class="md:w-1/2 mb-1 md:mb-0">
-                            {% if team.school %}
-                                <div class="text-primary font-bold">
-                                    {{ team.school.name }}
-                                    {% if team.in_school_symbol %}
-                                        <span class="text-white bg-primary rounded px-1.5 py-0.5 text-sm">{{ team.in_school_symbol }}</span>
-                                    {% endif %}
-                                </div>
-                                <div class="text-sm text-gray-600">{{ team.school.address }}</div>
-                            {% else %}
-                                <div class="text-primary font-bold">{{ team.name }}</div>
-                            {% endif %}
-                        </div>
-                        <div class="md:w-1/2 text-sm">{{ team.contestants.all|join:", " }}</div>
-                    </div>
-                {% endfor %}
+        <div class="mb-8">
+          <h2 class="font-bold text-2xl" id="{{ v.venue.shortcode }}">
+            {{ v.venue.name }}
+            <span class="text-lg text-gray-500">({% content_block "category:name_"|add:v.venue.category.identifier %})</span>
+          </h2>
+
+          {% if not is_waitinglist %}
+          <div class="shrink-0 text-gray-500">
+              {% blocktranslate with teams=v.teams|length capacity=v.venue.capacity %}Teams: {{ teams }} / {{ capacity }}{% endblocktranslate %}
+          </div>
+          {% endif %}
+
+          <div class="space-y-3 mt-4">
+            {% for team in v.teams %}
+            <div>
+              {% inline_team_name team %}
+              <div class="text-xs mt-0.5 text-gray-500">{{ team.contestants.all|join:", " }}</div>
             </div>
+            {% endfor %}
+          </div>
+        </div>
         {% endfor %}
     </div>
 {% endblock content %}
diff --git a/bullet/problems/templates/problems/results.html b/bullet/problems/templates/problems/results.html
index 5b224c58..08012a53 100644
--- a/bullet/problems/templates/problems/results.html
+++ b/bullet/problems/templates/problems/results.html
@@ -1,46 +1,45 @@
 {% extends "web/base.html" %}
 {% load content_blocks country_url i18n utils %}
 {% block title %}
-    {% translate "Results" %}
+  {% translate "Results" %}
 {% endblock title %}
 
 {% block extrahead %}
-    {{ block.super }}
-    {% if country %}
-        <link rel="canonical"
-              href="{% country_url "archive_results_category" competition_number=competition.number category=category.identifier country=country|lower %}">
-    {% else %}
-        <link rel="canonical"
-              href="{% country_url "archive_results_category" competition_number=competition.number category=category.identifier %}">
-    {% endif %}
+  {{ block.super }}
+
+  {% if country %}
+    <link rel="canonical" href="{% country_url "archive_results_category" competition_number=competition.number category=category.identifier country=country|lower %}">
+  {% else %}
+    <link rel="canonical" href="{% country_url "archive_results_category" competition_number=competition.number category=category.identifier %}">
+  {% endif %}
 {% endblock extrahead %}
 
 {% block hero %}
-    {% load_blocks "category" %}
-    <div class="mt-8 md:mt-24 mb-4 md:mb-16">
-        <h1 class="text-4xl md:text-6xl font-bold">{% translate "Results" %}</h1>
-        <h2 class="text-2xl md:text-4xl mt-4 font-bold">
-            {% content_block "category:name_"|add:category.identifier %}, {{ country_name }}, {{ competition.name }}
-        </h2>
-    </div>
+  {% load_blocks "category" %}
+  <div class="mt-8 md:mt-24 mb-4 md:mb-16">
+    <h1 class="text-4xl md:text-6xl font-bold">{% translate "Results" %}</h1>
+    <h2 class="text-2xl md:text-4xl mt-4 font-semibold">
+      {% content_block "category:name_"|add:category.identifier %}, {{ country_name }}, {{ competition.name }}
+    </h2>
+  </div>
 {% endblock hero %}
 
 {% block content %}
-    <div class="container mx-auto px-2 mt-8">
-        <div class="flex flex-wrap justify-center gap-1 mb-12">
-            <a href="{% if competition_number %}{% country_url "archive_results_category" category=category.identifier competition_number=competition_number %}{% else %}{% country_url "results_category" category=category.identifier %}{% endif %}{% query_transform %}"
-               class="{% if not country %} bg-primary text-white font-bold {% else %} bg-gray-100 {% endif %} whitespace-nowrap py-1 px-2 rounded">
-                {% translate "International" %}
-            </a>
-            {% for c in countries %}
-                <a href="{% if competition_number %}{% country_url "archive_results_category" category=category.identifier competition_number=competition_number country=c.code|lower %}{% else %}{% country_url "results_category" category=category.identifier country=c.code|lower %}{% endif %}{% query_transform %}"
-                   class="{% if c == country %} bg-primary text-white font-bold {% else %} bg-gray-100 {% endif %} whitespace-nowrap py-1 px-2 rounded flex gap-2 items-center flex-wrap">
-                    <span class="iconify shrink-0 shadow-lg"
-                          data-icon="flag:{{ c.code|lower }}-4x3"></span>
-                    {{ c.name }}
-                </a>
-            {% endfor %}
-        </div>
-        {% include "problems/results/table.html" %}
+  <div class="max-w-7xl mx-auto px-6 lg:px-8 mt-8">
+    <div class="flex flex-wrap gap-1 mb-8">
+      <a href="{% if competition_number %}{% country_url "archive_results_category" category=category.identifier competition_number=competition_number %}{% else %}{% country_url "results_category" category=category.identifier %}{% endif %}{% query_transform %}"
+          class="{% if not country %} bg-primary text-white font-bold {% else %} bg-gray-100 {% endif %} whitespace-nowrap py-1 px-2 rounded">
+        {% translate "International" %}
+      </a>
+
+      {% for c in countries %}
+        <a href="{% if competition_number %}{% country_url "archive_results_category" category=category.identifier competition_number=competition_number country=c.code|lower %}{% else %}{% country_url "results_category" category=category.identifier country=c.code|lower %}{% endif %}{% query_transform %}"
+           class="{% if c == country %} bg-primary text-white font-bold {% else %} bg-gray-100 {% endif %} whitespace-nowrap py-1 px-2 rounded flex gap-2 items-center flex-wrap">
+          <iconify-icon icon="flag:{{ c.code|lower }}-4x3" width="none" class="h-4"></iconify-icon>
+          {{ c.name }}
+        </a>
+      {% endfor %}
     </div>
+    {% include "problems/results/table.html" %}
+  </div>
 {% endblock content %}
diff --git a/bullet/problems/templates/problems/results/squares.html b/bullet/problems/templates/problems/results/squares.html
index 81171179..1bb97fc6 100644
--- a/bullet/problems/templates/problems/results/squares.html
+++ b/bullet/problems/templates/problems/results/squares.html
@@ -1,8 +1,15 @@
-<div class="flex flex-wrap gap-0.5">
-    {% for sq in squares %}
-        <div title="{{ forloop.counter|add:offset }}"
-             class="shrink-0 rounded {% if big %} w-8 font-medium h-8 flex justify-center items-center {% else %} w-3 h-3 {% endif %} {% if forloop.counter|divisibleby:5 %} me-1 break-after-auto {% else %} break-after-avoid {% endif %} {% if sq == 2 %} bg-primary {% elif sq == 1 %} bg-white ring-inset ring-2 ring-primary {% else %} bg-gray-200 {% endif %}">
-            {% if big %}{{ forloop.counter|add:offset }}{% endif %}
-        </div>
+{# django #}
+<div class="flex flex-wrap {% if big %}gap-2{% else %}gap-1{% endif %}">
+  {% for group in squares %}
+  <div class="break-inside-avoid flex gap-0.5 shrink-0">
+    {% for sq in group %}
+    <div title="{{ sq.problem }}"
+        class="shrink-0
+          {% if big %}size-8 font-semibold flex justify-center items-center rounded{% else %}size-2 rounded-sm{% endif %}
+          {% if sq.state == 2 %}bg-primary text-white{% elif sq.state == 1 %}text-primary bg-white ring-inset {% if big %}ring-2{% else %}ring-1{% endif %} ring-primary{% else %}text-gray-600 bg-gray-200{% endif %}">
+        {% if big %}{{ sq.problem }}{% endif %}
+    </div>
     {% endfor %}
+  </div>
+  {% endfor %}
 </div>
diff --git a/bullet/problems/templates/problems/results/table.html b/bullet/problems/templates/problems/results/table.html
index 0ba71292..f823a569 100644
--- a/bullet/problems/templates/problems/results/table.html
+++ b/bullet/problems/templates/problems/results/table.html
@@ -1,71 +1,61 @@
-{% load i18n results utils %}
+{% load i18n results teams utils %}
+
 {% if not results_time.has_started %}
-    <div class="bg-red-100 text-red-800 border border-red-800 p-4 mb-6 rounded-md">
-        {% translate "The competition did not start yet." %}
-    </div>
+  <div class="bg-red-100 text-red-800 border border-red-800 p-4 mb-6 rounded-md">
+    {% translate "The competition did not start yet." %}
+  </div>
 {% elif results_time.is_frozen %}
-    <div class="bg-amber-100 text-amber-800 border border-amber-800 p-4 mb-6 rounded-md">
-        <b>{% translate "Results are frozen." %}</b> {% translate "These are not the final results yet." %}
-    </div>
+  <div class="bg-amber-100 text-amber-800 border border-amber-800 p-4 mb-6 rounded-md">
+    <b>{% translate "Results are frozen." %}</b>
+    {% translate "These are not the final results yet." %}
+  </div>
 {% elif results_time.has_started and not results_time.is_final %}
-    <div class="bg-blue-100 text-blue-800 border border-blue-800 p-4 mb-6 rounded-md">
-        <b>{% translate "Interim results." %}</b> {% translate "The competition is ongoing, the results may change." %}
-    </div>
+  <div class="bg-blue-100 text-blue-800 border border-blue-800 p-4 mb-6 rounded-md">
+    <b>{% translate "Interim results." %}</b>
+    {% translate "The competition is ongoing, the results may change." %}
+  </div>
 {% endif %}
+
 <div class="overflow-x-auto">
-    <table class="w-full">
-        <tbody class="divide-y"
-               id="js-results-content">
-            {% for row in object_list %}
-                <tr class="flex flex-col md:table-row px-4 py-2 rounded-md hover:bg-gray-100 even:bg-gray-50" {% if forloop.last and page_obj.has_next %}hx-get="{{ request.path }}{% query_transform page=page_obj.next_page_number %}" hx-trigger="revealed" hx-swap="afterend" hx-select="#js-results-content > *"
-                {% endif %}
-                >
-                <td class="p-2 text-lg hidden md:table-cell">
-                    {{ forloop.counter0|add:start_index }}.
-                </td>
-                <td class="p-2 hidden md:table-cell">
-                    {% if row.team.school %}
-                        <span class="iconify h-4"
-                              data-icon="flag:{{ row.team.school.country.code|lower }}-4x3"></span>
-                    {% endif %}
-                </td>
-                <td class="p-2 flex items-center gap-3 md:table-cell">
-                    <div class="text-lg md:hidden">{{ forloop.counter0|add:start_index }}.</div>
-                    <span class="iconify h-4 shrink-0 shadow-lg md:hidden"
-                          data-icon="flag:{{ row.team.school.country.code|lower }}-4x3"></span>
-                    <div>
-                        {% if row.team.school %}
-                            <div class="text-primary font-bold">
-                                {{ row.team.school.name }}
-                                {% if row.team.in_school_symbol %}
-                                    <span class="text-white bg-primary rounded px-1.5 py-0.5 text-sm">{{ row.team.in_school_symbol }}</span>
-                                {% endif %}
-                            </div>
-                            <div class="text-sm text-gray-600">{{ row.team.school.address }}</div>
-                        {% else %}
-                            <div class="text-primary font-bold">{{ row.team.name }}</div>
-                        {% endif %}
-                    </div>
-                </td>
-                <td class="p-2 text-xs">
-                    <div class="flex justify-between gap-3 items-center">
-                        {% if not hide_squares %}
-                            {% squares row problem_count team_problem_count first_problem %}
-                        {% endif %}
-                        <div class="text-base md:hidden">{{ row.solved_count }}</div>
-                    </div>
-                    {% if not hide_contestants %}
-                        <div class="mt-1">{{ row.team.contestants.all|join:", " }}</div>
-                    {% endif %}
-                </td>
-                <td class="p-2 hidden md:table-cell">{{ row.solved_count }}</td>
-            </tr>
-        {% empty %}
-            <tr>
-                <td class="p-2 text-center text-gray-700"
-                    colspan="5">{% translate "(No team has solved any problem yet)" %}</td>
-            </tr>
-        {% endfor %}
+  <table class="w-full">
+    <tbody class="divide-y" id="js-results-content">
+      {% for row in object_list %}
+      <tr class="block md:table-row rounded-md hover:bg-gray-100 even:bg-gray-50"
+          {% if forloop.last and page_obj.has_next %}
+          hx-get="{{ request.path }}{% query_transform page=page_obj.next_page_number %}" hx-trigger="revealed"
+          hx-swap="afterend" hx-select="#js-results-content > *"{% endif %}>
+        <td class="p-2 text-lg hidden md:table-cell">
+          {{ forloop.counter0|add:start_index }}.
+        </td>
+        <td class="p-2 block md:table-cell">
+          <div class="flex items-center justify-between md:hidden text-lg gap-2">
+            <div class="text-lg">{{ forloop.counter0|add:start_index }}.</div>
+            <div class="text-lg">{{ row.solved_count }}</div>
+          </div>
+
+          {% full_team_name row.team flag=True %}
+
+          {% if not hide_squares %}
+          <div class="mt-1.5">
+            {% squares row problem_count team_problem_count first_problem %}
+          </div>
+          {% endif %}
+
+          {% if not hide_contestants %}
+          <div class="mt-0.5 text-xs leading-4 text-gray-500">{{ row.team.contestants.all|join:", " }}</div>
+          {% endif %}
+        </td>
+        <td class="p-2 hidden md:table-cell text-lg">
+          {{ row.solved_count }}
+        </td>
+      </tr>
+      {% empty %}
+      <tr>
+        <td class="p-2 text-center text-gray-700" colspan="3">
+          {% translate "(No team has solved any problem yet)" %}
+        </td>
+      </tr>
+      {% endfor %}
     </tbody>
-</table>
+  </table>
 </div>
diff --git a/bullet/problems/templatetags/results.py b/bullet/problems/templatetags/results.py
index 14dbe054..876b4d1a 100644
--- a/bullet/problems/templatetags/results.py
+++ b/bullet/problems/templatetags/results.py
@@ -15,6 +15,7 @@ def squares(
     problem_count: Optional[int] = None,
     team_problem_count: Optional[int] = None,
     first_problem: Optional[int] = None,
+    big: bool = False,
 ):
     category: Category = obj.team.venue.category
     if not team_problem_count:
@@ -24,24 +25,22 @@ def squares(
     if not problem_count:
         problem_count = category.competition.problem_count - first_problem + 1
 
+    squares = obj.get_squares(problem_count, team_problem_count, first_problem)
+    squares_grouped = []
+    for i in range(0, len(squares), 5):
+        group = []
+        for idx in range(i, i + 5):
+            if len(squares) <= idx:
+                continue
+            group.append({"problem": idx + first_problem, "state": squares[idx]})
+        squares_grouped.append(group)
+
     return {
-        "squares": obj.get_squares(problem_count, team_problem_count, first_problem),
-        "offset": first_problem - 1,
+        "squares": squares_grouped,
+        "big": big,
     }
 
 
-@register.inclusion_tag("problems/results/squares.html")
-def big_squares(
-    obj: ResultRow,
-    problem_count: Optional[int] = None,
-    team_problem_count: Optional[int] = None,
-    first_problem: Optional[int] = None,
-):
-    ctx = squares(obj, problem_count, team_problem_count, first_problem)
-    ctx["big"] = True
-    return ctx
-
-
 @register.inclusion_tag("problems/results/timer.html")
 def venue_timer(venue: Venue | str, competition: Competition):
     if isinstance(venue, str):
diff --git a/bullet/users/templates/partials/team_name.html b/bullet/users/templates/partials/team_name.html
new file mode 100644
index 00000000..8df099c8
--- /dev/null
+++ b/bullet/users/templates/partials/team_name.html
@@ -0,0 +1,20 @@
+{# django #}
+{% if team.school %}
+<div class="flex items-center gap-2">
+  {% if flag %}
+  <iconify-icon icon="flag:{{ team.school.country.code|lower }}-4x3" width="none" class="h-5"></iconify-icon>
+  {% endif %}
+  <div>
+    <div class="font-medium leading-4">
+      {{ team.school.name }}
+
+      {% if team.in_school_symbol %}
+        <span class="text-primary">{{ team.in_school_symbol }}</span>
+      {% endif %}
+    </div>
+    <div class="text-sm mt-0.5 leading-3">{{ team.school.address }}</div>
+  </div>
+</div>
+{% else %}
+<div class="font-medium leading-4">{{ team.name }}</div>
+{% endif %}
diff --git a/bullet/users/templates/partials/team_name_inline.html b/bullet/users/templates/partials/team_name_inline.html
new file mode 100644
index 00000000..c358ada7
--- /dev/null
+++ b/bullet/users/templates/partials/team_name_inline.html
@@ -0,0 +1,12 @@
+{# django #}
+{% if team.school %}
+<div>
+  <span class="font-medium leading-4">
+    {# This is on a single line in order to control whitespace around the comma. #}
+    {{ team.school.name }}{% if team.in_school_symbol %} <span class="text-primary">{{ team.in_school_symbol }}</span>{% endif %},
+  </span>
+  <span class="text-sm leading-3">{{ team.school.address }}</span>
+</div>
+{% else %}
+<div class="font-medium leading-4">{{ team.name }}</div>
+{% endif %}
diff --git a/bullet/users/templatetags/__init__.py b/bullet/users/templatetags/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/bullet/users/templatetags/teams.py b/bullet/users/templatetags/teams.py
new file mode 100644
index 00000000..2f569b59
--- /dev/null
+++ b/bullet/users/templatetags/teams.py
@@ -0,0 +1,13 @@
+from django import template
+
+register = template.Library()
+
+
+@register.inclusion_tag("partials/team_name.html")
+def full_team_name(team, flag=False):
+    return {"team": team, "flag": flag}
+
+
+@register.inclusion_tag("partials/team_name_inline.html")
+def inline_team_name(team):
+    return {"team": team}
diff --git a/bullet/web/templates/page_blocks/markdown.html b/bullet/web/templates/page_blocks/markdown.html
index d953aa09..bb849b79 100644
--- a/bullet/web/templates/page_blocks/markdown.html
+++ b/bullet/web/templates/page_blocks/markdown.html
@@ -1,8 +1,9 @@
 {% extends "page_blocks/_base.html" %}
 {% load markdownify %}
+
 {% block container %}
-    {% include "page_blocks/_centered_header.html" %}
-    <main class="prose mx-auto max-w-2xl {% if title or text %}mt-12{% endif %}">
-        {{ content|markdownify }}
-    </main>
+  {% include "page_blocks/_centered_header.html" %}
+  <main class="prose max-w-full {% if title or text %}mt-12{% endif %}">
+    {{ content|markdownify }}
+  </main>
 {% endblock container %}
diff --git a/bullet/web/templates/web/page.html b/bullet/web/templates/web/page.html
index 626845dc..8dc685b7 100644
--- a/bullet/web/templates/web/page.html
+++ b/bullet/web/templates/web/page.html
@@ -1,26 +1,27 @@
 {% extends "web/base.html" %}
 {% load markdownify page_blocks %}
 {% block title %}
-    {{ page.title }}
+  {{ page.title }}
 {% endblock title %}
 
 {% block hero %}
-    {% if not page_blocks %}
-        <h1 class="text-4xl md:text-6xl font-bold mt-8 md:mt-24 mb-4 md:mb-16">
-            {{ page.title }}
-        </h1>
-    {% endif %}
+  {% if not page_blocks %}
+    <h1 class="text-4xl md:text-6xl font-bold mt-8 md:mt-24 mb-4 md:mb-16">
+      {{ page.title }}
+    </h1>
+  {% endif %}
 {% endblock hero %}
 
 {% block content %}
-    {% for page_block in page_blocks %}
-        {% render_page_block page_block %}
-    {% empty %}
-        <main class="px-2 py-4 prose mx-auto max-w-2xl">
-            {{ page.content|markdownify }}
-        </main>
-    {% endfor %}
-    {% if page_blocks %}
-        {% include "web/snippets/state_selector.html" %}
-    {% endif %}
+  {% for page_block in page_blocks %}
+    {% render_page_block page_block %}
+  {% empty %}
+    <main class="py-8 prose mx-auto max-w-7xl px-6 lg:px-8">
+      {{ page.content|markdownify }}
+    </main>
+  {% endfor %}
+
+  {% if page_blocks %}
+    {% include "web/snippets/state_selector.html" %}
+  {% endif %}
 {% endblock content %}
diff --git a/bullet/web/templates/web/root_base.html b/bullet/web/templates/web/root_base.html
index 6b57ae99..185db20b 100644
--- a/bullet/web/templates/web/root_base.html
+++ b/bullet/web/templates/web/root_base.html
@@ -27,15 +27,16 @@
         <link rel="preconnect"
               href="https://fonts.gstatic.com"
               crossorigin>
-        <link href="https://fonts.googleapis.com/css2?family=Work+Sans:wght@300;400;500;600;700&display=swap"
-              rel="stylesheet">
+        <link href="https://fonts.googleapis.com/css2?family=Work+Sans:ital,wght@0,100..900;1,100..900&display=swap" rel="stylesheet">
         <link rel="stylesheet"
               href="{% static 'app.css' %}?v={{ bullet_version }}"
               type="text/css" />
         {% block extrahead %}
         {% endblock extrahead %}
         <script src="{% static 'fontawesomefree/js/all.min.js' %}"></script>
+        {# TODO: Remove iconify #}
         <script src="https://code.iconify.design/2/2.0.0/iconify.min.js"></script>
+        <script src="https://code.iconify.design/iconify-icon/2.3.0/iconify-icon.min.js"></script>
         <link rel="stylesheet"
               href="https://cdn.jsdelivr.net/npm/flatpickr/dist/flatpickr.min.css">
         <script src="https://cdn.jsdelivr.net/npm/flatpickr"></script>
diff --git a/css/app.css b/css/app.css
index e8b1d8de..8fc51348 100644
--- a/css/app.css
+++ b/css/app.css
@@ -170,3 +170,7 @@
 .prose-archive img:not(.math) {
     @apply mx-auto max-w-full w-2/3 max-h-40 object-contain;
 }
+
+.prose iframe {
+  max-width: 100%;
+}