diff --git a/templates/ergo.html.tera b/templates/ergo.html.tera
index ecb4bf9..f0d8611 100644
--- a/templates/ergo.html.tera
+++ b/templates/ergo.html.tera
@@ -4,100 +4,122 @@
 
 {% block content %}
 	<div class="max-w-screen-lg w-full">
-		{% if flash %}
-			{{ macros::alert(message=flash.1, type=flash.0, class="sm:col-span-2 lg:col-span-3") }}
+    <h1 class="h1">Ergo Challenges</h1>
+
+    {% if flash %}
+			{{ macros::alert(message=flash.1, type=flash.0, class="my-3") }}
 		{% endif %}
-		<details>
-		  <summary>Deine Daten</summary>
-		  <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 it@rudernlinz.at).
-			<br /><br />
-			<ul>
-				<li>Geburtsdatum: {{ loggedin_user.dob }}</li>
-				<li>Gewicht: {{ loggedin_user.weight}} kg</li>
-				<li>Geschlecht: {{ loggedin_user.sex}}</li>
-			</ul>
-		  </p>
-		</details>
-
-		<h1 class="h1">Neuer Eintrag</h1>
-		<details>
-		  <summary>Dirty Thirty</summary>
-		  <p>
-			<div class="border-r border-l">
-				<form action="/ergo/thirty" method="post" enctype="multipart/form-data">
-					<label for="user-thirty" class="text-sm text-gray-600">Ergo-Fahrer</label>
-					<select name="user" id="user-thirty" class="input">
-						{% for user in users %}
-							{% if user.id == loggedin_user.id %}
-								<option value="{{ user.id }}" selected="selected">{{ user.name }}</option>
-							{% else %}
-								<option value="{{ user.id }}">{{ user.name }}</option>
-							{% endif %}
-						{% endfor %}
-					</select>
-					{{ macros::input(label="Zeit [(hh:)mm:ss]/Distanz [m]", name="result", required=true, type="text", class="input") }}
-					<label for="file-thirty" class="text-sm text-gray-600">Ergebnis-Foto vom Ergo-Display</label>
-					<input type="file" id="file-thirty" name="proof" class="input" accept="image/*" capture="camera">
-					<input type="submit" value="Speichern" class="btn btn-primary w-full col-span-4 m-auto"/>
-				</form>
-			</div>
-		  </p>
-		</details>
-
-		<details>
-		  <summary>Dirty Dozen</summary>
-		  <p>
-			<div class="border-r border-l">
-				<form action="/ergo/dozen" method="post" enctype="multipart/form-data">
-					<label for="user-dozen" class="text-sm text-gray-600">Ergo-Fahrer</label>
-					<select name="user" id="user-dozen" class="input">
-						<option disabled="disabled">User auswählen</option>
-						{% for user in users %}
-							{% if user.id == loggedin_user.id %}
-								<option value="{{ user.id }}" selected="selected">{{ user.name }}</option>
-							{% else %}
-								<option value="{{ user.id }}">{{ user.name }}</option>
-							{% endif %}
-						{% endfor %}
-					</select>
-					{{ macros::input(label="Zeit [(hh:)mm:ss]/Distanz [m]", name="result", required=true, type="text", class="input") }}
-					<label for="file-dozen" class="text-sm text-gray-600">Ergebnis-Foto vom Ergo-Display</label>
-					<input type="file" id="file-dozen" name="proof" class="input" accept="image/*" capture="camera">
-					<input type="submit" value="Speichern" class="btn btn-primary w-full col-span-4 m-auto"/>
-				</form>
-			</div>
-		  </p>
-		</details>
 
 
+    <div class="grid gap-3">
+      <details class="bg-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 hover:text-primary-950 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 class="bg-white rounded-md block shadow grid gap-3">
+      <h2 class="h2">Neuer Eintrag</h1>
+      
+      <details class="p-2">
+        <summary class="cursor-pointer">Dirty Thirty</summary>
+        <div class="mt-3">
+          <form action="/ergo/thirty" class="grid gap-3" method="post" enctype="multipart/form-data">
+            <div>
+              <label for="user-thirty" class="text-sm text-gray-600">Ergo-Fahrer</label>
+              <select name="user" id="user-thirty" class="input rounded-md">
+                <option disabled="disabled">User auswählen</option>
+                {% for user in users %}
+                  {% if user.id == loggedin_user.id %}
+                    <option value="{{ user.id }}" selected="selected">{{ user.name }}</option>
+                  {% else %}
+                    <option value="{{ user.id }}">{{ user.name }}</option>
+                  {% endif %}
+                {% endfor %}
+              </select>
+            </div>
+            
+             {{ macros::input(label="Distanz [m]", name="result", required=true, type="text", class="input rounded-md") }}
 
