diff --git a/src/App.svelte b/src/App.svelte
index 07772e8c..9211b0ac 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -43,7 +43,9 @@
   import Runners from "./components/Runners.svelte";
   import Footer from "./components/Footer.svelte";
   import Tracks from "./components/Tracks.svelte";
-import TracksOverview from "./components/TracksOverview.svelte";
+  import TracksOverview from "./components/TracksOverview.svelte";
+  import OrgDetail from "./components/OrgDetail.svelte";
+import Teams from "./components/Teams.svelte";
   store.init();
 
   // if ("serviceWorker" in navigator) {
@@ -87,89 +89,15 @@ import TracksOverview from "./components/TracksOverview.svelte";
         <Route path="/runners">
           <Runners />
         </Route>
+        <Route path="/teams">
+          <Teams />
+        </Route>
         <Route path="/orgs/*">
           <Route path="/">
-            <div class="bg-white p-5">
-              <h1>Portfolio introduction</h1>
-              <nav><a class="underline" href="./1">Org 1</a></nav>
-            </div>
             <Orgs />
           </Route>
           <Route path="/:orgid" let:params>
-            <div class="bg-white p-5">
-              <div class="flex flex-row mb-4">
-                <div class="w-full">
-                  <nav class="w-full flex">
-                    <ol
-                      class="list-none flex flex-row items-center justify-start">
-                      <li class="mr-2 flex items-center">
-                        <svg
-                          stroke="currentColor"
-                          fill="none"
-                          stroke-width="2"
-                          viewBox="0 0 24 24"
-                          stroke-linecap="round"
-                          stroke-linejoin="round"
-                          class="h-3 w-3 stroke-current"
-                          height="1em"
-                          width="1em"
-                          xmlns="http://www.w3.org/2000/svg"><path
-                            d="M3 9l9-7 9 7v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z" />
-                          <polyline points="9 22 9 12 15 12 15 22" /></svg>
-                      </li>
-                      <li class="flex items-center">
-                        <a class="mr-2" href="/">Home</a><svg
-                          stroke="currentColor"
-                          fill="none"
-                          stroke-width="2"
-                          viewBox="0 0 24 24"
-                          stroke-linecap="round"
-                          stroke-linejoin="round"
-                          class="h-3 w-3 mr-2 stroke-current"
-                          height="1em"
-                          width="1em"
-                          xmlns="http://www.w3.org/2000/svg"><line
-                            x1="5"
-                            y1="12"
-                            x2="19"
-                            y2="12" />
-                          <polyline points="12 5 19 12 12 19" /></svg>
-                      </li>
-                      <li class="mr-2 flex items-center">
-                        <svg
-                          xmlns="http://www.w3.org/2000/svg"
-                          viewBox="0 0 24 24"
-                          width="24"
-                          height="24"><path fill="none" d="M0 0h24v24H0z" />
-                          <path
-                            d="M21 20h2v2H1v-2h2V3a1 1 0 0 1 1-1h16a1 1 0 0 1 1 1v17zm-2 0V4H5v16h14zM8 11h3v2H8v-2zm0-4h3v2H8V7zm0 8h3v2H8v-2zm5 0h3v2h-3v-2zm0-4h3v2h-3v-2zm0-4h3v2h-3V7z" /></svg>
-                      </li>
-                      <li class="flex items-center">
-                        <a class="mr-2" href="./">Orgs</a><svg
-                          stroke="currentColor"
-                          fill="none"
-                          stroke-width="2"
-                          viewBox="0 0 24 24"
-                          stroke-linecap="round"
-                          stroke-linejoin="round"
-                          class="h-3 w-3 mr-2 stroke-current"
-                          height="1em"
-                          width="1em"
-                          xmlns="http://www.w3.org/2000/svg"><line
-                            x1="5"
-                            y1="12"
-                            x2="19"
-                            y2="12" />
-                          <polyline points="12 5 19 12 12 19" /></svg>
-                      </li>
-                      <li class="flex items-center">
-                        <span class="mr-2">Org-Details #{params.orgid}</span>
-                      </li>
-                    </ol>
-                  </nav>
-                </div>
-              </div>
-            </div>
+            <OrgDetail params={params}/>
           </Route>
         </Route>
         <Route path="/about">
