From 8e1386cfed8ea1b5ca1146d59cfd151c8e8e248f Mon Sep 17 00:00:00 2001
From: MoritzWeber <kontakt@moritz-weber.net>
Date: Sun, 21 Jun 2026 12:31:08 +0200
Subject: [PATCH] refactor: Minor improvements to the navigation structure

---
 content/general/faq/_index.de.md              |  1 -
 content/general/faq/_index.en.md              |  1 -
 content/general/faq/_index.fr.md              |  1 -
 .../{_index.de.md => index.de.md}             |  0
 .../{_index.en.md => index.en.md}             |  0
 .../{_index.fr.md => index.fr.md}             |  0
 .../{_index.de.md => index.de.md}             |  0
 .../{_index.en.md => index.en.md}             |  0
 .../{_index.fr.md => index.fr.md}             |  0
 .../{_index.de.md => index.de.md}             |  0
 .../{_index.en.md => index.en.md}             |  0
 .../{_index.fr.md => index.fr.md}             |  0
 .../{_index.de.md => index.de.md}             |  0
 .../{_index.en.md => index.en.md}             |  0
 .../{_index.fr.md => index.fr.md}             |  0
 .../{_index.de.md => index.de.md}             |  0
 .../{_index.en.md => index.en.md}             |  0
 .../{_index.fr.md => index.fr.md}             |  0
 .../{_index.de.md => index.de.md}             |  0
 .../{_index.en.md => index.en.md}             |  0
 .../{_index.fr.md => index.fr.md}             |  0
 .../{_index.de.md => index.de.md}             |  0
 .../{_index.en.md => index.en.md}             |  0
 .../{_index.fr.md => index.fr.md}             |  0
 .../{_index.de.md => index.de.md}             |  0
 .../{_index.en.md => index.en.md}             |  0
 .../{_index.fr.md => index.fr.md}             |  0
 .../{_index.de.md => index.de.md}             |  0
 .../{_index.en.md => index.en.md}             |  0
 .../{_index.fr.md => index.fr.md}             |  0
 .../{_index.de.md => index.de.md}             |  0
 .../{_index.en.md => index.en.md}             |  0
 .../{_index.fr.md => index.fr.md}             |  0
 .../{_index.de.md => index.de.md}             |  0
 .../{_index.en.md => index.en.md}             |  0
 .../{_index.fr.md => index.fr.md}             |  0
 .../{_index.de.md => index.de.md}             |  0
 .../{_index.en.md => index.en.md}             |  0
 .../{_index.fr.md => index.fr.md}             |  0
 .../{_index.de.md => index.de.md}             |  0
 .../{_index.en.md => index.en.md}             |  0
 .../{_index.fr.md => index.fr.md}             |  0
 .../{_index.de.md => index.de.md}             |  0
 .../{_index.en.md => index.en.md}             |  0
 .../{_index.fr.md => index.fr.md}             |  0
 .../{_index.de.md => index.de.md}             |  0
 .../{_index.en.md => index.en.md}             |  0
 .../{_index.fr.md => index.fr.md}             |  0
 .../{_index.de.md => index.de.md}             |  0
 .../{_index.en.md => index.en.md}             |  0
 .../{_index.fr.md => index.fr.md}             |  0
 content/general/fip-validity/index.de.md      |  1 -
 content/general/fip-validity/index.en.md      |  1 -
 content/general/fip-validity/index.fr.md      |  1 -
 layouts/_default/list.html                    |  2 +-
 layouts/booking/list.html                     |  2 +-
 .../{ => generalinformation}/single.html      |  0
 layouts/general/list.html                     |  2 +-
 layouts/news/list.html                        |  2 +-
 layouts/operator/list.html                    |  2 +-
 layouts/partials/nav-dropdown.html            | 30 +++++++------------
 layouts/partials/navigation.html              |  9 +++---
 62 files changed, 20 insertions(+), 35 deletions(-)
 rename content/general/faq/does-fip-also-apply-to-dependents/{_index.de.md => index.de.md} (100%)
 rename content/general/faq/does-fip-also-apply-to-dependents/{_index.en.md => index.en.md} (100%)
 rename content/general/faq/does-fip-also-apply-to-dependents/{_index.fr.md => index.fr.md} (100%)
 rename content/general/faq/exceptions-fip-coupon/{_index.de.md => index.de.md} (100%)
 rename content/general/faq/exceptions-fip-coupon/{_index.en.md => index.en.md} (100%)
 rename content/general/faq/exceptions-fip-coupon/{_index.fr.md => index.fr.md} (100%)
 rename content/general/faq/how-long-is-a-field-valid/{_index.de.md => index.de.md} (100%)
 rename content/general/faq/how-long-is-a-field-valid/{_index.en.md => index.en.md} (100%)
 rename content/general/faq/how-long-is-a-field-valid/{_index.fr.md => index.fr.md} (100%)
 rename content/general/faq/how-long-is-an-fip-coupon-valid/{_index.de.md => index.de.md} (100%)
 rename content/general/faq/how-long-is-an-fip-coupon-valid/{_index.en.md => index.en.md} (100%)
 rename content/general/faq/how-long-is-an-fip-coupon-valid/{_index.fr.md => index.fr.md} (100%)
 rename content/general/faq/meaning-of-a-field/{_index.de.md => index.de.md} (100%)
 rename content/general/faq/meaning-of-a-field/{_index.en.md => index.en.md} (100%)
 rename content/general/faq/meaning-of-a-field/{_index.fr.md => index.fr.md} (100%)
 rename content/general/faq/number-of-fields/{_index.de.md => index.de.md} (100%)
 rename content/general/faq/number-of-fields/{_index.en.md => index.en.md} (100%)
 rename content/general/faq/number-of-fields/{_index.fr.md => index.fr.md} (100%)
 rename content/general/faq/train-reservation/{_index.de.md => index.de.md} (100%)
 rename content/general/faq/train-reservation/{_index.en.md => index.en.md} (100%)
 rename content/general/faq/train-reservation/{_index.fr.md => index.fr.md} (100%)
 rename content/general/faq/what-discounts-do-i-get/{_index.de.md => index.de.md} (100%)
 rename content/general/faq/what-discounts-do-i-get/{_index.en.md => index.en.md} (100%)
 rename content/general/faq/what-discounts-do-i-get/{_index.fr.md => index.fr.md} (100%)
 rename content/general/faq/what-does-fip-stand-for/{_index.de.md => index.de.md} (100%)
 rename content/general/faq/what-does-fip-stand-for/{_index.en.md => index.en.md} (100%)
 rename content/general/faq/what-does-fip-stand-for/{_index.fr.md => index.fr.md} (100%)
 rename content/general/faq/what-is-the-fip-card/{_index.de.md => index.de.md} (100%)
 rename content/general/faq/what-is-the-fip-card/{_index.en.md => index.en.md} (100%)
 rename content/general/faq/what-is-the-fip-card/{_index.fr.md => index.fr.md} (100%)
 rename content/general/faq/what-rules-apply-to-fip-coupons/{_index.de.md => index.de.md} (100%)
 rename content/general/faq/what-rules-apply-to-fip-coupons/{_index.en.md => index.en.md} (100%)
 rename content/general/faq/what-rules-apply-to-fip-coupons/{_index.fr.md => index.fr.md} (100%)
 rename content/general/faq/where-can-i-get-discounted-tickets/{_index.de.md => index.de.md} (100%)
 rename content/general/faq/where-can-i-get-discounted-tickets/{_index.en.md => index.en.md} (100%)
 rename content/general/faq/where-can-i-get-discounted-tickets/{_index.fr.md => index.fr.md} (100%)
 rename content/general/faq/where-can-i-order-fip-coupons/{_index.de.md => index.de.md} (100%)
 rename content/general/faq/where-can-i-order-fip-coupons/{_index.en.md => index.en.md} (100%)
 rename content/general/faq/where-can-i-order-fip-coupons/{_index.fr.md => index.fr.md} (100%)
 rename content/general/faq/where-do-i-get-my-fip-card/{_index.de.md => index.de.md} (100%)
 rename content/general/faq/where-do-i-get-my-fip-card/{_index.en.md => index.en.md} (100%)
 rename content/general/faq/where-do-i-get-my-fip-card/{_index.fr.md => index.fr.md} (100%)
 rename content/general/faq/which-companies-accept-fip/{_index.de.md => index.de.md} (100%)
 rename content/general/faq/which-companies-accept-fip/{_index.en.md => index.en.md} (100%)
 rename content/general/faq/which-companies-accept-fip/{_index.fr.md => index.fr.md} (100%)
 rename content/general/faq/who-is-entitled-to-fip/{_index.de.md => index.de.md} (100%)
 rename content/general/faq/who-is-entitled-to-fip/{_index.en.md => index.en.md} (100%)
 rename content/general/faq/who-is-entitled-to-fip/{_index.fr.md => index.fr.md} (100%)
 rename layouts/general/{ => generalinformation}/single.html (100%)

