diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/City/Teasergroup.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/City/Teasergroup.html
index 9715ebc2..62643fd1 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/City/Teasergroup.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/City/Teasergroup.html
@@ -6,24 +6,38 @@
     <f:layout name="Default"/>
 
     <f:section name="Main">
-        <f:render partial="Header/Standalone" arguments="{_all}"/>
-        <div>
-            <ep:container data="{data}">
-                <div class="splide"
-                     data-controller="slider"
-                     data-slider-preset-value="teasers">
-                    <div class="splide__track">
-                        <ul class="splide__list">
-                            <f:for each="{teasers}" as="city">
-                                <li class="splide__slide">
-                                    <f:render partial="City/Teaser" section="Teaser" arguments="{_all}"/>
-                                </li>
-                            </f:for>
-                        </ul>
+        <ep:container data="{data}">
+            <f:render partial="Header/Header" arguments="{_all}"/>
+            <div data-controller="teasergrid"
+                 data-teasergrid-grid-class="grid-cols-2"
+                 data-teasergrid-disabled-value="false">
+                <f:if condition="{teasers}">
+                    <div class="flex items-center space-x-1 mb-2 sm:hidden">
+                        <button type="button"
+                                class="opacity-50"
+                                data-action="teasergrid#grid"
+                                data-teasergrid-target="button">
+                            <svg class="w-5 h-5 text-ep-primary">
+                                <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-teaser-grid"></use>
+                            </svg>
+                        </button>
+                        <button type="button"
+                                data-action="teasergrid#block"
+                                data-teasergrid-target="button">
+                            <svg class="w-5 h-5 text-ep-primary">
+                                <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-teaser-single"></use>
+                            </svg>
+                        </button>
                     </div>
-                </div>
-            </ep:container>
-        </div>
+                    <div class="grid grid-cols-2 lg:grid-cols-3 gap-4 md:gap-8"
+                         data-teasergrid-target="container">
+                        <f:for each="{teasers}" as="city">
+                            <f:render partial="City/Teaser" section="Teaser" arguments="{_all}"/>
+                        </f:for>
+                    </div>
+                </f:if>
+            </div>
+        </ep:container>
     </f:section>
 
 </html>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Concept/Teasergroup.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Concept/Teasergroup.html
index 0da4e48a..d46b0b70 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Concept/Teasergroup.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Concept/Teasergroup.html
@@ -6,23 +6,38 @@
     <f:layout name="Default"/>
 
     <f:section name="Main">
-        <div>
-            <ep:container data="{data}">
-                <div class="splide"
-                     data-controller="slider"
-                     data-slider-preset-value="teasers">
-                    <div class="splide__track">
-                        <ul class="splide__list">
-                            <f:for each="{teasers}" as="concept">
-                                <li class="splide__slide">
-                                    <f:render partial="Concept/Teaser" section="Teaser" arguments="{_all}"/>
-                                </li>
-                            </f:for>
-                        </ul>
+        <ep:container data="{data}">
+            <f:render partial="Header/Header" arguments="{_all}"/>
+            <div data-controller="teasergrid"
+                 data-teasergrid-grid-class="grid-cols-2"
+                 data-teasergrid-disabled-value="false">
+                <f:if condition="{teasers}">
+                    <div class="flex items-center space-x-1 mb-2 sm:hidden">
+                        <button type="button"
+                                class="opacity-50"
+                                data-action="teasergrid#grid"
+                                data-teasergrid-target="button">
+                            <svg class="w-5 h-5 text-ep-primary">
+                                <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-teaser-grid"></use>
+                            </svg>
+                        </button>
+                        <button type="button"
+                                data-action="teasergrid#block"
+                                data-teasergrid-target="button">
+                            <svg class="w-5 h-5 text-ep-primary">
+                                <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-teaser-single"></use>
+                            </svg>
+                        </button>
                     </div>
-                </div>
-            </ep:container>
-        </div>
+                    <div class="grid grid-cols-2 lg:grid-cols-3 gap-4 md:gap-8"
+                         data-teasergrid-target="container">
+                        <f:for each="{teasers}" as="city">
+                            <f:render partial="Concept/Teaser" section="Teaser" arguments="{_all}"/>
+                        </f:for>
+                    </div>
+                </f:if>
+            </div>
+        </ep:container>
     </f:section>
 
 </html>