diff --git a/src/components/Dashboard.svelte b/src/components/Dashboard.svelte
index 1a23b650..53aa3334 100644
--- a/src/components/Dashboard.svelte
+++ b/src/components/Dashboard.svelte
@@ -56,7 +56,7 @@
           <path
             d="M10.707 2.293a1 1 0 00-1.414 0l-7 7a1 1 0 001.414 1.414L4 10.414V17a1 1 0 001 1h2a1 1 0 001-1v-2a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 001 1h2a1 1 0 001-1v-6.586l.293.293a1 1 0 001.414-1.414l-7-7z" />
         </svg>
-        <span>Dashboard</span>
+        <span>{$_('dashboard-title')}</span>
       </a>
       <a
         class:bg-gray-100={$router.path.includes('/orgs/')}
@@ -71,22 +71,22 @@
           height="24"><path fill="none" d="M0 0h24v24H0z" />
           <path
             d="M17 19h2v-8h-6v8h2v-6h2v6zM3 19V4a1 1 0 0 1 1-1h14a1 1 0 0 1 1 1v5h2v10h1v2H2v-2h1zm4-8v2h2v-2H7zm0 4v2h2v-2H7zm0-8v2h2V7H7z" /></svg>
-        <span>Orgs</span>
+        <span>{$_('orgs')}</span>
       </a>
       <a
         class:bg-gray-100={$router.path === '/users/'}
         class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-100 hover:text-gray-900"
         href="/users/">
         <svg
-          xmlns="http://www.w3.org/2000/svg"
-          viewBox="0 0 24 24"
           class="flex-shrink-0 w-5 h-5 mr-2 text-gray-400 transition group-hover:text-gray-600"
-          width="24"
           fill="currentColor"