diff --git a/content/general/faq/_index.de.md b/content/general/faq/_index.de.md
index 2f004a209..edc7569f0 100644
--- a/content/general/faq/_index.de.md
+++ b/content/general/faq/_index.de.md
@@ -1,6 +1,5 @@
 ---
 title: "FAQ"
-layout: "list"
 ---
 
 {{< faq >}}
diff --git a/content/general/faq/_index.en.md b/content/general/faq/_index.en.md
index 2f004a209..edc7569f0 100644
--- a/content/general/faq/_index.en.md
+++ b/content/general/faq/_index.en.md
@@ -1,6 +1,5 @@
 ---
 title: "FAQ"
-layout: "list"
 ---
 
 {{< faq >}}
diff --git a/content/general/faq/_index.fr.md b/content/general/faq/_index.fr.md
index 2f004a209..edc7569f0 100644
--- a/content/general/faq/_index.fr.md
+++ b/content/general/faq/_index.fr.md
@@ -1,6 +1,5 @@
 ---
 title: "FAQ"
-layout: "list"
 ---
 
 {{< faq >}}
diff --git a/content/general/faq/does-fip-also-apply-to-dependents/_index.de.md b/content/general/faq/does-fip-also-apply-to-dependents/index.de.md
similarity index 100%
rename from content/general/faq/does-fip-also-apply-to-dependents/_index.de.md
rename to content/general/faq/does-fip-also-apply-to-dependents/index.de.md
diff --git a/content/general/faq/does-fip-also-apply-to-dependents/_index.en.md b/content/general/faq/does-fip-also-apply-to-dependents/index.en.md
similarity index 100%
rename from content/general/faq/does-fip-also-apply-to-dependents/_index.en.md
rename to content/general/faq/does-fip-also-apply-to-dependents/index.en.md
diff --git a/content/general/faq/does-fip-also-apply-to-dependents/_index.fr.md b/content/general/faq/does-fip-also-apply-to-dependents/index.fr.md
similarity index 100%
rename from content/general/faq/does-fip-also-apply-to-dependents/_index.fr.md
rename to content/general/faq/does-fip-also-apply-to-dependents/index.fr.md
diff --git a/content/general/faq/exceptions-fip-coupon/_index.de.md b/content/general/faq/exceptions-fip-coupon/index.de.md
similarity index 100%
rename from content/general/faq/exceptions-fip-coupon/_index.de.md
rename to content/general/faq/exceptions-fip-coupon/index.de.md
diff --git a/content/general/faq/exceptions-fip-coupon/_index.en.md b/content/general/faq/exceptions-fip-coupon/index.en.md
similarity index 100%
rename from content/general/faq/exceptions-fip-coupon/_index.en.md
rename to content/general/faq/exceptions-fip-coupon/index.en.md
diff --git a/content/general/faq/exceptions-fip-coupon/_index.fr.md b/content/general/faq/exceptions-fip-coupon/index.fr.md
similarity index 100%
rename from content/general/faq/exceptions-fip-coupon/_index.fr.md
rename to content/general/faq/exceptions-fip-coupon/index.fr.md
diff --git a/content/general/faq/how-long-is-a-field-valid/_index.de.md b/content/general/faq/how-long-is-a-field-valid/index.de.md
similarity index 100%
rename from content/general/faq/how-long-is-a-field-valid/_index.de.md
rename to content/general/faq/how-long-is-a-field-valid/index.de.md
diff --git a/content/general/faq/how-long-is-a-field-valid/_index.en.md b/content/general/faq/how-long-is-a-field-valid/index.en.md
similarity index 100%
rename from content/general/faq/how-long-is-a-field-valid/_index.en.md
rename to content/general/faq/how-long-is-a-field-valid/index.en.md
diff --git a/content/general/faq/how-long-is-a-field-valid/_index.fr.md b/content/general/faq/how-long-is-a-field-valid/index.fr.md
similarity index 100%
rename from content/general/faq/how-long-is-a-field-valid/_index.fr.md
rename to content/general/faq/how-long-is-a-field-valid/index.fr.md
diff --git a/content/general/faq/how-long-is-an-fip-coupon-valid/_index.de.md b/content/general/faq/how-long-is-an-fip-coupon-valid/index.de.md
similarity index 100%
rename from content/general/faq/how-long-is-an-fip-coupon-valid/_index.de.md
rename to content/general/faq/how-long-is-an-fip-coupon-valid/index.de.md
diff --git a/content/general/faq/how-long-is-an-fip-coupon-valid/_index.en.md b/content/general/faq/how-long-is-an-fip-coupon-valid/index.en.md
similarity index 100%
rename from content/general/faq/how-long-is-an-fip-coupon-valid/_index.en.md
rename to content/general/faq/how-long-is-an-fip-coupon-valid/index.en.md
diff --git a/content/general/faq/how-long-is-an-fip-coupon-valid/_index.fr.md b/content/general/faq/how-long-is-an-fip-coupon-valid/index.fr.md
similarity index 100%
rename from content/general/faq/how-long-is-an-fip-coupon-valid/_index.fr.md
rename to content/general/faq/how-long-is-an-fip-coupon-valid/index.fr.md
diff --git a/content/general/faq/meaning-of-a-field/_index.de.md b/content/general/faq/meaning-of-a-field/index.de.md
similarity index 100%
rename from content/general/faq/meaning-of-a-field/_index.de.md
rename to content/general/faq/meaning-of-a-field/index.de.md
diff --git a/content/general/faq/meaning-of-a-field/_index.en.md b/content/general/faq/meaning-of-a-field/index.en.md
similarity index 100%
rename from content/general/faq/meaning-of-a-field/_index.en.md
rename to content/general/faq/meaning-of-a-field/index.en.md
diff --git a/content/general/faq/meaning-of-a-field/_index.fr.md b/content/general/faq/meaning-of-a-field/index.fr.md
similarity index 100%
rename from content/general/faq/meaning-of-a-field/_index.fr.md
rename to content/general/faq/meaning-of-a-field/index.fr.md
diff --git a/content/general/faq/number-of-fields/_index.de.md b/content/general/faq/number-of-fields/index.de.md
similarity index 100%
rename from content/general/faq/number-of-fields/_index.de.md
rename to content/general/faq/number-of-fields/index.de.md
diff --git a/content/general/faq/number-of-fields/_index.en.md b/content/general/faq/number-of-fields/index.en.md
similarity index 100%
rename from content/general/faq/number-of-fields/_index.en.md
rename to content/general/faq/number-of-fields/index.en.md
diff --git a/content/general/faq/number-of-fields/_index.fr.md b/content/general/faq/number-of-fields/index.fr.md
similarity index 100%
rename from content/general/faq/number-of-fields/_index.fr.md
rename to content/general/faq/number-of-fields/index.fr.md
diff --git a/content/general/faq/train-reservation/_index.de.md b/content/general/faq/train-reservation/index.de.md
similarity index 100%
rename from content/general/faq/train-reservation/_index.de.md
rename to content/general/faq/train-reservation/index.de.md
diff --git a/content/general/faq/train-reservation/_index.en.md b/content/general/faq/train-reservation/index.en.md
similarity index 100%
rename from content/general/faq/train-reservation/_index.en.md
rename to content/general/faq/train-reservation/index.en.md
diff --git a/content/general/faq/train-reservation/_index.fr.md b/content/general/faq/train-reservation/index.fr.md
similarity index 100%
rename from content/general/faq/train-reservation/_index.fr.md
rename to content/general/faq/train-reservation/index.fr.md
diff --git a/content/general/faq/what-discounts-do-i-get/_index.de.md b/content/general/faq/what-discounts-do-i-get/index.de.md
similarity index 100%
rename from content/general/faq/what-discounts-do-i-get/_index.de.md
rename to content/general/faq/what-discounts-do-i-get/index.de.md
diff --git a/content/general/faq/what-discounts-do-i-get/_index.en.md b/content/general/faq/what-discounts-do-i-get/index.en.md
similarity index 100%
rename from content/general/faq/what-discounts-do-i-get/_index.en.md
rename to content/general/faq/what-discounts-do-i-get/index.en.md
diff --git a/content/general/faq/what-discounts-do-i-get/_index.fr.md b/content/general/faq/what-discounts-do-i-get/index.fr.md
similarity index 100%
rename from content/general/faq/what-discounts-do-i-get/_index.fr.md
rename to content/general/faq/what-discounts-do-i-get/index.fr.md
diff --git a/content/general/faq/what-does-fip-stand-for/_index.de.md b/content/general/faq/what-does-fip-stand-for/index.de.md
similarity index 100%
rename from content/general/faq/what-does-fip-stand-for/_index.de.md
rename to content/general/faq/what-does-fip-stand-for/index.de.md
diff --git a/content/general/faq/what-does-fip-stand-for/_index.en.md b/content/general/faq/what-does-fip-stand-for/index.en.md
similarity index 100%
rename from content/general/faq/what-does-fip-stand-for/_index.en.md
rename to content/general/faq/what-does-fip-stand-for/index.en.md
diff --git a/content/general/faq/what-does-fip-stand-for/_index.fr.md b/content/general/faq/what-does-fip-stand-for/index.fr.md
similarity index 100%
rename from content/general/faq/what-does-fip-stand-for/_index.fr.md
rename to content/general/faq/what-does-fip-stand-for/index.fr.md
diff --git a/content/general/faq/what-is-the-fip-card/_index.de.md b/content/general/faq/what-is-the-fip-card/index.de.md
similarity index 100%
rename from content/general/faq/what-is-the-fip-card/_index.de.md
rename to content/general/faq/what-is-the-fip-card/index.de.md
diff --git a/content/general/faq/what-is-the-fip-card/_index.en.md b/content/general/faq/what-is-the-fip-card/index.en.md
similarity index 100%
rename from content/general/faq/what-is-the-fip-card/_index.en.md
rename to content/general/faq/what-is-the-fip-card/index.en.md
diff --git a/content/general/faq/what-is-the-fip-card/_index.fr.md b/content/general/faq/what-is-the-fip-card/index.fr.md
similarity index 100%
rename from content/general/faq/what-is-the-fip-card/_index.fr.md
rename to content/general/faq/what-is-the-fip-card/index.fr.md
diff --git a/content/general/faq/what-rules-apply-to-fip-coupons/_index.de.md b/content/general/faq/what-rules-apply-to-fip-coupons/index.de.md
similarity index 100%
rename from content/general/faq/what-rules-apply-to-fip-coupons/_index.de.md
rename to content/general/faq/what-rules-apply-to-fip-coupons/index.de.md
diff --git a/content/general/faq/what-rules-apply-to-fip-coupons/_index.en.md b/content/general/faq/what-rules-apply-to-fip-coupons/index.en.md
similarity index 100%
rename from content/general/faq/what-rules-apply-to-fip-coupons/_index.en.md
rename to content/general/faq/what-rules-apply-to-fip-coupons/index.en.md
diff --git a/content/general/faq/what-rules-apply-to-fip-coupons/_index.fr.md b/content/general/faq/what-rules-apply-to-fip-coupons/index.fr.md
similarity index 100%
rename from content/general/faq/what-rules-apply-to-fip-coupons/_index.fr.md
rename to content/general/faq/what-rules-apply-to-fip-coupons/index.fr.md
diff --git a/content/general/faq/where-can-i-get-discounted-tickets/_index.de.md b/content/general/faq/where-can-i-get-discounted-tickets/index.de.md
similarity index 100%
rename from content/general/faq/where-can-i-get-discounted-tickets/_index.de.md
rename to content/general/faq/where-can-i-get-discounted-tickets/index.de.md
diff --git a/content/general/faq/where-can-i-get-discounted-tickets/_index.en.md b/content/general/faq/where-can-i-get-discounted-tickets/index.en.md
similarity index 100%
rename from content/general/faq/where-can-i-get-discounted-tickets/_index.en.md
rename to content/general/faq/where-can-i-get-discounted-tickets/index.en.md
diff --git a/content/general/faq/where-can-i-get-discounted-tickets/_index.fr.md b/content/general/faq/where-can-i-get-discounted-tickets/index.fr.md
similarity index 100%
rename from content/general/faq/where-can-i-get-discounted-tickets/_index.fr.md
rename to content/general/faq/where-can-i-get-discounted-tickets/index.fr.md
diff --git a/content/general/faq/where-can-i-order-fip-coupons/_index.de.md b/content/general/faq/where-can-i-order-fip-coupons/index.de.md
similarity index 100%
rename from content/general/faq/where-can-i-order-fip-coupons/_index.de.md
rename to content/general/faq/where-can-i-order-fip-coupons/index.de.md
diff --git a/content/general/faq/where-can-i-order-fip-coupons/_index.en.md b/content/general/faq/where-can-i-order-fip-coupons/index.en.md
similarity index 100%
rename from content/general/faq/where-can-i-order-fip-coupons/_index.en.md
rename to content/general/faq/where-can-i-order-fip-coupons/index.en.md
diff --git a/content/general/faq/where-can-i-order-fip-coupons/_index.fr.md b/content/general/faq/where-can-i-order-fip-coupons/index.fr.md
similarity index 100%
rename from content/general/faq/where-can-i-order-fip-coupons/_index.fr.md
rename to content/general/faq/where-can-i-order-fip-coupons/index.fr.md
diff --git a/content/general/faq/where-do-i-get-my-fip-card/_index.de.md b/content/general/faq/where-do-i-get-my-fip-card/index.de.md
similarity index 100%
rename from content/general/faq/where-do-i-get-my-fip-card/_index.de.md
rename to content/general/faq/where-do-i-get-my-fip-card/index.de.md
diff --git a/content/general/faq/where-do-i-get-my-fip-card/_index.en.md b/content/general/faq/where-do-i-get-my-fip-card/index.en.md
similarity index 100%
rename from content/general/faq/where-do-i-get-my-fip-card/_index.en.md
rename to content/general/faq/where-do-i-get-my-fip-card/index.en.md
diff --git a/content/general/faq/where-do-i-get-my-fip-card/_index.fr.md b/content/general/faq/where-do-i-get-my-fip-card/index.fr.md
similarity index 100%
rename from content/general/faq/where-do-i-get-my-fip-card/_index.fr.md
rename to content/general/faq/where-do-i-get-my-fip-card/index.fr.md
diff --git a/content/general/faq/which-companies-accept-fip/_index.de.md b/content/general/faq/which-companies-accept-fip/index.de.md
similarity index 100%
rename from content/general/faq/which-companies-accept-fip/_index.de.md
rename to content/general/faq/which-companies-accept-fip/index.de.md
diff --git a/content/general/faq/which-companies-accept-fip/_index.en.md b/content/general/faq/which-companies-accept-fip/index.en.md
similarity index 100%
rename from content/general/faq/which-companies-accept-fip/_index.en.md
rename to content/general/faq/which-companies-accept-fip/index.en.md
diff --git a/content/general/faq/which-companies-accept-fip/_index.fr.md b/content/general/faq/which-companies-accept-fip/index.fr.md
similarity index 100%
rename from content/general/faq/which-companies-accept-fip/_index.fr.md
rename to content/general/faq/which-companies-accept-fip/index.fr.md
diff --git a/content/general/faq/who-is-entitled-to-fip/_index.de.md b/content/general/faq/who-is-entitled-to-fip/index.de.md
similarity index 100%
rename from content/general/faq/who-is-entitled-to-fip/_index.de.md
rename to content/general/faq/who-is-entitled-to-fip/index.de.md
diff --git a/content/general/faq/who-is-entitled-to-fip/_index.en.md b/content/general/faq/who-is-entitled-to-fip/index.en.md
similarity index 100%
rename from content/general/faq/who-is-entitled-to-fip/_index.en.md
rename to content/general/faq/who-is-entitled-to-fip/index.en.md
diff --git a/content/general/faq/who-is-entitled-to-fip/_index.fr.md b/content/general/faq/who-is-entitled-to-fip/index.fr.md
similarity index 100%
rename from content/general/faq/who-is-entitled-to-fip/_index.fr.md
rename to content/general/faq/who-is-entitled-to-fip/index.fr.md
diff --git a/content/general/fip-validity/index.de.md b/content/general/fip-validity/index.de.md
index 58037b093..7aa90c808 100644
--- a/content/general/fip-validity/index.de.md
+++ b/content/general/fip-validity/index.de.md
@@ -2,7 +2,6 @@
 draft: false
 title: "FIP Beantragung"
 pagefind_ignore: true
