diff --git a/assets/css/style.css b/assets/css/style.css
index 9b709b1b..e14f34d8 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -537,7 +537,7 @@ details[open] summary {
 .intro-video .play-btn {
   position: absolute;
   top: 50%;
-  left: 0;
+  left: calc(50% - 40px);
   transform: translateY(-50%);
 }
 
@@ -914,12 +914,6 @@ link:focus,
   }
 }
 
-@media (min-width: 768px) {
-  .termin-tc {
-    width: 25%;
-  }
-}
-
 @media (max-width: 991px) {
   .navigation {
     background: var(--gcg-color-secondary);
diff --git a/layouts/404.html b/layouts/404.html
index 8d3ef15b..e26611cd 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -2,13 +2,9 @@
 
 <section class="section">
   <div class="container">
-    <div class="row">
-      <div class="col-12">
-        <div class="content">
-          <h3>Hier geht es leider nicht weiter.</h3>
-          <a class="btn btn-primary" href="{{ .Site.BaseURL | relURL }}">Zurück zur Startseite</a>
-        </div>
-      </div>
+    <div class="content">
+      <h3>Hier geht es leider nicht weiter.</h3>
+      <a class="btn btn-primary" href="{{ .Site.BaseURL | relURL }}">Zurück zur Startseite</a>
     </div>
   </div>
 </section>
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index b2a001ca..27b9b674 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -8,7 +8,7 @@
           {{ $paginator := .Paginate ( where .Data.Pages "Type" "post") }}
           {{ range $paginator.Pages }}
           <div class="col-md-6 d-flex align-items-stretch">
-            {{ partial "card" . }}
+            {{ partial "card-article" . }}
           </div>
           {{ end }}
           <div class="col-12 mt-4">
diff --git a/layouts/abiturienten/single.html b/layouts/abiturienten/single.html
index c0b5af98..771c4a4b 100644
--- a/layouts/abiturienten/single.html
+++ b/layouts/abiturienten/single.html
@@ -3,7 +3,7 @@
 <section class="section">
   <div class="container">
     <img src="{{ .Params.image | relURL }}" class="img-fluid w-100 mb-4">
-    <div class="content">
+    <div class="content text-justify">
       {{ .Content }}
     </div>
   </div>
diff --git a/layouts/anmeldeformular/list.html b/layouts/anmeldeformular/list.html
index c34d6b8c..dfafc53e 100644
--- a/layouts/anmeldeformular/list.html
+++ b/layouts/anmeldeformular/list.html
@@ -1,6 +1,6 @@
 {{ define "main" }}
 
-<section class="section bg-body-tertiary">
+<section class="section">
   <div class="container">
     <div class="row">
       <div class="col-lg-8 mb-4 mb-lg-0">
diff --git a/layouts/anmeldung/list.html b/layouts/anmeldung/list.html
index 25ea17f1..dbe29120 100644
--- a/layouts/anmeldung/list.html
+++ b/layouts/anmeldung/list.html
@@ -2,7 +2,7 @@
 
 <section class="section">
   <div class="container">
-    <div class="content">
+    <div class="content text-justify">
       {{ .Content }}
     </div>
     <div class="row">
@@ -11,7 +11,7 @@
         <div class="card rounded-0 hover-shadow border-primary">
           <div class="card-body">
             <h4 class="card-title mb-3">{{ .title }}</h4>
-            <div class="content">{{ .content | markdownify }}</div>
+            <div class="content text-justify">{{ .content | markdownify }}</div>
           </div>
         </div>
       </div>
diff --git a/layouts/author/single.html b/layouts/author/single.html
index f6a27829..620871f7 100644
--- a/layouts/author/single.html
+++ b/layouts/author/single.html
@@ -27,7 +27,7 @@
     <div class="row">
 	  {{ range where .Site.RegularPages "Params.author" "intersect" (slice .File.BaseFileName) }}
 	    <div class="col-lg-4 col-sm-6 d-flex align-items-stretch">
-	      {{ partial "card" . }}
+	      {{ partial "card-article" . }}
 	    </div>
 	  {{ end }}
     </div>
diff --git a/layouts/begabte/single.html b/layouts/begabte/single.html
index 77fd36c5..d81be7c8 100644
--- a/layouts/begabte/single.html
+++ b/layouts/begabte/single.html
@@ -1,6 +1,6 @@
 {{ define "main" }}
 
-{{ partial "header-cl-url" . }}
+{{ partial "header-contest" . }}
 
 <section class="section pt-0">
   <div class="container">
diff --git a/layouts/cantorfora/list.html b/layouts/cantorfora/list.html
index 462c19b7..1d790896 100644
--- a/layouts/cantorfora/list.html
+++ b/layouts/cantorfora/list.html
@@ -2,7 +2,7 @@
 
 <section class="section">
   <div class="container">
-    <div class="content">
+    <div class="content text-justify">
       {{ .Content }}
     </div>
     <div class="row">
diff --git a/layouts/cantorpreis/single.html b/layouts/cantorpreis/single.html
index 5fdf0301..5e00df8e 100644
--- a/layouts/cantorpreis/single.html
+++ b/layouts/cantorpreis/single.html
@@ -9,7 +9,7 @@
       <div class="col-sm-7">
         <h3>{{ .Params.Name }}</h3>
         <h6 class="text-body-secondary">{{ .Title }}</h6>
-        <div class="content">
+        <div class="content text-justify">
           {{ .Content }}
         </div>
       </div>
diff --git a/layouts/ganztagsangebote/single.html b/layouts/ganztagsangebote/single.html
index 454e1793..b00918f6 100644
--- a/layouts/ganztagsangebote/single.html
+++ b/layouts/ganztagsangebote/single.html
@@ -2,72 +2,24 @@
 
 <section class="section">
   <div class="container">
-    <div class="row">
-      <div class="col-12 mb-4">
-        <img src="{{ .Params.image | relURL }}" class="img-fluid w-100">
-      </div>
+    <img src="{{ .Params.image | relURL }}" class="img-fluid w-100 mb-4">
+    <h2 class="mb-4">{{ .Title }}</h2>
+    <div class="row mb-4">
+      {{ partial "icon-element" (dict "size" 3 "icon" "mdi-calendar-today-outline" "title" "Zeit" "content" .Params.schedule) }}
+      {{ partial "icon-element" (dict "size" 3 "icon" "mdi-timer-sand" "title" "Dauer" "content" .Params.duration) }}
+      {{ partial "icon-element" (dict "size" 3 "icon" "mdi-crowd" "title" "Klassen" "content" .Params.class) }}
+      {{ partial "icon-element" (dict "size" 3 "icon" "mdi-map-marker-radius-outline" "title" "Raum" "content" .Params.room) }}
     </div>
-    <h2>{{ .Title }}</h2>
-    <div class="row align-items-center mb-4">
-      <div class="col-12">
-        <div class="row">
-          <div class="col-lg-3 col-sm-6 mb-3 mb-sm-0">
-            <div class="d-flex align-items-center">
-              <i class="mdi mdi-calendar-today-outline text-primary icon-md me-2"></i>
-              <div class="text-start">
-                <h6 class="mb-0 text-uppercase">Zeit</h6>
-                <p class="mb-0">{{ .Params.schedule }}</p>
-              </div>
-            </div>
-          </div>
-          <div class="col-lg-3 col-sm-6 mb-3 mb-sm-0">
-            <div class="d-flex align-items-center">
-              <i class="mdi mdi-timer-sand text-primary icon-md me-2"></i>
-              <div class="text-start">
-                <h6 class="mb-0 text-uppercase">Dauer</h6>
-                <p class="mb-0">{{ .Params.duration }}</p>
-              </div>
-            </div>
-          </div>
-          <div class="col-lg-3 col-sm-6 mb-3 mb-sm-0">
-            <div class="d-flex align-items-center">
-              <i class="mdi mdi-crowd text-primary icon-md me-2"></i>
-              <div class="text-start">
-                <h6 class="mb-0 text-uppercase">Klassen</h6>
-                <p class="mb-0">{{ .Params.class }}</p>
-              </div>
-            </div>
-          </div>
-          <div class="col-lg-3 col-sm-6 mb-3 mb-sm-0">
-            <div class="d-flex align-items-center">
-              <i class="mdi mdi-map-marker-radius-outline text-primary icon-md me-2"></i>
-              <div class="text-start">
-                <h6 class="mb-0 text-uppercase">Raum</h6>
-                <p class="mb-0">{{ .Params.room }}</p>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="col-12 mt-4">
-        <div class="border-bottom border-primary"></div>
-      </div>
-    </div>
-    <div class="row">
-      <div class="col-12 content">
+    <hr class="mb-4">
+    <div class="content text-justify">
         {{ .Content }}
-      </div>
     </div>
   </div>
 </section>
 
 <section class="section pt-0" data-pagefind-ignore="all">
   <div class="container">
-    <div class="row">
-      <div class="col-12">
-        <h2 class="mb-4">Andere Arbeitsgemeinschaften</h2>
-      </div>
-    </div>
+    <h2 class="mb-4">Andere Arbeitsgemeinschaften</h2>
     <div class="row">
       {{ range partial "related" . }}
         <div class="col-lg-4 col-sm-6">
diff --git a/layouts/index.html b/layouts/index.html
index 11db97f4..b3c3617d 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -6,20 +6,20 @@
 {{ with $data.homepage.slider }}
 <section class="hero-section overlay bg-cover hero-default" data-background="{{ .bg_image | absURL }}">
   <div class="container">
-        <div class="row">
-          <div class="col-md-12">
-            <h2 class="text-white position-relative">{{ $data.homepage.slider.title | markdownify }}</h2>
-            <div class="hero-slider">
-            {{ range .slider_item }}
-              <div class="hero-slider-item">
-                <p class="text-muted mb-4" >{{ .content | markdownify }}</p>
-                {{ if .button.enable }}
-                  <a href="{{ .button.link | absURL }}" class="btn btn-primary">{{ .button.label }}</a>
-                {{ end }}
-              </div>
+    <div class="row">
+      <div class="col-md-12">
+        <h2 class="text-white position-relative">{{ $data.homepage.slider.title | markdownify }}</h2>
+        <div class="hero-slider">
+          {{ range .slider_item }}
+          <div class="hero-slider-item">
+            <p class="text-muted mb-4" >{{ .content | markdownify }}</p>
+            {{ if .button.enable }}
+              <a href="{{ .button.link | absURL }}" class="btn btn-primary">{{ .button.label }}</a>
             {{ end }}
-            </div>
           </div>
+        {{ end }}
+        </div>
+      </div>
     </div>
   </div>
 </section>
@@ -73,7 +73,7 @@
     <div class="row align-items-center">
       <div class="col-md-10 order-2 order-md-1">
         <h3 class="mb-4">{{ .title | markdownify }}</h3>
-        <div class="content">
+        <div class="content text-justify">
           {{ .content | markdownify }}
         </div>
         {{ if .button.enable }}
@@ -139,7 +139,7 @@
       {{ end }}
       {{ range first (cond $data.ausblick.enable (int $data.homepage.blog.number) (add $data.homepage.blog.number 1)) (where .Site.RegularPages "Type" "post")}}
       <div class="col-lg-4 col-sm-6 mb-4 mb-lg-0 d-flex align-items-stretch">
-        {{ partial "card" . }}
+        {{ partial "card-article" . }}
       </div>
       {{ end }}
     </div>
diff --git a/layouts/kontakt/list.html b/layouts/kontakt/list.html
index 4d1844ae..3ab7b970 100644
--- a/layouts/kontakt/list.html
+++ b/layouts/kontakt/list.html
@@ -1,14 +1,10 @@
 {{ define "main" }}
 
-<link rel="stylesheet" href="https://unpkg.com/leaflet@1.7.1/dist/leaflet.css"
-integrity="sha512-xodZBNTC5n17Xt2atTPuE1HxjVMSvLVW9ocqUKLsCC5CXdbqCmblAshOMAS6/keqq/sMZMZ19scR4PsZChSR7A=="
-crossorigin=""/>
+<link rel="stylesheet" href="https://unpkg.com/leaflet@^1.7.1/dist/leaflet.css" />
 
-<script src="https://unpkg.com/leaflet@1.7.1/dist/leaflet.js"
- integrity="sha512-XQoYMqMTK8LvdxXYG3nZ448hOEQiglfqkJs1NOQV44cWnUrBc8PkAOcXy20w0vlaXaVUearIOBhiXZ5V3ynxwA=="
- crossorigin=""></script>
+<script src="https://unpkg.com/leaflet@^1.7.1/dist/leaflet.js"></script>
 
-<section class="section pb-0 bg-body-tertiary">
+<section class="section pb-0">
   <div class="container">
     <div class="row">
       <div class="col-lg-6 mb-4 mb-lg-0">
@@ -48,30 +44,22 @@ crossorigin=""/>
   </div>
 </section>
 
-<section class="section bg-body-tertiary">
-    <div class="container">
-      <div class="row">
-        <div class="col-12">
-          <div id="map" class="card">
-            <script>
-              var map = L.map('map', {
-                scrollWheelZoom: false
-              }).setView([51.473361, 11.965619], 100);
+<div id="map" class="mt-4">
+  <script>
+    var map = L.map('map', {
+      scrollWheelZoom: false
+    }).setView([51.473361, 11.965619], 100);
 
-              L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
-                  attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
-              }).addTo(map);
+    L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
+        attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
+    }).addTo(map);
 
