diff --git a/content/country/_index.de.md b/content/country/_index.de.md
new file mode 100644
index 00000000..4bd9fd55
--- /dev/null
+++ b/content/country/_index.de.md
@@ -0,0 +1,6 @@
+---
+title: "Länder"
+description: "Überblick über die Länder, in denen FIP-Vergünstigungen genutzt werden können."
+---
+
+Momemtan sind noch nicht für alle Länder und Betreiber Informationen verfügbar. Den aktuellen Bearbeitungsstand findest du auf [GitHub](https://github.com/orgs/fipguide/projects/3).
diff --git a/content/country/_index.en.md b/content/country/_index.en.md
new file mode 100644
index 00000000..7b74911e
--- /dev/null
+++ b/content/country/_index.en.md
@@ -0,0 +1,6 @@
+---
+title: "Countries"
+description: "Overview of the countries where FIP benefits are available."
+---
+
+Currently, information is not yet available for all countries and operators. You can see the current information status on [GitHub](https://github.com/orgs/fipguide/projects/3).
diff --git a/content/news/_index.de.md b/content/news/_index.de.md
new file mode 100644
index 00000000..6d4b2ac4
--- /dev/null
+++ b/content/news/_index.de.md
@@ -0,0 +1,4 @@
+---
+title: "News"
+description: "Aktuelle Informationen und Neuigkeiten rund um den FIP Guide."
+---
\ No newline at end of file
diff --git a/content/news/_index.en.md b/content/news/_index.en.md
new file mode 100644
index 00000000..4936374f
--- /dev/null
+++ b/content/news/_index.en.md
@@ -0,0 +1,4 @@
+---
+title: "News"
+description: "Latest updates and information about the FIP Guide."
+---
\ No newline at end of file
diff --git a/content/operator/_index.de.md b/content/operator/_index.de.md
new file mode 100644
index 00000000..3534279f
--- /dev/null
+++ b/content/operator/_index.de.md
@@ -0,0 +1,6 @@
+---
+title: "Betreiber mit FIP"
+description: "Überblick über die Betreiber, die FIP-Vergünstigungen anbieten."
+---
+
+Momemtan sind noch nicht für alle Länder und Betreiber Informationen verfügbar. Den aktuellen Bearbeitungsstand findest du auf [GitHub](https://github.com/orgs/fipguide/projects/3).
diff --git a/content/operator/_index.en.md b/content/operator/_index.en.md
new file mode 100644
index 00000000..7105e6cb
--- /dev/null
+++ b/content/operator/_index.en.md
@@ -0,0 +1,6 @@
+---
+title: "Operators supporting FIP"
+description: "Overview of the operators providing FIP benefits."
+---
+
+Currently, information is not yet available for all countries and operators. You can see the current information status on [GitHub](https://github.com/orgs/fipguide/projects/3).
diff --git a/i18n/de.yaml b/i18n/de.yaml
index 8643c857..def672a4 100644
--- a/i18n/de.yaml
+++ b/i18n/de.yaml
@@ -16,21 +16,12 @@ highlight-important: Wichtige Information
 highlight-inofficial: Inoffizielle Information
 highlight-tip: Persönlicher Tipp
 news-headline: Was gibt's Neues?
-_operator__list_title: Betreiber mit FIP
-_country__list_title: Länder
-_news__list_title: Neuigkeiten
 updateDate: Zuletzt aktualisiert
 related: Verwandte Seiten
 toc_name: Inhalt
 _operator__nearby: Angrenzende Betreiber
 toc-backlink: Zurück zu
 editPage: Seite bearbeiten
-list-disclaimer: Momemtan sind noch nicht für alle Länder und Betreiber Informationen verfügbar. Den aktuellen Bearbeitungsstand findest du auf
-list-disclaimer-link: GitHub
 anchorLink:
   copy: Link zu diesem Abschnitt kopieren
-  copied: Link wurde in die Zwischenablage kopiert
-meta-description:
-  country: Überblick über die Länder, in denen FIP-Vergünstigungen genutzt werden können.
-  operator: Überblick über die Betreiber, die FIP-Vergünstigungen anbieten.
-  news: Aktuelle Informationen und Neuigkeiten rund um den FIP Guide.
\ No newline at end of file
+  copied: Link wurde in die Zwischenablage kopiert
\ No newline at end of file
diff --git a/i18n/en.yaml b/i18n/en.yaml
index 1a443ef3..673cb964 100644
--- a/i18n/en.yaml
+++ b/i18n/en.yaml
@@ -16,21 +16,12 @@ highlight-important: Important Information
 highlight-inofficial: Unofficial Information
 highlight-tip: Personal Tip
 news-headline: What's new?
-_operator__list_title: Operators supporting FIP
-_country__list_title: Countries
-_news__list_title: News
 updateDate: Last updated
 related: Related Pages
 toc_name: Contents
 _operator__nearby: Neighboring Operators
 toc-backlink: Back to
 editPage: Edit page
-list-disclaimer: Currently, information is not yet available for all countries and operators. You can see the current information status on
-list-disclaimer-link: GitHub
 anchorLink:
   copy: Copy link to this section
-  copied: Link has been copied to the clipboard
-meta-description:
-  country: Overview of the countries where FIP benefits are available.
-  operator: Overview of the operators providing FIP benefits.
-  news: Latest updates and information about the FIP Guide.
\ No newline at end of file
+  copied: Link has been copied to the clipboard
\ No newline at end of file
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 67577463..cdb00371 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,11 +1,7 @@
 {{ define "main" }}
   <div class="container o-list">
     <div class="row">
-      {{ $path := .RelPermalink }}
-      {{ $cleanPath := replaceRE "^/[^/]+/" "/" $path }}
-      {{ $key := printf "%s_list_title" (replace $cleanPath "/" "_" -1) }}
-      {{ $type := .Type }}
-      <h2 data-pagefind-meta="title">{{ i18n $key }}</h2>
+      <h2 data-pagefind-meta="title">{{ .Title }}</h2>
       {{ .Content }} {{ range .Pages }}
       {{ partial "teaser.html" (dict "listview" "true" "page" .) }}
       {{ end }}
diff --git a/layouts/country/list.html b/layouts/country/list.html
index ac03d83d..fef1584c 100644
--- a/layouts/country/list.html
+++ b/layouts/country/list.html
@@ -1,17 +1,9 @@
 {{ define "main" }}
   <div class="container o-list">
     <div class="row">
-      {{ $path := .RelPermalink }}
-      {{ $cleanPath := replaceRE "^/[^/]+/" "/" $path }}
-      {{ $key := printf "%s_list_title" (replace $cleanPath "/" "_" -1) }}
-      <h2 data-pagefind-meta="title">{{ i18n $key }}</h2>
-      <p>
-        {{ T "list-disclaimer"}}
-        <a href="https://github.com/orgs/fipguide/projects/3">{{ T "list-disclaimer-link"}}</a>.
-      </p>
-    </div>
-    <div class="row">
-      {{ .Content }} {{ range .Pages }}
+      <h2 data-pagefind-meta="title">{{ .Title }}</h2>
+      {{ .Content }}
+      {{ range .Pages }}
       <a href="{{ .RelPermalink }}" class="col-12 col-lg-4 col-sm-6 o-list__link">
         <div class="o-list__picture">
           {{ $object := replace .Path (printf "/%s/" .Page.Type) "" }}
diff --git a/layouts/operator/list.html b/layouts/operator/list.html
index fcbad3fe..67b2f60e 100644
--- a/layouts/operator/list.html
+++ b/layouts/operator/list.html
@@ -1,16 +1,7 @@
 {{ define "main" }}
 <div class="container o-list">
   <div class="row">
-    {{ $path := .RelPermalink }}
-    {{ $cleanPath := replaceRE "^/[^/]+/" "/" $path }}
-    {{ $key := printf "%s_list_title" (replace $cleanPath "/" "_" -1) }}
-    <h2 data-pagefind-meta="title">{{ i18n $key }}</h2>
-    <p>
-      {{ T "list-disclaimer"}}
-      <a href="https://github.com/orgs/fipguide/projects/3">{{ T "list-disclaimer-link"}}</a>.
-    </p>
-  </div>
-  <div class="row">
+    <h2 data-pagefind-meta="title">{{ .Title }}</h2>
     {{ .Content }}
     <ul class="o-list__link-wrapper row">
       {{ range .Pages }}