-layout: "list"
 aliases:
   - "/fip-validity/"
 ---
diff --git a/content/general/fip-validity/index.en.md b/content/general/fip-validity/index.en.md
index 81f6cca46..73534ea36 100644
--- a/content/general/fip-validity/index.en.md
+++ b/content/general/fip-validity/index.en.md
@@ -2,7 +2,6 @@
 draft: false
 title: "FIP Application"
 pagefind_ignore: true
-layout: "list"
 aliases:
   - "/fip-validity/"
 ---
diff --git a/content/general/fip-validity/index.fr.md b/content/general/fip-validity/index.fr.md
index c3b3f7e90..32472e0b8 100644
--- a/content/general/fip-validity/index.fr.md
+++ b/content/general/fip-validity/index.fr.md
@@ -2,7 +2,6 @@
 draft: false
 title: "Demande FIP"
 pagefind_ignore: true
-layout: "list"
 aliases:
   - "/fip-validity/"
 ---
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 0174bead4..b9a91d4c0 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,7 +1,7 @@
 {{ define "main" }}
   <div class="o-list">
     <div>
-      <h1 data-pagefind-meta="title">{{ .Title }}</h1>
+      <h1>{{ .Title }}</h1>
       {{ .Content }}
       {{ range .Pages }}
         {{ partial "teaser.html" (dict "listview" "true" "page" .) }}