-              var marker = L.marker([51.473361, 11.965619]).addTo(map);
+    var marker = L.marker([51.473361, 11.965619]).addTo(map);
 
-              map.on('click', (e) => {
-                  marker.bindPopup('Georg-Cantor-Gymnasium<br>Torstraße 13<br>06110 Halle (Saale)<br><b><a href="https://www.qwant.com/maps/place/osm:way:54033279@Georg-Cantor-Gymnasium">Route</a>').openPopup();
-              });
-            </script>
-          </div>
-        </div>
-      </div>
-    </div>
-</section>
+    map.on('click', (e) => {
+        marker.bindPopup('Georg-Cantor-Gymnasium<br>Torstraße 13<br>06110 Halle (Saale)<br><b><a href="https://www.qwant.com/maps/place/osm:way:54033279@Georg-Cantor-Gymnasium">Route</a>').openPopup();
+    });
+  </script>
+</div>
 
 {{ end }}
diff --git a/layouts/pages/single.html b/layouts/pages/single.html
index 996f630f..289b95ab 100644
--- a/layouts/pages/single.html
+++ b/layouts/pages/single.html
@@ -2,12 +2,8 @@
 
 <section class="section">
   <div class="container">
-    <div class="row">
-      <div class="col-12">
-        <div class="content">
-          {{ .Content | safeHTML }}
-        </div>
-      </div>
+    <div class="content text-justify">
+      {{ .Content }}
     </div>
   </div>
 </section>
