diff --git a/main/models.py b/main/models.py
index 066a5c35b2e8feee936f49b71a8d7bf12d772348..7589167365d080bd5f96b059784692890c9ca8d9 100644
--- a/main/models.py
+++ b/main/models.py
@@ -715,7 +715,6 @@ class MainPeoplePage(ExtendedMetadataPageMixin, SubpageMixin, MetadataPageMixin,
     subpage_types = [
         "main.MainPersonPage",
         "main.MainSimplePage",
-        "main.MainCrossroadPage",
     ]
 
     ### OTHERS
@@ -962,7 +961,6 @@ class MainCrossroadPage(
     parent_page_types = [
         "main.MainHomePage",
         "main.MainCrossroadPage",
-        "main.MainPeoplePage",
     ]
     subpage_types = [
         "main.MainSimplePage",
diff --git a/main/templates/main/includes/molecules/boxes/card_box_block.html b/main/templates/main/includes/molecules/boxes/card_box_block.html
index 60e928439c1315e80ceee48b36672c1f2ff7f5ea..07dc2b5e103f461e53eaad845b0c78c03902ea9c 100644
--- a/main/templates/main/includes/molecules/boxes/card_box_block.html
+++ b/main/templates/main/includes/molecules/boxes/card_box_block.html
@@ -3,4 +3,4 @@
 {% image self.image fill-512x512 as image %}
 {% firstof self.page.url self.link as url %}
 
-{% include 'main/includes/molecules/boxes/card_box.html' with url=url image=image header=self.title text=self.content description_classes="!bg-grey-180" classes="drop-shadow" %}
+{% include 'main/includes/molecules/boxes/card_box.html' with url=url image=image header=self.title content=self.text description_classes="!bg-grey-180" classes="drop-shadow" %}
diff --git a/main/templates/main/includes/molecules/boxes/card_box_with_headline_block.html b/main/templates/main/includes/molecules/boxes/card_box_with_headline_block.html
index 653a363f8d6662295f22ffec57488e01d0972a09..f440c09843fb21fcf866de68c7ad0e4b11bb8bb3 100644
--- a/main/templates/main/includes/molecules/boxes/card_box_with_headline_block.html
+++ b/main/templates/main/includes/molecules/boxes/card_box_with_headline_block.html
@@ -4,10 +4,8 @@
   <h2 class="head-6xl mt-5 mb-5">{{ self.headline }}</h2>
 {% endif %}
 
-<ul class="grid grid-cols-1 lg:grid-cols-2 xl:grid-cols-3 gap-8">
+<ul class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 content-stretch gap-8">
   {% for card_block in self.card_items %}
-    <li>
-      {% include_block card_block %}
-    </li>
+    {% include_block card_block %}
   {% endfor %}
 </ul>
diff --git a/main/templates/main/main_crossroad_page.html b/main/templates/main/main_crossroad_page.html
index cbe0e47ddf7b460281a69f3314e53994ba9b21cf..114aed5441ae485b4197a7b7345e4394c5af1e07 100644
--- a/main/templates/main/main_crossroad_page.html
+++ b/main/templates/main/main_crossroad_page.html
@@ -7,17 +7,17 @@
 
   <main role="main" class="mb-10 xl:mb-32">
     <div class="mb-2 lg:mb-12 container--wide">
-      <div class="grid-full">
+      <div class="flex flex-col gap-16">
         {% for headlined_card_block in page.headlined_cards_content %}
-          {% include_block headlined_card_block %}
+          <div>
+            {% include_block headlined_card_block %}
+          </div>
         {% endfor %}
 
         {% if page.cards_content|length != 0 %}
-          <ul class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-8">
+          <ul class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 content-stretch gap-8">
             {% for card_block in page.cards_content %}
-              <li>
-                {% include_block card_block %}
-              </li>
+              {% include_block card_block %}
             {% endfor %}
           </ul>
         {% endif %}
diff --git a/main/templates/main/main_people_page.html b/main/templates/main/main_people_page.html
index 13f68f07f6ce02ffa9e367fab42e441c5dc5f27f..50fd77dcee520eb64b4e8cd49a1431567da53eed 100644
--- a/main/templates/main/main_people_page.html
+++ b/main/templates/main/main_people_page.html
@@ -39,18 +39,18 @@
               <template v-if="isCurrentView('{{ block.value.slug }}-{{ forloop.counter }}')">
                 {% for team in block.value.team_list %}
 
-                  {% if team.value.headline %}
-                    <h2 class="head-6xl mt-5 mb-5">{{ team.value.headline }}</h2>
+                  {% if team.headline %}
+                    <h2 class="head-6xl mt-5 mb-5">{{ team.headline }}</h2>
                   {% endif %}
 
-                  <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 content-stretch gap-8">
-                    {% for card in team.value.card_items %}
-                      {% image card.value.image max-512 as card_image %}
-                      {% firstof card.value.page.url card.value.link as card_url %}
+                  <ul class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 content-stretch gap-8">
+                    {% for card in team.card_items %}
+                      {% image card.image max-512x512 as card_image %}
+                      {% firstof card.page.url card.link as card_url %}
 
-                      {% include 'main/includes/molecules/boxes/card_box.html' with image=card_image header=card.value.title content=card.value.txt url=card_url %}
+                      {% include 'main/includes/molecules/boxes/card_box.html' with image=card_image header=card.title content=card.text url=card_url description_classes='!bg-grey-180' %}
                     {% endfor %}
-                  </div>
+                  </ul>
                 {% endfor %}
               </template>
             {% endif %}