diff --git a/layouts/booking/list.html b/layouts/booking/list.html
index 7743b143e..2a0fbfd02 100644
--- a/layouts/booking/list.html
+++ b/layouts/booking/list.html
@@ -1,6 +1,6 @@
 {{ define "main" }}
   <div class="o-list o-list__container">
-    <h1 data-pagefind-meta="title">{{ .Title }}</h1>
+    <h1>{{ .Title }}</h1>
     {{ .Content }}
     <ul aria-labelledby="booking-title">
       {{ range .Pages }}
diff --git a/layouts/general/single.html b/layouts/general/generalinformation/single.html
similarity index 100%
rename from layouts/general/single.html
rename to layouts/general/generalinformation/single.html
diff --git a/layouts/general/list.html b/layouts/general/list.html
index 416a95e89..a696b7b49 100644
--- a/layouts/general/list.html
+++ b/layouts/general/list.html
@@ -1,6 +1,6 @@
 {{ define "main" }}
   <article class="o-list o-list__container">
-    <h1 data-pagefind-meta="title">{{ .Title }}</h1>
+    <h1>{{ .Title }}</h1>
     {{ .Content }}
   </article>
 {{ end }}
diff --git a/layouts/news/list.html b/layouts/news/list.html
index c345c143c..895167edd 100644
--- a/layouts/news/list.html
+++ b/layouts/news/list.html
@@ -1,7 +1,7 @@
 {{ define "main" }}
   <article class="o-list o-list--news">
     <div>