diff --git a/layouts/partials/authors.html b/layouts/partials/authors.html
index df404707..9f1c9f22 100644
--- a/layouts/partials/authors.html
+++ b/layouts/partials/authors.html
@@ -1,8 +1,8 @@
 {{ range $index, $elements := where (where .Site.RegularPages "Type" "author") "File.BaseFileName" "in" .author  }}
 	{{ if ne $index 0 }}, {{ end }}
 	{{ if .Params.simplified }}
-	{{ .Title }}
+	  {{ .Title }}
 	{{ else }}
-	<a href="{{ .Permalink }}">{{ .Title }}</a>
+	  <a href="{{ .Permalink }}">{{ .Title }}</a>
 	{{ end }}
 {{ end }}
\ No newline at end of file
diff --git a/layouts/partials/blog-sidebar.html b/layouts/partials/blog-sidebar.html
index 26487cbd..c3a026b0 100644
--- a/layouts/partials/blog-sidebar.html
+++ b/layouts/partials/blog-sidebar.html
@@ -1,37 +1,37 @@
 <aside class="col-lg-4 mt-4 mt-lg-0" data-pagefind-ignore="all">
-  <div class="bg-white mb-4">
+  <div class="mb-4">
     <h4 class="mb-4">Kategorien</h4>
     {{ $transliterations := .Site.Data.transliterations.transliterations }}
-    {{- if isset .Site.Taxonomies "categories" }}
-    {{- if not (eq (len .Site.Taxonomies.categories) 0) }}
+    {{ if isset .Site.Taxonomies "categories" }}
+    {{ if not (eq (len .Site.Taxonomies.categories) 0) }}
     <div class="tag-list">
-      {{- range $name, $items := .Site.Taxonomies.categories }}
+      {{ range $name, $items := .Site.Taxonomies.categories }}
       <a href="{{ `categories/` | relURL }}{{ $name | urlize | lower }}">{{ if (index $transliterations $name) }}{{ index $transliterations $name }}{{ else }}{{ $name | title }}{{end}}</a>
-      {{- end }}
+      {{ end }}
     </div>
-    {{- end }}
-    {{- end }}
+    {{ end }}
+    {{ end }}
   </div>
-  <div class="bg-white mb-4">
+  <div class="mb-4">
     <h4 class="mb-4">Tags</h4>
-    {{- if isset .Site.Taxonomies "tags" }}
-    {{- if not (eq (len .Site.Taxonomies.tags) 0) }}
+    {{ if isset .Site.Taxonomies "tags" }}
+    {{ if not (eq (len .Site.Taxonomies.tags) 0) }}
     <div class="tag-list">
-      {{- range $name, $items := .Site.Taxonomies.tags }}
+      {{ range $name, $items := .Site.Taxonomies.tags }}
       <a href="{{ `tags/` | relURL }}{{ $name | urlize | lower }}">{{ $name }}</a>
-      {{- end }}
+      {{ end }}
     </div>
-    {{- end }}
-    {{- end }}
+    {{ end }}
+    {{ end }}
   </div>
   <div class="bg-white">
     <h4 class="mb-4">Neuste Beiträge</h4>
     {{ range first 5 ( where .Site.Pages "Type" "post" )}}
     <div class="d-flex border-bottom border-color pb-3 mb-3">
-      <a href="{{ .Permalink }}"><img class="me-3 post-thumb-sm" src="{{ .Params.Image | absURL }}"></a>
-      <div class="flex-grow-1">
+      <a href="{{ .Permalink }}"><img class="me-3 post-thumb-sm" src="{{ .Params.image | absURL }}"></a>
+      <div class="flex-grow-1 min-w-0 d-flex flex-column justify-content-between">
         <a href="{{ .Permalink }}">
-          <h5>{{ .Title }}</h5>
+          <h5 class="text-truncate">{{ .Title }}</h5>
         </a>
         {{ time.Format "02. Jan 2006" .PublishDate }}
       </div>
diff --git a/layouts/partials/card.html b/layouts/partials/card-article.html
similarity index 93%
rename from layouts/partials/card.html
rename to layouts/partials/card-article.html
index e4cd2afd..1d6a5972 100644
--- a/layouts/partials/card.html
+++ b/layouts/partials/card-article.html
@@ -1,4 +1,4 @@
-<div class="card border-primary rounded-0 hover-shadow mb-4">
+<div class="card border-primary rounded-0 hover-shadow mb-2">
   <a href="{{ .Permalink }}"><img class="card-img-top rounded-0" src="{{ .Params.image | relURL }}" alt="{{ .Title }}"></a>
   <div class="card-body d-flex flex-column">
     <div class="d-flex justify-content-between gap-1 flex-wrap mb-2">