-          height="24"><path fill="none" d="M0 0h24v24H0z" />
-          <path
-            d="M2 22a8 8 0 1 1 16 0H2zm8-9c-3.315 0-6-2.685-6-6s2.685-6 6-6 6 2.685 6 6-2.685 6-6 6zm7.363 2.233A7.505 7.505 0 0 1 22.983 22H20c0-2.61-1-4.986-2.637-6.767zm-2.023-2.276A7.98 7.98 0 0 0 18 7a7.964 7.964 0 0 0-1.015-3.903A5 5 0 0 1 21 8a4.999 4.999 0 0 1-5.66 4.957z" /></svg>
-        <span>Users</span>
+          width="24"
+          height="24"
+          xmlns="http://www.w3.org/2000/svg"
+          viewBox="0 0 640 512"><path
+            fill="currentColor"
+            d="M610.5 341.3c2.6-14.1 2.6-28.5 0-42.6l25.8-14.9c3-1.7 4.3-5.2 3.3-8.5-6.7-21.6-18.2-41.2-33.2-57.4-2.3-2.5-6-3.1-9-1.4l-25.8 14.9c-10.9-9.3-23.4-16.5-36.9-21.3v-29.8c0-3.4-2.4-6.4-5.7-7.1-22.3-5-45-4.8-66.2 0-3.3.7-5.7 3.7-5.7 7.1v29.8c-13.5 4.8-26 12-36.9 21.3l-25.8-14.9c-2.9-1.7-6.7-1.1-9 1.4-15 16.2-26.5 35.8-33.2 57.4-1 3.3.4 6.8 3.3 8.5l25.8 14.9c-2.6 14.1-2.6 28.5 0 42.6l-25.8 14.9c-3 1.7-4.3 5.2-3.3 8.5 6.7 21.6 18.2 41.1 33.2 57.4 2.3 2.5 6 3.1 9 1.4l25.8-14.9c10.9 9.3 23.4 16.5 36.9 21.3v29.8c0 3.4 2.4 6.4 5.7 7.1 22.3 5 45 4.8 66.2 0 3.3-.7 5.7-3.7 5.7-7.1v-29.8c13.5-4.8 26-12 36.9-21.3l25.8 14.9c2.9 1.7 6.7 1.1 9-1.4 15-16.2 26.5-35.8 33.2-57.4 1-3.3-.4-6.8-3.3-8.5l-25.8-14.9zM496 368.5c-26.8 0-48.5-21.8-48.5-48.5s21.8-48.5 48.5-48.5 48.5 21.8 48.5 48.5-21.7 48.5-48.5 48.5zM96 224c35.3 0 64-28.7 64-64s-28.7-64-64-64-64 28.7-64 64 28.7 64 64 64zm224 32c1.9 0 3.7-.5 5.6-.6 8.3-21.7 20.5-42.1 36.3-59.2 7.4-8 17.9-12.6 28.9-12.6 6.9 0 13.7 1.8 19.6 5.3l7.9 4.6c.8-.5 1.6-.9 2.4-1.4 7-14.6 11.2-30.8 11.2-48 0-61.9-50.1-112-112-112S208 82.1 208 144c0 61.9 50.1 112 112 112zm105.2 194.5c-2.3-1.2-4.6-2.6-6.8-3.9-8.2 4.8-15.3 9.8-27.5 9.8-10.9 0-21.4-4.6-28.9-12.6-18.3-19.8-32.3-43.9-40.2-69.6-10.7-34.5 24.9-49.7 25.8-50.3-.1-2.6-.1-5.2 0-7.8l-7.9-4.6c-3.8-2.2-7-5-9.8-8.1-3.3.2-6.5.6-9.8.6-24.6 0-47.6-6-68.5-16h-8.3C179.6 288 128 339.6 128 403.2V432c0 26.5 21.5 48 48 48h255.4c-3.7-6-6.2-12.8-6.2-20.3v-9.2zM173.1 274.6C161.5 263.1 145.6 256 128 256H64c-35.3 0-64 28.7-64 64v32c0 17.7 14.3 32 32 32h65.9c6.3-47.4 34.9-87.3 75.2-109.4z" /></svg>
+        <span>{$_('users')}</span>
       </a>
       <a
         class:bg-gray-100={$router.path === '/runners/'}
@@ -101,19 +101,37 @@
           height="24"><path fill="none" d="M0 0h24v24H0z" />
           <path
             d="M9.83 8.79L8 9.456V13H6V8.05h.015l5.268-1.918c.244-.093.51-.14.782-.131a2.616 2.616 0 0 1 2.427 1.82c.186.583.356.977.51 1.182A4.992 4.992 0 0 0 19 11v2a6.986 6.986 0 0 1-5.402-2.547l-.581 3.297L15 15.67V23h-2v-5.986l-2.05-1.987-.947 4.298-6.894-1.215.348-1.97 4.924.868L9.83 8.79zM13.5 5.5a2 2 0 1 1 0-4 2 2 0 0 1 0 4z" /></svg>