-      <h1 data-pagefind-meta="title">{{ .Title }}</h1>
+      <h1>{{ .Title }}</h1>
       {{ .Content }}
       <div>
         {{ range .Pages }}
diff --git a/layouts/operator/list.html b/layouts/operator/list.html
index 13278453c..7b99f49cc 100644
--- a/layouts/operator/list.html
+++ b/layouts/operator/list.html
@@ -1,6 +1,6 @@
 {{ define "main" }}
   <article class="o-list o-list__container">
-    <h1 data-pagefind-meta="title">{{ .Title }}</h1>
+    <h1>{{ .Title }}</h1>
     {{ .Content }}
     <ul class="o-list__list">
       {{ range .Pages }}
diff --git a/layouts/partials/nav-dropdown.html b/layouts/partials/nav-dropdown.html
index ab689579d..309829344 100644
--- a/layouts/partials/nav-dropdown.html
+++ b/layouts/partials/nav-dropdown.html
@@ -1,44 +1,37 @@
-{{- $id := .id -}}
-{{- $key := .key -}}
-{{- $items := .items -}}
-{{- $currentPage := .currentPage -}}
-{{- $textType := (.textType | default "none") -}}
-{{- $vertical := .vertical -}}
 <li class="o-header__item o-dropdown">
-  {{- with .topDivider }}<hr aria-hidden="true" />{{- end }}
   <button