diff --git a/layouts/partials/card-btn-ni.html b/layouts/partials/card-btn-ni.html
deleted file mode 100644
index d28697ce..00000000
--- a/layouts/partials/card-btn-ni.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="col-lg-4 col-sm-6">
-  <div class="card border-primary rounded-0 hover-shadow mb-4">
-      <div class="card-body">
-        <h4 class="card-title text-truncate"><a href="{{ .link }}">{{ .title }}</a></h4>
-        <a href="{{ .link }}" class="btn btn-primary btn-sm" data-pagefind-ignore>Mehr anzeigen</a>
-      </div>
-  </div>
-</div>
-    
\ No newline at end of file
diff --git a/layouts/partials/card-btn.html b/layouts/partials/card-btn.html
index c133e8bf..8058545a 100644
--- a/layouts/partials/card-btn.html
+++ b/layouts/partials/card-btn.html
@@ -1,10 +1,12 @@
 <div class="col-lg-4 col-sm-6 d-flex align-items-stretch">
-  <div class="card border-primary rounded-0 hover-shadow mb-4">
-    <a href="{{ .Permalink }}"><img class="card-img-top rounded-0" src="{{ .Params.image | relURL }}"
-        alt="{{ .Title }}"></a>
+  <div class="card border-primary rounded-0 hover-shadow mb-2 w-100">
+    {{ with .Params.image }}
+      <a href="{{ $.Permalink }}"><img class="card-img-top rounded-0" src="{{ . | relURL }}"
+          alt="{{ $.Title }}"></a>
+    {{ end }}
     <div class="card-body d-flex flex-column">
       <h4 class="card-title text-truncate mt-auto"><a href="{{ .Permalink }}">{{ .Title }}</a></h4>
-      <a href="{{ .Permalink }}" class="btn btn-primary btn-sm text-uppercase align-self-start" data-pagefind-ignore>Mehr anzeigen</a>
+      <a href="{{ .Permalink }}" class="btn btn-primary btn-sm align-self-start" data-pagefind-ignore>Mehr anzeigen</a>
     </div>
   </div>
 </div>
\ No newline at end of file
diff --git a/layouts/partials/card-category.html b/layouts/partials/card-category.html
index 6dbd602b..b5892bb1 100644
--- a/layouts/partials/card-category.html
+++ b/layouts/partials/card-category.html
@@ -1,8 +1,8 @@
-<div class="card border-primary rounded-0 hover-shadow mb-4">
+<div class="card border-primary rounded-0 hover-shadow mb-2">
   <a href="{{ .Permalink }}"><img class="card-img-top rounded-0" src="{{ .Params.Image | relURL }}" alt="{{ .Title }}"></a>
   <div class="card-body">
-    <div class="row col-12 mb-3"><div class="col-1"><i class="mdi mdi-bookmark-outline me-2"></i></div><div class="col-11">{{ .Params.category }}</div></div>
+    <div class="mb-2"><i class="mdi mdi-bookmark-outline me-2"></i>{{ .Params.category }}</div>
     <h4 class="card-title text-truncate"><a href="{{ .Permalink }}">{{ .Title }}</a></h4>
-    <a href="{{ .Permalink }}" class="btn btn-primary btn-sm text-uppercase" data-pagefind-ignore>Mehr anzeigen</a>
+    <a href="{{ .Permalink }}" class="btn btn-primary btn-sm" data-pagefind-ignore>Mehr anzeigen</a>
   </div>
 </div>
\ No newline at end of file
diff --git a/layouts/partials/collapsible.html b/layouts/partials/collapsible.html
index 0bbdd7fd..bf2afb7f 100644
--- a/layouts/partials/collapsible.html
+++ b/layouts/partials/collapsible.html
@@ -1,8 +1,10 @@
 <div class="card border-primary rounded-2 hover-shadow mb-4">
-    <div class="card-body mb-0">
-      <details>
+  <div class="card-body mb-0">
+    <details>
       <summary>{{ .title }}</summary>
-      <div class="content">{{ .content | markdownify }}</div>
-      </details>
-    </div>
-  </div>  
\ No newline at end of file
+      <div class="content text-justify">
+        {{ .content | markdownify | emojify }}
+      </div>
+    </details>
+  </div>
+</div>  
\ No newline at end of file
diff --git a/layouts/partials/download.html b/layouts/partials/download.html
index 731ce0b0..68b52f75 100644
--- a/layouts/partials/download.html
+++ b/layouts/partials/download.html
@@ -1,8 +1,6 @@
-<div class="container mb-0">
-    <div class="card border-primary rounded-0 hover-shadow mb-5">
-      <div class="card-body mb-0">
-        <h4 class="card-title"><a class="text-decoration-none" href='{{ .link }}'>{{ .title }}</a></h4>
-        <a href='{{ .link }}' class="text-decoration-none btn btn-primary btn-sm mb-0"><i class="mdi mdi-tray-arrow-down mb-0 me-2"></i>Download</a>
-      </div>
-    </div>
-  </div>  
\ No newline at end of file
+<div class="card border-primary rounded-0 hover-shadow mb-2">
+  <div class="card-body mb-0">
+    <h4 class="card-title"><a class="text-decoration-none" href='{{ .link }}'>{{ .title }}</a></h4>
+    <a href='{{ .link }}' class="text-decoration-none btn btn-primary btn-sm mb-0"><i class="mdi mdi-tray-arrow-down me-2"></i>Download</a>
+  </div>
+</div>
\ No newline at end of file
diff --git a/layouts/partials/filter-controls.html b/layouts/partials/filter-controls.html
index af4a6be2..1a1a1ecf 100644
--- a/layouts/partials/filter-controls.html
+++ b/layouts/partials/filter-controls.html
@@ -1,21 +1,10 @@
-<div class="row gta-cat">
-  <div class="col-lg-12">
-    <ul class="list-inline text-center filter-controls mb-5">
-      <li class="list-inline-item m-3 text-uppercase active" data-filter="all">Alle</li>
-      {{ $categories := slice }}
-      {{ range .Data.Pages }}
-        {{ $categories = $categories | append .Params.category }}
-      {{ end }}
-      {{ range ( $categories | uniq ) }}
-        <li class="list-inline-item m-3 text-uppercase" data-filter="{{ . | urlize }}">{{ . | humanize }}</li>
-      {{ end }}
-    </ul>
-  </div>
-</div>
-<noscript>
-  <style>
-    .gta-cat {
-      display: none;
-    }
-  </style>
-</noscript>
\ No newline at end of file
+<ul class="list-inline text-center filter-controls mb-4">
+  <li class="list-inline-item m-3 text-uppercase active" data-filter="all">Alle</li>
+  {{ $categories := slice }}
+  {{ range .Data.Pages }}
+    {{ $categories = $categories | append .Params.category }}
+  {{ end }}
+  {{ range ( $categories | uniq ) }}
+    <li class="list-inline-item m-3 text-uppercase" data-filter="{{ . | urlize }}">{{ . | humanize }}</li>
+  {{ end }}
+</ul>
\ No newline at end of file
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 6a90e109..af69f5b6 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -2,40 +2,40 @@
   <div class="footer bg-footer section">
     <div class="container">
       <div class="row">