-        <span>Runners</span>
+        <span>{$_('runners')}</span>
+      </a>
+      <a
+        class:bg-gray-100={$router.path === '/teams/'}
+        class="flex items-center px-4 py-3 text-gray-900 transition cursor-pointer group hover:bg-gray-100 hover:text-gray-900"
+        href="/teams/">
+        <svg
+          class="flex-shrink-0 w-5 h-5 mr-2 text-gray-400 transition group-hover:text-gray-600"
+          fill="currentColor"
+          width="24"
+          height="24"
+          xmlns="http://www.w3.org/2000/svg"
+          viewBox="0 0 640 512"><path
+            fill="currentColor"
+            d="M96 224c35.3 0 64-28.7 64-64s-28.7-64-64-64-64 28.7-64 64 28.7 64 64 64zm448 0c35.3 0 64-28.7 64-64s-28.7-64-64-64-64 28.7-64 64 28.7 64 64 64zm32 32h-64c-17.6 0-33.5 7.1-45.1 18.6 40.3 22.1 68.9 62 75.1 109.4h66c17.7 0 32-14.3 32-32v-32c0-35.3-28.7-64-64-64zm-256 0c61.9 0 112-50.1 112-112S381.9 32 320 32 208 82.1 208 144s50.1 112 112 112zm76.8 32h-8.3c-20.8 10-43.9 16-68.5 16s-47.6-6-68.5-16h-8.3C179.6 288 128 339.6 128 403.2V432c0 26.5 21.5 48 48 48h288c26.5 0 48-21.5 48-48v-28.8c0-63.6-51.6-115.2-115.2-115.2zm-223.7-13.4C161.5 263.1 145.6 256 128 256H64c-35.3 0-64 28.7-64 64v32c0 17.7 14.3 32 32 32h65.9c6.3-47.4 34.9-87.3 75.2-109.4z" /></svg>
+        <span>{$_('teams')}</span>
       </a>
       <a
         class:bg-gray-100={$router.path === '/tracks/'}
         class="flex items-center px-4 py-3 text-gray-900 transition cursor-pointer group hover:bg-gray-100 hover:text-gray-900"
         href="/tracks/">
-        <svg xmlns="http://www.w3.org/2000/svg" height="24" width="24"><path
-            d="M0 0h24v24H0z"
-            class="flex-shrink-0 w-5 h-5 mr-2 text-gray-400 transition group-hover:text-gray-600"
-            fill="none" />
-          <path
-            d="M21 6H3c-1.1 0-2 .9-2 2v8c0 1.1.9 2 2 2h18c1.1 0 2-.9 2-2V8c0-1.1-.9-2-2-2zm0 10H3V8h2v4h2V8h2v4h2V8h2v4h2V8h2v4h2V8h2v8z" /></svg>
-        <span>Tracks</span>
+        <svg
+          class="flex-shrink-0 w-5 h-5 mr-2 text-gray-400 transition group-hover:text-gray-600"
+          fill="currentColor"
+          width="24"
+          height="24"
+          xmlns="http://www.w3.org/2000/svg"
+          viewBox="0 0 640 512"><path
+            fill="currentColor"
+            d="M635.7 167.2L556.1 31.7c-8.8-15-28.3-20.1-43.5-11.5l-69 39.1L503.3 161c2.2 3.8.9 8.5-2.9 10.7l-13.8 7.8c-3.8 2.2-8.7.9-10.9-2.9L416 75l-55.2 31.3 27.9 47.4c2.2 3.8.9 8.5-2.9 10.7l-13.8 7.8c-3.8 2.2-8.7.9-10.9-2.9L333.2 122 278 153.3 337.8 255c2.2 3.7.9 8.5-2.9 10.7l-13.8 7.8c-3.8 2.2-8.7.9-10.9-2.9l-59.7-101.7-55.2 31.3 27.9 47.4c2.2 3.8.9 8.5-2.9 10.7l-13.8 7.8c-3.8 2.2-8.7.9-10.9-2.9l-27.9-47.5-55.2 31.3 59.7 101.7c2.2 3.7.9 8.5-2.9 10.7l-13.8 7.8c-3.8 2.2-8.7.9-10.9-2.9L84.9 262.9l-69 39.1C.7 310.7-4.6 329.8 4.2 344.8l79.6 135.6c8.8 15 28.3 20.1 43.5 11.5L624.1 210c15.2-8.6 20.4-27.8 11.6-42.8z" /></svg>
+        <span>{$_('tracks')}</span>
       </a>
       <a
         class:bg-gray-100={activePage === 'blub'}
@@ -206,7 +224,7 @@
             clip-rule="evenodd" />
           <path d="M9 11H3v5a2 2 0 002 2h4v-7zM11 18h4a2 2 0 002-2v-5h-6v7z" />
         </svg>
-        <span>Changelog</span>
+        <span>{$_('changelog')}</span>
       </a>
       <a
         class:bg-gray-100={$router.path === '/settings/'}
