diff --git a/src/components/RunnersOverview.svelte b/src/components/RunnersOverview.svelte
index bf84213d..9aac8adc 100644
--- a/src/components/RunnersOverview.svelte
+++ b/src/components/RunnersOverview.svelte
@@ -86,7 +86,16 @@
                     {/if}
                   </td>
                   <td class="px-6 py-4 whitespace-nowrap">
-                    {runner.group.name}
+                    {#if runner.group.responseType === 'RUNNERTEAM'}
+                      <a
+                        href="../teams/{runner.group.id}"
+                        class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800">{runner.group.name}</a>
+                    {/if}
+                    {#if runner.group.responseType === 'RUNNERORGANIZATION'}
+                      <a
+                        href="../orgs/{runner.group.id}"
+                        class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800">{runner.group.name}</a>
+                    {/if}
                   </td>
                   <td class="px-6 py-4 whitespace-nowrap">{runner.distance}</td>
                   {#if active_deletes[runner.id] === true}
diff --git a/src/components/TeamsOverview.svelte b/src/components/TeamsOverview.svelte
index 042f77ac..b76db2da 100644
--- a/src/components/TeamsOverview.svelte
+++ b/src/components/TeamsOverview.svelte
@@ -80,8 +80,7 @@
                   <td class="px-6 py-4 whitespace-nowrap">
                     <div class="flex items-center">
                       <div class="ml-4">
-                        <div
-                          class="text-sm font-medium text-gray-900">
+                        <div class="text-sm font-medium text-gray-900">
                           {t.name}
                         </div>
                       </div>
@@ -90,10 +89,11 @@
                   <td class="px-6 py-4 whitespace-nowrap">
                     <div class="flex items-center">
                       <div class="ml-4">
-                        <div
-                          class="text-sm font-medium text-gray-900">
+                        <div class="text-sm font-medium text-gray-900">
                           {#if t.parentGroup}
-                            {t.parentGroup.name}
+                            <a
+                              href="../orgs/{t.parentGroup.id}"
+                              class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800">{t.parentGroup.name}</a>
                           {:else}no organization specified{/if}
                         </div>
                       </div>
@@ -102,8 +102,7 @@
                   <td class="px-6 py-4 whitespace-nowrap">
                     <div class="flex items-center">
                       <div class="ml-4">
-                        <div
-                          class="text-sm font-medium text-gray-900">
+                        <div class="text-sm font-medium text-gray-900">
                           {#if t.contact}
                             {JSON.stringify(t.contact)}
                           {:else}no contact specified{/if}