-        <div class="col-lg-3 col-sm-8 mb-5 mb-lg-0">
+        <div class="col-lg-4 col-sm-6 mb-4 mb-lg-0 text-sm-start text-center">
           <a class="logo-footer" href="{{ .Site.BaseURL | relURL }}"><img class="mb-4" height="60" src="{{ .Site.Params.logo | absURL }}" alt="{{ .Site.Title }}"></a>
           <ul class="list-unstyled text-white text-opacity-50">
-            <li class="mb-4">
+            <li class="mb-3">
               <a href="{{ .Site.Params.route_link }}">{{ .Site.Params.address | markdownify }}</a>
             </li>
-            <li class="mb-4"><a href="mailto:{{ .Site.Params.email }}">{{ .Site.Params.email_pretty | markdownify }}</a></li>
-            <li class="mb-4"><a href="tel:{{ .Site.Params.mobile | markdownify }}">{{ .Site.Params.mobile | markdownify }}</a></li>
-            <li class="mb-4">
+            <li class="mb-3"><a href="mailto:{{ .Site.Params.email }}">{{ .Site.Params.email_pretty | markdownify }}</a></li>
+            <li class="mb-3"><a href="tel:{{ .Site.Params.mobile }}">{{ .Site.Params.mobile | markdownify }}</a></li>
+            <li class="mb-3">
               <a href="{{ .Site.Params.impressumURL | absURL }}">Impressum</a>
             </li>
-            <li class="mb-4">
+            <li class="mb-3">
               <a href="{{ .Site.Params.dseURL | absURL }}">Datenschutz</a>
             </li>
           </ul>
         </div>
-        <div class="col-lg-2 col-sm-4 col-6 mb-5 mb-md-0">
-          <h4 class="text-white mb-5 text-uppercase">Links</h4>
+        <div class="col-lg-2 col-sm-6 mb-4 mb-md-0 text-sm-start text-center">
+          <h4 class="text-white mb-4 text-uppercase">Links</h4>
           <ul class="list-unstyled">
             {{ range .Site.Menus.footer }}
             <li class="mb-3"><a class="text-white text-opacity-50" href="{{ .URL | absURL }}">{{ .Name }}</a></li>
             {{ end }}
           </ul>
         </div>
-        <div class="col-lg-3 col-sm-4 col-6 mb-5 mb-md-0">
-          <h4 class="text-white mb-5 text-uppercase">Ganztagsangebote</h4>
+        <div class="col-lg-3 col-sm-6 mb-4 mb-md-0 text-sm-start text-center">
+          <h4 class="text-white mb-4 text-uppercase">Ganztagsangebote</h4>
           <ul class="list-unstyled">
             {{ range first 5 (where .Site.RegularPages "Type" "ganztagsangebote" | shuffle)}}
             <li class="mb-3"><a class="text-white text-opacity-50" href="{{ .Permalink }}">{{ .Title }}</a></li>
             {{ end }}
           </ul>
         </div>
-        <div class="col-lg-4 col-sm-4 col-6 mb-5 mb-md-0">
-          <h4 class="text-white mb-5 text-uppercase">Aktuelles</h4>
+        <div class="col-lg-3 col-sm-6 mb-4 mb-md-0 text-sm-start text-center">
+          <h4 class="text-white mb-4 text-uppercase">Aktuelles</h4>
           <ul class="list-unstyled">
             {{ range first 5 (where .Site.RegularPages "Type" "post")}}
             <li class="mb-3"><a class="text-white text-opacity-50" href="{{ .Permalink }}">{{ .Title | truncate 35 }}</a></li>
diff --git a/layouts/partials/ganztag.html b/layouts/partials/ganztag.html
index e0b74cbf..65ac5a33 100644
--- a/layouts/partials/ganztag.html
+++ b/layouts/partials/ganztag.html
@@ -1,10 +1,8 @@
-<div class="card border-primary rounded-0 hover-shadow mb-4">
+<div class="card border-primary rounded-0 hover-shadow mb-2">
   <a href="{{ .Permalink }}"><img class="card-img-top rounded-0" src="{{ .Params.image | relURL }}" alt="{{ .Title }}"></a>
   <div class="card-body">
-    <div class="container">
-      <div class="row mb-2"><div class="col-1"><i class="mdi mdi-calendar-today"></i></div><div class="col-11">{{ .Params.schedule }}</div></div>
-      <div class="row mb-2"><div class="col-1"><i class="mdi mdi-crowd"></i></div><div class="col-11">{{ .Params.class }}</div></div>
-    </div>
+    <div class="mb-2 text-truncate"><i class="mdi mdi-calendar-today me-2"></i>{{ .Params.schedule }}</div>
+    <div class="mb-2 text-truncate"><i class="mdi mdi-crowd me-2"></i>{{ .Params.class }}</div>
     <h4 class="card-title text-truncate"><a href="{{ .Permalink }}">{{ .Title }}</a></h4>
     <a href="{{ .Permalink }}" class="btn btn-primary btn-sm" data-pagefind-ignore>Mehr anzeigen</a>
   </div>