@@ -222,7 +240,7 @@
             d="M11.49 3.17c-.38-1.56-2.6-1.56-2.98 0a1.532 1.532 0 01-2.286.948c-1.372-.836-2.942.734-2.106 2.106.54.886.061 2.042-.947 2.287-1.561.379-1.561 2.6 0 2.978a1.532 1.532 0 01.947 2.287c-.836 1.372.734 2.942 2.106 2.106a1.532 1.532 0 012.287.947c.379 1.561 2.6 1.561 2.978 0a1.533 1.533 0 012.287-.947c1.372.836 2.942-.734 2.106-2.106a1.533 1.533 0 01.947-2.287c1.561-.379 1.561-2.6 0-2.978a1.532 1.532 0 01-.947-2.287c.836-1.372-.734-2.942-2.106-2.106a1.532 1.532 0 01-2.287-.947zM10 13a3 3 0 100-6 3 3 0 000 6z"
             clip-rule="evenodd" />
         </svg>
-        <span>Settings</span>
+        <span>{$_('settings')}</span>
       </a>
       <a
         class:bg-gray-100={$router.path === '/about/'}
@@ -238,7 +256,7 @@
           stroke-linejoin="round"
           viewBox="0 0 24 24"><circle cx="12" cy="12" r="10" />
           <path d="M12 16v-4M12 8h.01" /></svg>
-        <span>About</span>
+        <span>{$_('about')}</span>
       </a>
       <span
         class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-100 hover:text-gray-900"
@@ -246,14 +264,15 @@
           logout();
         }}>
         <svg
-          xmlns="http://www.w3.org/2000/svg"
-          viewBox="0 0 24 24"
           class="flex-shrink-0 w-5 h-5 mr-2 text-gray-400 transition group-hover:text-gray-600"
+          fill="currentColor"
           width="24"
-          height="24"><path fill="none" d="M0 0h24v24H0z" />
+          height="24"
+          xmlns="http://www.w3.org/2000/svg"
+          viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z" />
           <path
-            d="M5 22a1 1 0 0 1-1-1V3a1 1 0 0 1 1-1h14a1 1 0 0 1 1 1v3h-2V4H6v16h12v-2h2v3a1 1 0 0 1-1 1H5zm13-6v-3h-7v-2h7V8l5 4-5 4z" /></svg>
-        <span>Logout</span>
+            d="M12 22C6.477 22 2 17.523 2 12S6.477 2 12 2a9.985 9.985 0 0 1 8 4h-2.71a8 8 0 1 0 .001 12h2.71A9.985 9.985 0 0 1 12 22zm7-6v-3h-8v-2h8V8l5 4-5 4z" /></svg>
+        <span>{$_('logout')}</span>
       </span>
     </nav>
   </nav>