-		<h1 class="h1">Aktuelle Woche</h1>
-		<details>
-		  <summary>Dirty Thirty</summary>
-		  <p>
-			<div class="border-r border-l">
-				<ol>
-				{% for stat in thirty %}
-					<li>{{ stat.name }}: {{ stat.result }}</li>
-				{% endfor %}
-				</ol>
-			</div>
-		  </p>
-		</details>
+            <div>
+              <label for="file-thirty" class="text-sm text-gray-600">Ergebnis-Foto vom Ergo-Display</label>
+              <input type="file" id="file-thirty" name="proof" class="input rounded-md" accept="image/*" capture="camera">
+            </div>
+            <div class="text-end">
+              <input type="submit" value="Speichern" class="btn btn-primary btn-fw m-auto"/>
+            </div>
+          </form>
+        </div>
+      </details>
 
-		<details>
-		  <summary>Dirty Dozen</summary>
-		  <p>
-			<div class="border-r border-l">
-				<ol>
-				{% for stat in dozen%}
-					<li>{{ stat.name }}: {{ stat.result }}</li>
-				{% endfor %}
-				</ol>
-			</div>
-		  </p>
-		</details>
+      <details class="p-2">
+        <summary class="cursor-pointer">Dirty Dozen</summary>
+        <div class="mt-3">
+          <form action="/ergo/dozen"  class="grid gap-3" method="post" enctype="multipart/form-data">
+            <div>
+              <label for="user-dozen" class="text-sm text-gray-600">Ergo-Fahrer</label>
+              <select name="user" id="user-dozen" class="input rounded-md">
+                <option disabled="disabled">User auswählen</option>
+                {% for user in users %}
+                  {% if user.id == loggedin_user.id %}
+                    <option value="{{ user.id }}" selected="selected">{{ user.name }}</option>
+                  {% else %}
+                    <option value="{{ user.id }}">{{ user.name }}</option>
+                  {% endif %}
+                {% endfor %}
+              </select>
+            </div>
+            
+             {{ macros::input(label="Zeit [(hh:)mm:ss]/Distanz [m]", name="result", required=true, type="text", class="input rounded-md") }}
+
+            <div>
+              <label for="file-dozen" class="text-sm text-gray-600">Ergebnis-Foto vom Ergo-Display</label>
+              <input type="file" id="file-dozen" name="proof" class="input rounded-md" accept="image/*" capture="camera">
+            </div>
+            <div class="text-end">
+              <input type="submit" value="Speichern" class="btn btn-primary btn-fw m-auto"/>
+            </div>
+          </form>
+        </div>
+      </details>
+    </div>
+
+
+    <div class="bg-white rounded-md block shadow grid gap-3">
+      <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>
+        <div class="mt-3">
+          <ol>
+          {% for stat in thirty %}
+            <li><strong>{{ stat.name }}:</strong> {{ stat.result }}</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><strong>{{ stat.name }}:</strong> {{ stat.result }}</li>
+          {% endfor %}
+          </ol>
+        </div>
+      </details>
+      </div>
+    </div>
 	</div>
 
 {% endblock content%}