diff --git a/layouts/partials/header-cl-url.html b/layouts/partials/header-cl-url.html
deleted file mode 100644
index 85039744..00000000
--- a/layouts/partials/header-cl-url.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<section class="section">
-  <div class="container">
-    {{ if (and .Params.image (ne .Params.image "/media/image.webp") ) }}
-    <div class="row">
-      <div class="col-12 mb-4">
-        <img class="img-fluid w-100" src="{{ .Params.image | relURL }}">
-      </div>
-    </div>
-    {{ end }}
-    <div class="row mb-4">
-      <div class="col-7">
-        <div class="d-flex align-items-center">
-          <i class="mdi mdi-crowd text-primary icon-md me-2"></i>
-          <div class="text-start">
-            <h6 class="mb-0 text-uppercase">Klassen</h6>
-            <p class="mb-0">{{ .Params.class }}</p>
-          </div>
-        </div>
-      </div>
-      {{ if .Params.web_url }}
-      <div class="col-5 text-end mb-4 mb-xl-0">
-        <a href="{{ .Params.web_url | safeURL }}" class="btn btn-primary">Website</a>
-      </div>
-      {{ end }}
-      <div class="col-12 mt-4">
-        <div class="border-bottom border-primary"></div>
-      </div>
-    </div>
-    <div class="row">
-      <div class="col-12 content">
-        {{ .Content }}
-      </div>
-    </div>
-  </div>
-</section>
\ No newline at end of file
diff --git a/layouts/partials/header-contest.html b/layouts/partials/header-contest.html
new file mode 100644
index 00000000..44d3a375
--- /dev/null
+++ b/layouts/partials/header-contest.html
@@ -0,0 +1,23 @@
+<section class="section">
+  <div class="container">
+    {{ if (and .Params.image (ne .Params.image "/media/image.webp") ) }}
+      <img class="img-fluid w-100 mb-4" src="{{ .Params.image | relURL }}">
+    {{ end }}
+    <div class="d-flex justify-content-between mb-4">
+      <div class="d-flex align-items-center">
+        <i class="mdi mdi-crowd text-primary icon-md me-2"></i>
+        <div class="text-start">
+          <h6 class="mb-0 text-uppercase">Klassen</h6>
+          <p class="mb-0">{{ .Params.class }}</p>
+        </div>
+      </div>
+      {{ if .Params.web_url }}
+      <a href="{{ .Params.web_url | safeURL }}" class="btn btn-primary">Website</a>
+      {{ end }}
+    </div>
+    <hr>
+    <div class="content text-justify">
+      {{ .Content }}
+    </div>
+  </div>
+</section>
\ No newline at end of file
diff --git a/layouts/partials/icon-element.html b/layouts/partials/icon-element.html
new file mode 100644
index 00000000..5c2503ab
--- /dev/null
+++ b/layouts/partials/icon-element.html
@@ -0,0 +1,9 @@
+<div class="col-lg-{{.size}} col-sm-{{ mul (int .size) 2 }} mb-3 mb-sm-0">
+	<div class="d-flex align-items-center">
+		<i class="mdi {{ .icon }} text-primary icon-md me-2"></i>
+		<div class="text-start">
+		  <h6 class="mb-0 text-uppercase">{{ .title }}</h6>
+		  <p class="mb-0">{{ .content }}</p>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/layouts/partials/info.html b/layouts/partials/info.html
index a55086d9..1b7d1acd 100644
--- a/layouts/partials/info.html
+++ b/layouts/partials/info.html
@@ -9,8 +9,8 @@
       </div>
       <div class="col-lg-6 col-sm-8">
         <div class="bg-white p-5">
-          <h2 class="mb-4">{{ .title | markdownify }}</h2>
-          <p>{{ .content | markdownify }}</p>
+          <h2 class="mb-4">{{ .title }}</h2>
+          <p class="text-justify">{{ .content | markdownify }}</p>
         </div>
       </div>
     </div>
diff --git a/layouts/partials/modal.html b/layouts/partials/modal.html
index 31f7946b..555652ff 100644
--- a/layouts/partials/modal.html
+++ b/layouts/partials/modal.html
@@ -6,7 +6,7 @@
         <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" data-pagefind-ignore></button>
       </div>
       <div class="modal-body">
-        <div class="content mb-4">
+        <div class="content text-justify mb-4">
         {{ .content | markdownify }}
         </div>
         {{ range .unterhaufen }}
diff --git a/layouts/partials/termin.html b/layouts/partials/termin.html
index 3749c7d4..2fe89195 100644
--- a/layouts/partials/termin.html
+++ b/layouts/partials/termin.html
@@ -1,15 +1,19 @@
-<div class="card d-md-table w-100 hover-shadow border-primary ps-0 pe-0 mb-4">
-    <div class="d-md-table-cell text-center p-4 bg-primary text-white mb-4 mb-md-0 termin-tc rounded">
+<div class="card hover-shadow border-primary mb-4 p-0">
+  <div class="row g-0">
+    <div class="col-md-3 text-center p-4 bg-primary text-white rounded">
       <span class="h2 d-block">{{ time.Format "2" .date}}</span>
       <span class="d-block">{{ time.Format "Jan 2006" .date}}</span>
       {{ with .enddate }}<br>bis {{ time.Format "2 Jan 2006" . }}{{ end }}
     </div>
-    <div class="d-md-table-cell px-4 align-middle mb-4 mb-md-0 p-2">
-      <p class="h4 mb-0 d-block">{{ .title }}</p>
+    <div class="col-md-9">
+      <div class="card-body h-100 d-flex flex-column justify-content-between">
+        <h4 class="card-title">{{ .title }}</h4>
+        {{ with .location }}
+        <div class="card-text">
+          <i class="mdi mdi-map-marker-radius-outline icon-s text-primary me-2"></i>{{ . | markdownify }}
+        </div>
+        {{ end }}
+      </div>
     </div>
-    {{ with .location }}
-    <div class="d-md-table-cell text-end pe-md-4 p-2 align-middle">
-      <p><i class="mdi mdi-map-marker-radius-outline icon-s text-primary me-2"></i>{{ . | markdownify }}</p>
-    </div>
-    {{ end }}
+  </div>
 </div>
\ No newline at end of file
diff --git a/layouts/partials/tile-modals.html b/layouts/partials/tile-modals.html
index 5564531b..87496125 100644
--- a/layouts/partials/tile-modals.html
+++ b/layouts/partials/tile-modals.html
@@ -11,16 +11,16 @@
       {{ range .Params.tiles }}
         {{ partial "modal" . }}
         <div class="col-lg-4 col-sm-6">
-			<div class="card border-primary rounded-0 hover-shadow mb-4">
-				<div class="container fb-tile-color" style="background-color:{{ .bg_color }};">
-					<i class="{{ .icon }} fb-tile-icon" style="color: {{ .font_color }}"></i>
-				</div>
-				<div class="card-body">
-					<h4 class="card-title text-truncate">{{ .title }}</h4>
-					<button type="button" class="btn btn-primary btn-sm" onclick="$('#{{ md5 .title }}').modal('show');" data-pagefind-ignore>Mehr anzeigen</button>
-				</div>
-			</div>
-		</div>
+          <div class="card border-primary rounded-0 hover-shadow mb-4">
+            <div class="container fb-tile-color" style="background-color:{{ .bg_color }};">
+              <i class="{{ .icon }} fb-tile-icon" style="color: {{ .font_color }}"></i>
+            </div>
+            <div class="card-body">
+              <h4 class="card-title text-truncate">{{ .title }}</h4>
+              <button type="button" class="btn btn-primary btn-sm" onclick="$('#{{ md5 .title }}').modal('show');" data-pagefind-ignore>Mehr anzeigen</button>
+            </div>
+          </div>
+        </div>
       {{ end }}
     </div>
   </div>
diff --git a/layouts/projektwoche/list.html b/layouts/projektwoche/list.html
index c20a24f9..ae88c64d 100644
--- a/layouts/projektwoche/list.html
+++ b/layouts/projektwoche/list.html
@@ -4,7 +4,7 @@
 	<div class="container">
 		<div class="row">
 			{{ range .Pages }}