diff --git a/src/components/OrgDetail.svelte b/src/components/OrgDetail.svelte
new file mode 100644
index 00000000..682a880e
--- /dev/null
+++ b/src/components/OrgDetail.svelte
@@ -0,0 +1,83 @@
+<script>
+  export let params;
+</script>
+
+<section class="container py-10 mx-auto sm:px-2">
+  <span class="mb-1 text-3xl font-extrabold leading-tight text-gray-900">
+    Orgs
+  </span>
+  <p class="mb-8 text-lg text-gray-500">
+    configure the tracks/ min-max lap times
+  </p>
+  <div class="flex flex-row mb-4">
+    <div class="w-full">
+      <nav class="w-full flex">
+        <ol class="list-none flex flex-row items-center justify-start">
+          <li class="mr-2 flex items-center">
+            <svg
+              stroke="currentColor"
+              fill="none"
+              stroke-width="2"
+              viewBox="0 0 24 24"
+              stroke-linecap="round"
+              stroke-linejoin="round"
+              class="h-3 w-3 stroke-current"
+              height="1em"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"><path
+                d="M3 9l9-7 9 7v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z" />
+              <polyline points="9 22 9 12 15 12 15 22" /></svg>
+          </li>
+          <li class="flex items-center">
+            <a class="mr-2" href="/">Home</a><svg
+              stroke="currentColor"
+              fill="none"
+              stroke-width="2"
+              viewBox="0 0 24 24"
+              stroke-linecap="round"
+              stroke-linejoin="round"
+              class="h-3 w-3 mr-2 stroke-current"
+              height="1em"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"><line
+                x1="5"
+                y1="12"
+                x2="19"
+                y2="12" />
+              <polyline points="12 5 19 12 12 19" /></svg>
+          </li>
+          <li class="mr-2 flex items-center">
+            <svg
+              xmlns="http://www.w3.org/2000/svg"
+              viewBox="0 0 24 24"
+              width="24"
+              height="24"><path fill="none" d="M0 0h24v24H0z" />
+              <path
+                d="M21 20h2v2H1v-2h2V3a1 1 0 0 1 1-1h16a1 1 0 0 1 1 1v17zm-2 0V4H5v16h14zM8 11h3v2H8v-2zm0-4h3v2H8V7zm0 8h3v2H8v-2zm5 0h3v2h-3v-2zm0-4h3v2h-3v-2zm0-4h3v2h-3V7z" /></svg>
+          </li>
+          <li class="flex items-center">
+            <a class="mr-2" href="./">Orgs</a><svg
+              stroke="currentColor"
+              fill="none"
+              stroke-width="2"
+              viewBox="0 0 24 24"
+              stroke-linecap="round"
+              stroke-linejoin="round"
+              class="h-3 w-3 mr-2 stroke-current"
+              height="1em"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"><line
+                x1="5"
+                y1="12"
+                x2="19"
+                y2="12" />
+              <polyline points="12 5 19 12 12 19" /></svg>
+          </li>
+          <li class="flex items-center">
+            <span class="mr-2">Org-Details #{params.orgid}</span>
+          </li>
+        </ol>
+      </nav>
+    </div>
+  </div>
+</section>
diff --git a/src/components/Orgs.svelte b/src/components/Orgs.svelte
index 1c0959b4..44584276 100644
--- a/src/components/Orgs.svelte
+++ b/src/components/Orgs.svelte
@@ -2,18 +2,12 @@
   import { _ } from "svelte-i18n";
 </script>
 
-<div class="flex min-h-screen">
-  <div class="w-full bg-white flex items-center justify-center ">
-    <div class="max-w-sm m-8">
-      <div class="text-black text-5xl md:text-15xl font-black">Orgs</div>
-      <div class="w-16 h-1 bg-purple-light my-3 md:my-6" />
-      <p
-        class="text-grey-darker text-2xl md:text-3xl font-light mb-8 leading-normal">
-        bla
-      </p>
-      <a
-        href="/"
-        class="bg-transparent text-grey-darkest font-bold uppercase tracking-wide py-3 px-6 border-2 border-grey-light hover:border-grey rounded-lg">{$_('goback')}</a>
-    </div>
-  </div>
-</div>
+<section class="container py-10 mx-auto sm:px-2">
+  <span class="mb-1 text-3xl font-extrabold leading-tight text-gray-900">
+    Orgs
+  </span>
+  <p class="mb-8 text-lg text-gray-500">
+    configure the tracks/ min-max lap times
+  </p>
+  <nav><a class="underline" href="./1">Org 1</a></nav>
+</section>
diff --git a/src/components/Runners.svelte b/src/components/Runners.svelte
index c1e4c925..57556db1 100644
--- a/src/components/Runners.svelte
+++ b/src/components/Runners.svelte
@@ -2,22 +2,9 @@
   import { _ } from "svelte-i18n";
 </script>
 