-    id="{{ $id }}-button"
+    id="{{ .id }}-button"
     class="o-dropdown__button"
     aria-expanded="false"
     aria-haspopup="listbox"
-    aria-controls="{{ $id }}-dropdown"
-    title="{{ T (printf "%s.title" $key) }}"
-    aria-label="{{ T (printf "%s.aria-label" $key) }}"
+    aria-controls="{{ .id }}-dropdown"
+    title="{{ T (printf "%s.title" .key) }}"
+    aria-label="{{ T (printf "%s.aria-label" .key) }}"
   >
-    <span>{{ T (printf "%s.label" $key) }}</span>
+    <span>{{ T (printf "%s.label" .key) }}</span>
     <div class="o-dropdown__icon">
       {{ partial "icon" "keyboard_arrow_down" }}
     </div>
   </button>
   <menu
-    id="{{ $id }}-dropdown"
+    id="{{ .id }}-dropdown"
     class="o-dropdown__menu o-dropdown__menu--below {{ if .vertical }}
       o-dropdown__menu--vertical
     {{ end }}"
     role="listbox"
     aria-hidden="true"
-    aria-label="{{ T (printf "%s.dropdown-label" $key) }}"
+    aria-label="{{ T (printf "%s.dropdown-label" .key) }}"
   >
