diff --git a/templates/ergo.html.tera b/templates/ergo.html.tera
index 5f2ece2..565f332 100644
--- a/templates/ergo.html.tera
+++ b/templates/ergo.html.tera
@@ -10,40 +10,34 @@
         {{ macros::alert(message=flash.1, type=flash.0, class="my-3") }}
     {% endif %}
 
-    <div class="bg-blue-100 border-t-4 border-blue-500 rounded-b text-blue-900 px-4 py-3 shadow-md" role="alert">
-        <div class="flex">
-            <div class="py-1"><svg class="fill-current h-6 w-6 text-blue-500 mr-4" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M10 20a10 10 0 1110-10 10 10 0 0110 10zm-1-9V7a1 1 0 012 0v4a1 1 0 01-2 0zm0 4a1 1 0 110-2 1 1 0 010 2z"/></svg></div>
-            <div>
-            <p class="font-bold">Ergo-Challenge?!</p>
-            <p class="text-sm">
-	    	<ul style="list-style: disc;">
-			<li><a href="https://rudernlinz.at/termin" target="_blank" style="text-decoration: underline;">Überblick der Challenges</a></li>
-			<li>Eintragung ist jederzeit möglich, alle Daten die bis Sonntag 23:59 hier hochgeladen wurden, werden gesammelt an die Ister Ergo Challenge geschickt
-			<li>Dientag + Donnerstag &rarr; gemeinsames Training; bitte um <a href="/" style="text-decoration: underline;">Anmeldung</a>, damit jeder einen Ergo hat</li>
-			<li><a href="https://docs.google.com/spreadsheets/d/e/2PACX-1vR6b1VPpSOqBnYKrRA6hiHTr8wrQMNspMFoNUxIGRxWAI7Xm2QQoW3QP5k6xYVZ9OxBjRP-r011bNGw/pubhtml" target="_blank" style="text-decoration: underline;">Offizielle Ergebnisse</a>, bei Fehlern direkt mit <a href="mailto:office@ergochallenge.at" style="text-decoration: underline;">Christian (Ister)</a> Kontakt aufnehmen</li>
-			<li><a href="https://cloud.rudernlinz.at/s/m7mPQdwSWscpaXT" target="_blank" style="text-decoration: underline;">Noch mehr Infos zur Ergo-Challenge findest du hier</a></li>
-		</ul>
-	    </p>
-            </div>
-        </div>
-    </div>
-
-
     <div class="grid gap-3">
-      <details class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md p-2 mt-5 shadow">
-        <summary class="cursor-pointer">Deine Daten</summary>
-        <div class="pt-3">
-          <p>
-            Folgende Daten hat der Ruderassistent von dir. Wenn diese nicht mehr aktuell sind, bitte gewünschte Änderungen an Philipp melden (Tel. nr siehe Signal, oder an <a href="mailto:it@rudernlinz.at" class="text-primary-600 dark:text-primary-200 hover:text-primary-950 hover:dark:text-primary-300 underline" target="_blank">it@rudernlinz.at</a>).
-          <br /><br />
-          <ul>
-            <li>Geburtsdatum: {{ loggedin_user.dob }}</li>
-            <li>Gewicht: {{ loggedin_user.weight}} kg</li>
-            <li>Geschlecht: {{ loggedin_user.sex}}</li>
+      <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5" role="alert">
+        <h2 class="h2">Ergo-Challenge?!</h2>
+         <div class="text-sm p-3">
+          <ul class="list-disc ms-2">
+            <li class="py-1"><a href="https://rudernlinz.at/termin" target="_blank" class="link-primary">Überblick der Challenges</a></li>
+            <li class="py-1">Eintragung ist jederzeit möglich, alle Daten die bis Sonntag 23:59 hier hochgeladen wurden, werden gesammelt an die Ister Ergo Challenge geschickt
+            <li class="py-1">Dientag + Donnerstag &rarr; gemeinsames Training; bitte um <a href="/" class="link-primary">Anmeldung</a>, damit jeder einen Ergo hat</li>
+            <li class="py-1"><a href="https://docs.google.com/spreadsheets/d/e/2PACX-1vR6b1VPpSOqBnYKrRA6hiHTr8wrQMNspMFoNUxIGRxWAI7Xm2QQoW3QP5k6xYVZ9OxBjRP-r011bNGw/pubhtml" target="_blank" class="link-primary">Offizielle Ergebnisse</a>, bei Fehlern direkt mit <a href="mailto:office@ergochallenge.at" class="link-primary">Christian (Ister)</a> Kontakt aufnehmen</li>
+            <li class="py-1"><a href="https://cloud.rudernlinz.at/s/m7mPQdwSWscpaXT" target="_blank" class="link-primary">Noch mehr Infos zur Ergo-Challenge findest du hier</a></li>
           </ul>