-<body class="antialiased font-sans">
-  <div class="flex min-h-screen">
-    <div class="w-full bg-white flex items-center justify-center ">
-      <div class="max-w-sm m-8">
-        <div class="text-black text-5xl md:text-15xl font-black">
-          Runners
-        </div>
-        <div class="w-16 h-1 bg-purple-light my-3 md:my-6" />
-        <p
-          class="text-grey-darker text-2xl md:text-3xl font-light mb-8 leading-normal">
-          bla
-        </p>
-        <a
-          href="/"
-          class="bg-transparent text-grey-darkest font-bold uppercase tracking-wide py-3 px-6 border-2 border-grey-light hover:border-grey rounded-lg">{$_('goback')}</a>
-      </div>
-    </div>
-  </div>
-</body>
+<section class="container py-10 mx-auto sm:px-2">
+  <span class="mb-1 text-3xl font-extrabold leading-tight text-gray-900">
+    {$_('runners')}
+  </span>
+  <p class="mb-8 text-lg text-gray-500">läuft bei ihnen</p>
+</section>
diff --git a/src/components/Teams.svelte b/src/components/Teams.svelte
new file mode 100644
index 00000000..7dfd5f28
--- /dev/null
+++ b/src/components/Teams.svelte
@@ -0,0 +1,10 @@
+<script>
+  import { _ } from "svelte-i18n";
+</script>
+
+<section class="container py-10 mx-auto sm:px-2">
+  <span class="mb-1 text-3xl font-extrabold leading-tight text-gray-900">
+    {$_('teams')}
+  </span>
+  <p class="mb-8 text-lg text-gray-500">everything is more fun together 🏃‍♂️🏃‍♀️🏃‍♂️</p>
+</section>
diff --git a/src/components/Users.svelte b/src/components/Users.svelte
index 1b347fcc..3cb89bb0 100644
--- a/src/components/Users.svelte
+++ b/src/components/Users.svelte
@@ -2,22 +2,9 @@
   import { _ } from "svelte-i18n";
 </script>
 
-<body class="antialiased font-sans">
-  <div class="flex min-h-screen">
-    <div class="w-full bg-white flex items-center justify-center ">
-      <div class="max-w-sm m-8">
-        <div class="text-black text-5xl md:text-15xl font-black">
-          Users
-        </div>
-        <div class="w-16 h-1 bg-purple-light my-3 md:my-6" />
-        <p
-          class="text-grey-darker text-2xl md:text-3xl font-light mb-8 leading-normal">
-          bla
-        </p>
-        <a
-          href="/"
-          class="bg-transparent text-grey-darkest font-bold uppercase tracking-wide py-3 px-6 border-2 border-grey-light hover:border-grey rounded-lg">{$_('goback')}</a>
-      </div>
-    </div>
-  </div>
-</body>
+<section class="container py-10 mx-auto sm:px-2">
+  <span class="mb-1 text-3xl font-extrabold leading-tight text-gray-900">
+    {$_('users')}
+  </span>
+  <p class="mb-8 text-lg text-gray-500">admin users</p>
+</section>
diff --git a/src/locales/de.json b/src/locales/de.json
index 0807ef1c..263c7b83 100644
--- a/src/locales/de.json
+++ b/src/locales/de.json
@@ -41,5 +41,6 @@
   "total-donations": "Spendensumme",
   "credits": "",
   "runners": "Läufer",
-  "total-distance": "gelaufene Strecke"
+  "total-distance": "gelaufene Strecke",
+  "dashboard-greeting": "Willkommen"
 }
diff --git a/src/locales/en.json b/src/locales/en.json
index b61b8054..41d81cb2 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -25,7 +25,7 @@
   "e-mail-adress": "E-Mail Adress",
   "mail-validation-in-progress": "mail validation in progress...",
   "invalid-mail-reset": "the provided email is invalid",
-  "runners": "runners",
+  "runners": "Runners",
   "total-scans": "total scans",
   "total-donations": "total donations",
   "total-distance": "total distance",
@@ -62,6 +62,9 @@
   "dashboard-title": "Dashboard",
   "track-added": "Track added",
   "track-is-being-added": "Track is being added...",
-  "this-might-take-a-moment": "This might take a moment 👀",
-  "track-data-is-being-loaded": "track data is being loaded..."
+  "logout": "Logout",
+  "changelog": "Changelog",
+  "orgs": "Orgs",
+  "users": "Users",
+  "teams": "Teams"
 }