-    {{ range $items }}
+    {{ range .items }}
       {{- $prefix := "" -}}
-      {{- if eq $textType "flag" -}}
+      {{- if eq $.textType "flag" -}}
         {{- $prefix = partial "flag" (dict "country" .File.ContentBaseName) -}}
-      {{- else if eq $textType "operator-logo" -}}
+      {{- else if eq $.textType "operator-logo" -}}
         {{- $prefix = partial "operator-logo" (dict "operator" .File.ContentBaseName) -}}
       {{- end -}}
       <li
         class="o-dropdown__item"
-        {{ if (.Eq $currentPage) }}aria-selected="true"{{ end }}
+        {{ if (.Eq $.currentPage) }}aria-selected="true"{{ end }}
       >
         {{- partial "link"
           (dict
@@ -49,5 +42,4 @@
       </li>
     {{ end }}
   </menu>
-  {{- with .bottomDivider }}<hr aria-hidden="true" />{{- end }}
 </li>
diff --git a/layouts/partials/navigation.html b/layouts/partials/navigation.html
index 43cbe6e46..620ab918e 100644
--- a/layouts/partials/navigation.html
+++ b/layouts/partials/navigation.html
@@ -22,25 +22,25 @@
     <li class="o-header__item">
       <menu>
         {{ $currentPage := . }}
+        <hr aria-hidden="true" />
         {{ partial "nav-dropdown" (dict
           "id" "navbar-country-selection"
           "key" "menu.country-dropdown"
           "items" (where site.RegularPages "Section" "country")
           "currentPage" $currentPage
           "textType" "flag"
-          "topDivider" true
-          "bottomDivider" true
           )
         }}
+        <hr aria-hidden="true" />
         {{ partial "nav-dropdown" (dict
           "id" "navbar-operator-selection"
           "key" "menu.operator-dropdown"
           "items" (where site.RegularPages "Section" "operator")
           "currentPage" $currentPage
           "textType" "operator-logo"
-          "bottomDivider" true
           )
         }}
+        <hr aria-hidden="true" />
         <li class="o-header__item" id="li-header-news">
           {{ $news := site.GetPage "news" }}
           {{- partial "link"
@@ -57,11 +57,10 @@
           "key" "menu.generalinformation-dropdown"
           "items" $generalSection.Pages.ByTitle
           "currentPage" $currentPage
-          "textType" "none"
           "vertical" true
-          "bottomDivider" true
           )
         }}
+        <hr aria-hidden="true" />
       </menu>
     </li>
     <li class="o-header__item o-header__item--desktop">