-          </p>
         </div>
-      </details>
+
+        <details class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md p-2">
+          <summary class="cursor-pointer">Deine Daten</summary>
+          <div class="pt-3">
+            <p>
+              Folgende Daten hat der Ruderassistent von dir. Wenn diese nicht mehr aktuell sind, bitte gewünschte Änderungen an Philipp melden (Tel. nr siehe Signal, oder an <a href="mailto:it@rudernlinz.at" class="text-primary-600 dark:text-primary-200 hover:text-primary-950 hover:dark:text-primary-300 underline" target="_blank">it@rudernlinz.at</a>).
+            <br /><br />
+            <ul>
+              <li>Geburtsdatum: {{ loggedin_user.dob }}</li>
+              <li>Gewicht: {{ loggedin_user.weight}} kg</li>
+              <li>Geschlecht: {{ loggedin_user.sex}}</li>
+            </ul>
+            </p>
+          </div>
+        </details>
+      </div>
     
     <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow grid gap-3">
       <h2 class="h2">Neuer Eintrag</h1>
@@ -116,7 +110,7 @@
       <h2 class="h2">Aktuelle Woche</h2>
       
       <details class="p-2">
-        <summary class="cursor-pointer">Dirty Thirty <small class="text-gray-600">({{thirty | length}})</small></summary>
+        <summary class="cursor-pointer">Dirty Thirty <small class="text-gray-600 dark:text-white">({{thirty | length}})</small></summary>
         <div class="mt-3">
           <ol>
           {% for stat in thirty %}
@@ -127,7 +121,7 @@
       </details>
 
       <details class="p-2">
-        <summary class="cursor-pointer">Dirty Dozen <small class="text-gray-600">({{dozen | length}})</small></summary>
+        <summary class="cursor-pointer">Dirty Dozen <small class="text-gray-600 dark:text-white">({{dozen | length}})</small></summary>
         <div class="mt-3">
           <ol>
           {% for stat in dozen %}
@@ -137,44 +131,44 @@
         </div>
       </details>
       </div>
-    </div>
 
-	{% if loggedin_user.is_admin %}
-    <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow grid gap-3">
-      <h2 class="h2">Update</h2>
-      
-      <details class="p-2">
-        <summary class="cursor-pointer">Dirty Thirty <small class="text-gray-600">({{thirty | length}})</small></summary>
-        <div class="mt-3">
-          <ol>
-          {% for stat in thirty %}
-            <li>
-	    	<form action="/ergo/thirty/user/{{ stat.id }}/new" method="get">
-			{{ stat.name }}: <input type="text" value="{{stat.result}}" name="new" style="color: black;"/><input type="submit"/>
-		</form>
-	    </li>
-          {% endfor %}
-          </ol>
-        </div>
-      </details>
+      {% if loggedin_user.is_admin %}
+          <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow grid gap-3">
+            <h2 class="h2">Update</h2>
+            
+            <details class="p-2">
+              <summary class="cursor-pointer">Dirty Thirty <small class="text-gray-600 dark:text-white">({{thirty | length}})</small></summary>
+              <div class="mt-3">
+                <ol>
+                {% for stat in thirty %}
+                  <li>
+                    <form action="/ergo/thirty/user/{{ stat.id }}/new" method="get">
+                      {{ stat.name }}: <input type="text" value="{{stat.result}}" name="new" style="color: black;"/><input type="submit"/>
+                    </form>
+                  </li>
+                {% endfor %}
+                </ol>
+              </div>
+            </details>
 
-      <details class="p-2">
-        <summary class="cursor-pointer">Dirty Dozen <small class="text-gray-600">({{dozen | length}})</small></summary>
-        <div class="mt-3">
-          <ol>
-          {% for stat in dozen %}
-	    	<li>
-		<form action="/ergo/dozen/user/{{ stat.id }}/new" method="get">
-			{{ stat.name }}: <input type="text" value="{{stat.result}}" name="new" style="color: black;"/><input type="submit"/>
-		</form>
-		</li>
-          {% endfor %}
-          </ol>
+            <details class="p-2">
+              <summary class="cursor-pointer">Dirty Dozen <small class="text-gray-600 dark:text-white">({{dozen | length}})</small></summary>
+              <div class="mt-3">
+                <ol>
+                  {% for stat in dozen %}
+                    <li>
+                      <form action="/ergo/dozen/user/{{ stat.id }}/new" method="get">
+                        {{ stat.name }}: <input type="text" value="{{stat.result}}" name="new" style="color: black;"/><input type="submit"/>
+                      </form>
+                    </li>
+                  {% endfor %}
+                </ol>
+              </div>
+            </details>
+          </div>
         </div>
-      </details>
-      </div>
+      {% endif %}
     </div>
-	{% endif %}
 	</div>
 
 {% endblock content%}