-				{{ partial "card-btn-ni" (dict "title" .Title "link" .Permalink) }}
+				{{ partial "card-btn" . }}
 			{{ end }}
 		</div>
 	</div>
diff --git a/layouts/schulchronik/list.html b/layouts/schulchronik/list.html
index 8a8d4c22..b4c42392 100644
--- a/layouts/schulchronik/list.html
+++ b/layouts/schulchronik/list.html
@@ -27,7 +27,7 @@
     <h2 class="mb-4">Informationsseiten</h2>
     <div class="row">
       {{ range .Params.links }}
-        {{ partial "card-btn-ni" . }}
+        {{ partial "card-btn" (dict "Title" .title "Permalink" .link) }}
       {{ end }}
     </div>
   </div>
@@ -35,7 +35,7 @@
     <h2 class="mb-4">Chronik</h2>
     <div class="row">
       {{ range (where .Data.Pages "Params.type" "schulchronik") }}
-        {{ partial "card-btn-ni" (dict "title" .Title "link" .Permalink) }}
+        {{ partial "card-btn" . }}
       {{ end }}
     </div>
   </div>
diff --git a/layouts/schulchronik/single.html b/layouts/schulchronik/single.html
index 0bf18f03..59bc9930 100644
--- a/layouts/schulchronik/single.html
+++ b/layouts/schulchronik/single.html
@@ -1,97 +1,92 @@
 {{ define "main" }}
 
 <section class="section">
+  <!-- TODO: everything -->
   <div class="container">
-    <div class="row">
-      <div class="col-12 mb-4">
-        {{ if or .Params.cantorpreisträger (where (where .Site.RegularPages "Title" (print "Abiturienten " .Params.Title ) ) "Type" "=" "abiturienten") }}
-      <div class="col-12">
-        <div class="card-group">
-          {{ range where (where .Site.RegularPages "Title" .Params.Title ) "Type" "=" "cantorpreis" }}
-          <div class="card d-flex flex-row flex-wrap">
-              <div class="flex-shrink-0">
-                <a href="{{ .Permalink }}"><img src="{{ .Params.Image | relURL }}" class="rounded-circle m-3 object-cover" height="128px" width="128px"></a>
-              </div>
-              <div class="flex-grow card-body min-w-0">
-                <a href="/cantorpreis"><h3 class="card-title">Cantorpreisträger:in</h3></a>
-                <a href="{{ .Permalink }}"><p class="h4 card-text">{{ .Params.name }}</p></a>
-              </div>
+    {{ if or .Params.cantorpreisträger (where (where .Site.RegularPages "Title" (print "Abiturienten " .Params.Title ) ) "Type" "=" "abiturienten") }}
+    <div class="card-group">
+      {{ range where (where .Site.RegularPages "Title" .Params.Title ) "Type" "=" "cantorpreis" }}
+      <div class="card d-flex flex-row flex-wrap">
+          <div class="flex-shrink-0">
+            <a href="{{ .Permalink }}"><img src="{{ .Params.Image | relURL }}" class="rounded-circle m-3 object-cover" height="128px" width="128px"></a>
           </div>
-          {{ end }}
-          {{ range where (where .Site.RegularPages "Title" (print "Abiturienten " .Params.Title ) ) "Type" "=" "abiturienten" }}
-          <div class="card d-flex flex-row flex-wrap-reverse">
-            <div class="flex-grow card-body min-w-0">
-                <a href="{{ .Permalink }}"><h3 class="card-title">{{ .Title }}</h3></a>
-                {{ $abiturdurchschnitte := getJSON "static/data/abiturdurchschnitte.json" }}
-                {{ range $abiturdurchschnitte.abiturdurchschnitte  }}
-                  {{ if eq (string (index . "jahr")) "2008" }}<a href="/chronikseiten/abiturdurchschnitte"><p class="h4 card-text">Abiturdurchschnitt: {{ .schnitt }}</p></a>{{ end }}
-                {{ end }}
-              </div>
-              <div class="">
-                <a href="{{ .Permalink }}">
-                  <img src="{{ .Params.Image | relURL }}" class="rounded-circle object-cover m-3" width="128px" height="128px">
-                </a>
-              </div>
+          <div class="flex-grow card-body min-w-0">
+            <a href="/cantorpreis"><h3 class="card-title">Cantorpreisträger:in</h3></a>
+            <a href="{{ .Permalink }}"><p class="h4 card-text">{{ .Params.name }}</p></a>
           </div>
-          {{ end }}
-        </div>
       </div>
       {{ end }}
-        {{ range .Params.topics }}
-          {{ partial "modal" . }}
-        {{ end }}
-        {{ if and .Params.pretext (ne .Params.pretext "\n\n\n") }}
-          {{ partial "modal" (dict "title" .Title "content" .Params.pretext) }}
-        {{ end }}
-        <div id="wc-canvas"></div>
-        {{ $topics := slice }}
-        {{ if .Params.pretext }}
-          {{ $topics = $topics | append (slice (slice .Params.Title 200 (md5 .Title))) }}
-        {{ else }}
-          {{ $topics = $topics | append (slice (slice .Params.Title 200)) }}
-        {{ end }}
-        {{ range .Params.topics }}
-          {{ if .superhaufen.enable }}
-            {{ $topics  = $topics | append (slice (slice .title 30 (.superhaufen.link | urlize)  "superhaufen" )) }}
-          {{ else }}
-            {{ $topics  = $topics | append (slice (slice .title 30 (md5 .title) )) }}
-          {{ end }}
-        {{ end }}
-        <script>
-          WordCloud(
-            document.getElementById('wc-canvas'),
-            {
-              click: function (item) {
-                if (item[1] != 200 || (item[1] == 200 && item[2] == '{{ md5 .Title }}')) {
-                  if( item[3] == "superhaufen" ) {
-                    window.location.href = "{{ `/superhaufen/` | relURL }}" + item[2];
-                  } else {
-                   $('#' + item[2]).modal('show');
-                  }
-                }
-              },
-              color: function (word, weight) {
-                return (weight === 200) ? '#ffbc3b' : '#1a1a37';
-              },
-              /* hover: function(item, dimension, event) {
-                item && item[2] ? event.target.style.textDecorationLine = "underline" : null
-              },*/
-              fontFamily: 'Ubuntu, sans-serif',
-              fontWeight: 700,
-              list: JSON.parse("{{ $topics | jsonify }}"),
-              shrinkToFit: true,
-              gridSize: 50,
-              rotateRatio: 0,
-              shuffle: false,
-              shape: "square",
-              ellipticity: 1,
-              clearCanvas: true
-            } 
-          );
-        </script>
-        {{ .Content }}
+      {{ range where (where .Site.RegularPages "Title" (print "Abiturienten " .Params.Title ) ) "Type" "=" "abiturienten" }}
+      <div class="card d-flex flex-row flex-wrap-reverse">
+        <div class="flex-grow card-body min-w-0">
+            <a href="{{ .Permalink }}"><h3 class="card-title">{{ .Title }}</h3></a>
+            {{ $abiturdurchschnitte := getJSON "static/data/abiturdurchschnitte.json" }}
+            {{ range $abiturdurchschnitte.abiturdurchschnitte  }}
+              {{ if eq (string (index . "jahr")) "2008" }}<a href="/chronikseiten/abiturdurchschnitte"><p class="h4 card-text">Abiturdurchschnitt: {{ .schnitt }}</p></a>{{ end }}
+            {{ end }}
+          </div>
+          <div class="">
+            <a href="{{ .Permalink }}">
+              <img src="{{ .Params.Image | relURL }}" class="rounded-circle object-cover m-3" width="128px" height="128px">
+            </a>
+          </div>
       </div>
