diff --git a/content/german/fb-gwf/_index.md b/content/fb-gwf/_index.md
similarity index 100%
rename from content/german/fb-gwf/_index.md
rename to content/fb-gwf/_index.md
diff --git a/content/german/fb-gwf/ethik.md b/content/fb-gwf/ethik.md
similarity index 100%
rename from content/german/fb-gwf/ethik.md
rename to content/fb-gwf/ethik.md
diff --git a/content/german/fb-gwf/geografie.md b/content/fb-gwf/geografie.md
similarity index 100%
rename from content/german/fb-gwf/geografie.md
rename to content/fb-gwf/geografie.md
diff --git a/content/german/fb-gwf/geschichte.md b/content/fb-gwf/geschichte.md
similarity index 100%
rename from content/german/fb-gwf/geschichte.md
rename to content/fb-gwf/geschichte.md
diff --git a/content/german/fb-gwf/psychologie.md b/content/fb-gwf/psychologie.md
similarity index 100%
rename from content/german/fb-gwf/psychologie.md
rename to content/fb-gwf/psychologie.md
diff --git a/content/german/fb-gwf/religion.md b/content/fb-gwf/religion.md
similarity index 100%
rename from content/german/fb-gwf/religion.md
rename to content/fb-gwf/religion.md
diff --git a/content/german/fb-gwf/sozialkunde.md b/content/fb-gwf/sozialkunde.md
similarity index 100%
rename from content/german/fb-gwf/sozialkunde.md
rename to content/fb-gwf/sozialkunde.md
diff --git a/content/german/fb-gwf/sport.md b/content/fb-gwf/sport.md
similarity index 100%
rename from content/german/fb-gwf/sport.md
rename to content/fb-gwf/sport.md
diff --git a/content/german/fb-mint/_index.md b/content/fb-mint/_index.md
similarity index 100%
rename from content/german/fb-mint/_index.md
rename to content/fb-mint/_index.md
diff --git a/content/german/fb-mint/astronomie.md b/content/fb-mint/astronomie.md
similarity index 100%
rename from content/german/fb-mint/astronomie.md
rename to content/fb-mint/astronomie.md
diff --git a/content/german/fb-mint/biologie.md b/content/fb-mint/biologie.md
similarity index 100%
rename from content/german/fb-mint/biologie.md
rename to content/fb-mint/biologie.md
diff --git a/content/german/fb-mint/chemie.md b/content/fb-mint/chemie.md
similarity index 100%
rename from content/german/fb-mint/chemie.md
rename to content/fb-mint/chemie.md
diff --git a/content/german/fb-mint/informatik.md b/content/fb-mint/informatik.md
similarity index 100%
rename from content/german/fb-mint/informatik.md
rename to content/fb-mint/informatik.md
diff --git a/content/german/fb-mint/mathematik.md b/content/fb-mint/mathematik.md
similarity index 100%
rename from content/german/fb-mint/mathematik.md
rename to content/fb-mint/mathematik.md
diff --git a/content/german/fb-mint/physik.md b/content/fb-mint/physik.md
similarity index 100%
rename from content/german/fb-mint/physik.md
rename to content/fb-mint/physik.md
diff --git a/content/german/fb-slk/_index.md b/content/fb-slk/_index.md
similarity index 100%
rename from content/german/fb-slk/_index.md
rename to content/fb-slk/_index.md
diff --git a/content/german/fb-slk/deutsch.md b/content/fb-slk/deutsch.md
similarity index 100%
rename from content/german/fb-slk/deutsch.md
rename to content/fb-slk/deutsch.md
diff --git a/content/german/fb-slk/englisch.md b/content/fb-slk/englisch.md
similarity index 100%
rename from content/german/fb-slk/englisch.md
rename to content/fb-slk/englisch.md
diff --git a/content/german/fb-slk/franzoesisch.md b/content/fb-slk/franzoesisch.md
similarity index 100%
rename from content/german/fb-slk/franzoesisch.md
rename to content/fb-slk/franzoesisch.md
diff --git a/content/german/fb-slk/kunst.md b/content/fb-slk/kunst.md
similarity index 100%
rename from content/german/fb-slk/kunst.md
rename to content/fb-slk/kunst.md
diff --git a/content/german/fb-slk/latein.md b/content/fb-slk/latein.md
similarity index 100%
rename from content/german/fb-slk/latein.md
rename to content/fb-slk/latein.md
diff --git a/content/german/fb-slk/musik.md b/content/fb-slk/musik.md
similarity index 100%
rename from content/german/fb-slk/musik.md
rename to content/fb-slk/musik.md
diff --git a/content/german/fb-slk/spanisch.md b/content/fb-slk/spanisch.md
similarity index 100%
rename from content/german/fb-slk/spanisch.md
rename to content/fb-slk/spanisch.md
diff --git a/layouts/fachbereich/list.html b/layouts/fachbereich/list.html
index 65793de8..20fecc84 100644
--- a/layouts/fachbereich/list.html
+++ b/layouts/fachbereich/list.html
@@ -1,12 +1,10 @@
 {{ define "main" }}
 
