diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Halves.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Halves.html
index 1633c2e8..7715063f 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Halves.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Halves.html
@@ -7,7 +7,7 @@
     <f:section name="Main">
         <ep:container data="{data}" cssClasses="py-8">
             <f:render partial="Header/Header" arguments="{header: data.header, subheader: data.subheader, layout: data.header_layout, link: data.header_link}" />
-            <div class="grid grid-cols-1 md:grid-cols-2 gap-8">
+            <div class="grid grid-cols-2 gap-8">
                 <f:for each="{children_300}" as="record">
                     {record.renderedContent -> f:format.raw()}
                 </f:for>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Quarters.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Quarters.html
index 5e405d3e..a2420a0e 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Quarters.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Quarters.html
@@ -7,7 +7,7 @@
     <f:section name="Main">
         <ep:container data="{data}" cssClasses="py-8">
             <f:render partial="Header/Header" arguments="{header: data.header, subheader: data.subheader, layout: data.header_layout, link: data.header_link}" />
-            <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-8">
+            <div class="grid grid-cols-2 lg:grid-cols-4 gap-4 md:gap-8">
                 <f:for each="{children_300}" as="record">
                     {record.renderedContent -> f:format.raw()}
                 </f:for>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Teasergroup.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Teasergroup.html
index 4c06080b..6da387ce 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Teasergroup.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Teasergroup.html
@@ -6,11 +6,7 @@
 
     <f:section name="Main">
         <div class="py-8 bg-ep-primary-bg">
-            <f:if condition="{data.header}">
-                <div class="container mb-8">
-                    <f:render partial="Header/Header" arguments="{header: data.header, subheader: data.subheader, layout: data.header_layout, link: data.header_link, default: settings.defaultHeaderType}" />
-                </div>
-            </f:if>
+            <f:render partial="Header/Header" arguments="{header: data.header, subheader: data.subheader, layout: data.header_layout, link: data.header_link, default: settings.defaultHeaderType}" />
             <div class="container"
                  data-controller="teasergrid"
                  data-teasergrid-grid-class="grid-cols-2"