-    </div>
+      {{ end }}
+  {{ end }}
+    {{ range .Params.topics }}
+      {{ partial "modal" . }}
+    {{ end }}
+    {{ if and .Params.pretext (ne .Params.pretext "\n\n\n") }}
+      {{ partial "modal" (dict "title" .Title "content" .Params.pretext) }}
+    {{ end }}
+    <div id="wc-canvas"></div>
+    {{ $topics := slice }}
+    {{ if .Params.pretext }}
+      {{ $topics = $topics | append (slice (slice .Params.Title 200 (md5 .Title))) }}
+    {{ else }}
+      {{ $topics = $topics | append (slice (slice .Params.Title 200)) }}
+    {{ end }}
+    {{ range .Params.topics }}
+      {{ if .superhaufen.enable }}
+        {{ $topics  = $topics | append (slice (slice .title 30 (.superhaufen.link | urlize)  "superhaufen" )) }}
+      {{ else }}
+        {{ $topics  = $topics | append (slice (slice .title 30 (md5 .title) )) }}
+      {{ end }}
+    {{ end }}
+    <script>
+      WordCloud(
+        document.getElementById('wc-canvas'),
+        {
+          click: function (item) {
+            if (item[1] != 200 || (item[1] == 200 && item[2] == '{{ md5 .Title }}')) {
+              if( item[3] == "superhaufen" ) {
+                window.location.href = "{{ `/superhaufen/` | relURL }}" + item[2];
+              } else {
+                $('#' + item[2]).modal('show');
+              }
+            }
+          },
+          color: function (word, weight) {
+            return (weight === 200) ? '#ffbc3b' : '#1a1a37';
+          },
+          /* hover: function(item, dimension, event) {
+            item && item[2] ? event.target.style.textDecorationLine = "underline" : null
+          },*/
+          fontFamily: 'Ubuntu, sans-serif',
+          fontWeight: 700,
+          list: JSON.parse("{{ $topics | jsonify }}"),
+          shrinkToFit: true,
+          gridSize: 50,
+          rotateRatio: 0,
+          shuffle: false,
+          shape: "square",
+          ellipticity: 1,
+          clearCanvas: true
+        } 
+      );
+    </script>
+    {{ .Content }}
+  </div>
   </div>
 </section>
 
diff --git a/layouts/shortcodes/audio.html b/layouts/shortcodes/audio.html
index 245cf12d..ca7efc81 100644
--- a/layouts/shortcodes/audio.html
+++ b/layouts/shortcodes/audio.html
@@ -1,3 +1,3 @@
 <div class="card">
-    <audio src='{{ .Get "src" }}' class="mb-0" controls></audio>
+  <audio src='{{ .Get "src" }}' class="mb-0" controls></audio>
 </div>
\ No newline at end of file
diff --git a/layouts/shortcodes/card.html b/layouts/shortcodes/card.html
index 96cfe54b..a6658082 100644
--- a/layouts/shortcodes/card.html
+++ b/layouts/shortcodes/card.html
@@ -1,8 +1,6 @@
-<div class="container mb-0">
-  <div class="card border-primary rounded-0 hover-shadow mb-2">
-    <div class="card-body mb-0">
-      <h4 class="card-title"><a class="text-decoration-none" href='{{ .Get "link" }}'>{{ .Get "title" }}</a></h4>
-      <a href='{{ .Get "link" }}' class="mb-0 btn btn-primary btn-sm text-decoration-none">Mehr anzeigen</a>
-    </div>
+<div class="card border-primary rounded-0 hover-shadow mb-2">
+  <div class="card-body mb-0">
+    <h4 class="card-title"><a class="text-decoration-none" href='{{ .Get "link" }}'>{{ .Get "title" }}</a></h4>
+    <a href='{{ .Get "link" }}' class="mb-0 btn btn-primary btn-sm text-decoration-none">Mehr anzeigen</a>
   </div>
 </div>
diff --git a/layouts/wettbewerbe/list.html b/layouts/wettbewerbe/list.html
index 4ae66b5e..bc0aca09 100644
--- a/layouts/wettbewerbe/list.html
+++ b/layouts/wettbewerbe/list.html
@@ -2,13 +2,10 @@
 
 <section class="section">
   <div class="container">
-    <div class="row">
-      {{ .Content }}
-    </div>
     {{ partial "filter-controls" . }}
     <div class="row filtr-container">
       {{ range .Data.Pages }}
-      <div data-category="{{ .Params.Category | urlize }}" class="col-lg-4 col-sm-6 filtr-item">
+      <div data-category="{{ .Params.category | urlize }}" class="col-lg-4 col-sm-6 filtr-item">
         {{ partial "card-category" . }}
       </div>
       {{ end }}
diff --git a/layouts/wettbewerbe/single.html b/layouts/wettbewerbe/single.html
index 66cd9bda..99dd44af 100644
--- a/layouts/wettbewerbe/single.html
+++ b/layouts/wettbewerbe/single.html
@@ -1,16 +1,12 @@
 {{ define "main" }}
 
-{{ partial "header-cl-url" . }}
+{{ partial "header-contest" . }}
 
 <section class="section pt-0">
   <div class="container">
-    <div class="row">
-      <div class="col-12">
-        <h2 class="mb-4">Weitere Wettbewerbe</h2>
-      </div>
-    </div>
+    <h2 class="mb-4">Weitere Wettbewerbe</h2>
     <div class="row" data-pagefind-ignore="all">
-      {{ range partial "related" 3 }}
+      {{ range partial "related" . }}
       <div class="col-lg-4 col-sm-6">
         {{ partial "card-category" . }}
       </div>