-<section class="section-sm pb-0">
+<section class="section pb-0">
 	<div class="container">
 		<div class="row">
 			{{ range .Data.Pages }}
-				<div class="col-lg-4 col-sm-6">
-				{{ .Render "fach" }}
-				</div>
+				{{ partial "card-btn" . }}
 			{{ end }}
 		</div>
 	</div>
diff --git a/layouts/fachbereich/single.html b/layouts/fachbereich/single.html
index d518d70e..ae2777e6 100644
--- a/layouts/fachbereich/single.html
+++ b/layouts/fachbereich/single.html
@@ -1,67 +1,20 @@
 {{ define "main" }}
 
-<section class="section-sm pb-0">
-  <div class="container">
-    <div class="row">
-      <div class="col-12 mb-4 content">
-        {{ .Content }}
-      </div>
-    </div>
-  </div>
-  <div class="container">
-    <div class="row">
-      {{ range .Params.tiles }}
-      <div id="{{ md5 .title }}" class="modal">
-        <div class="modal-dialog modal-lg modal-dialog-centered modal-dialog-scrollable" role="document">
-          <div class="modal-content">
-            <div class="modal-header">
-              <h5 class="modal-title">{{ .title }}</h5>
-              <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                <span aria-hidden="true">&times;</span>
-              </button>
-            </div>
-            <div class="modal-body">
-              <div class="content">
-                {{ .content | markdownify }}
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="col-lg-4 col-sm-6">
-        <div class="card border-primary rounded-0 hover-shadow mb-5">
-          <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">{{ .title | truncate 32 }}</h4>
-            <button type="button" class="btn btn-primary btn-sm" onclick="$('#{{ md5 .title }}').modal('show');">{{
-              i18n "show_more"}}</button>
-          </div>
-        </div>
-      </div>
-      {{ end }}
-    </div>
-  </div>
-</section>
+{{ partial "tile-modals" . }}
 
-<section class="section pt-0 pb-0">
+<section class="section pt-0">
   <div class="container">
-    <div class="row">
-      <div class="col-12">
-        <h2 class="section-title">Aktuelles aus dem Fach {{ .Title }}</h3>
-      </div>
-    </div>
+    <h2 class="section-title mb-4">Aktuelles aus dem Fach {{ .Title }}</h3>
     <div class="row">
       {{ $news := (where .Site.RegularPages "Type" "post") | intersect (where .Site.RegularPages ".Params.subjects"
       "intersect" (slice .Title) ) }}
       {{ range first 3 $news }}
-      <div class="col-lg-4 col-sm-6 mb-5">
-        {{ .Render "post"}}
+      <div class="col-lg-4 col-sm-6 mb-2">
+        {{ partial "card-article" .}}
       </div>
       {{ end }}
       {{ if eq (len $news) 0 }}
-        <p class="col-12">Leider wurden noch keine Artikel zu diesem Fach veröffentlicht. Folgen Sie dem Georg-Cantor-Gymnasium über eines der Informationskanäle, um stets auf dem neusten Stand zu bleiben!</p>
+        <p>Leider wurden noch keine Artikel zu diesem Fach veröffentlicht. Folgen Sie dem Georg-Cantor-Gymnasium über eines der Informationskanäle, um stets auf dem neusten Stand zu bleiben!</p>
       {{ end }}
     </div>
   </div>
diff --git a/layouts/partials/tile-modals.html b/layouts/partials/tile-modals.html
index 83e7caf5..70f563d2 100644
--- a/layouts/partials/tile-modals.html
+++ b/layouts/partials/tile-modals.html
@@ -9,13 +9,13 @@
       {{ 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="card border-primary rounded-0 hover-shadow mb-2">
             <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">
+            <div class="card-body d-flex flex-column">
               <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>
+              <button type="button" class="btn btn-primary btn-sm mt-auto align-self-start" onclick="$('#{{ md5 .title }}').modal('show');" data-pagefind-ignore>Mehr anzeigen</button>
             </div>
           </div>
         </div>