diff --git a/public/typo3conf/ext/ep_theme/Configuration/TypoScript/Library/Breadcrumb.typoscript b/public/typo3conf/ext/ep_theme/Configuration/TypoScript/Library/Breadcrumb.typoscript
index c06bae79..3521c52a 100644
--- a/public/typo3conf/ext/ep_theme/Configuration/TypoScript/Library/Breadcrumb.typoscript
+++ b/public/typo3conf/ext/ep_theme/Configuration/TypoScript/Library/Breadcrumb.typoscript
@@ -3,7 +3,7 @@ lib.breadcrumb {
     special = rootline
     special.range = 1|-1
     1 = TMENU
-    1.wrap = <div class="container mb-8 text-sm text-gray-800 flex">|</div>
+    1.wrap = <div class="hidden md:flex container mb-8 text-sm text-gray-800">|</div>
     1.NO {
         stdWrap.htmlSpecialChars = 1
         ATagParams = class="text-gray-400"
diff --git a/public/typo3conf/ext/ep_theme/Configuration/TypoScript/Page/Main.typoscript b/public/typo3conf/ext/ep_theme/Configuration/TypoScript/Page/Main.typoscript
index 077aeed5..20049093 100644
--- a/public/typo3conf/ext/ep_theme/Configuration/TypoScript/Page/Main.typoscript
+++ b/public/typo3conf/ext/ep_theme/Configuration/TypoScript/Page/Main.typoscript
@@ -8,7 +8,7 @@ page {
     bodyTagCObject = COA
     bodyTagCObject {
         10 = TEXT
-        10.value = <body class="antialiased text-gray-800 font-sans
+        10.value = <body class="antialiased text-gray-800 font-sans lg:pt-8
         20 = TEXT
         20 {
             field = tx_eptheme_bodyclass
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_searchbar.scss b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_searchbar.scss
index b202764a..32f734a4 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_searchbar.scss
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_searchbar.scss
@@ -2,10 +2,10 @@
     @apply hidden relative lg:block lg:container -mt-20 mb-8;
 
     &.sticky {
-        @apply fixed z-50 top-0 left-0 mt-8 mb-0 inset-x-0 shadow-lg;
+        @apply fixed z-50 top-8 left-0 mt-0 mb-0 inset-x-0 shadow-lg;
     }
 
     &.reduced {
-        @apply max-w-full px-0 mt-8 mb-0;
+        @apply max-w-full px-0 mt-0 mb-0;
     }
 }
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Mainnav.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Mainnav.html
index 612f9bfc..88d50d1c 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Mainnav.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Mainnav.html
@@ -5,7 +5,7 @@
       xmlns:ep="http://typo3.org/ns/EP/EpTheme/ViewHelpers">
 
     <f:section name="Main">
-        <div class="relative z-40 lg:container bg-white lg:mt-8">
+        <div class="relative z-40 lg:container bg-white">
             <div class="flex items-center lg:items-end justify-between px-4 py-2 lg:px-0 lg:pt-4 lg:pb-0">
                 <a href="{f:uri.typolink(parameter: settings.defaultHomeUid)}"
                    class="block lg:pb-4"
