diff --git a/src/components/AddToCartButton.js b/src/components/AddToCartButton.js
index 6683226..5942cdf 100644
--- a/src/components/AddToCartButton.js
+++ b/src/components/AddToCartButton.js
@@ -540,6 +540,7 @@ class AddToCartButton extends Component {
           sx={{
             borderRadius: 2,
             fontWeight: "bold",
+            whiteSpace: "nowrap",
             "&:hover": {
               backgroundColor: "primary.dark",
             },
diff --git a/src/components/Footer.js b/src/components/Footer.js
index de24ec8..f9e3fe1 100644
--- a/src/components/Footer.js
+++ b/src/components/Footer.js
@@ -16,6 +16,7 @@ const StyledRouterLink = styled(RouterLink)(() => ({
   lineHeight: '1.5',
   display: 'block',
   padding: '4px 8px',
+  whiteSpace: 'nowrap',
   '&:hover': {
     textDecoration: 'underline',
   },
@@ -223,25 +224,13 @@ class Footer extends Component {
             alignItems={{ xs: 'center', md: 'flex-end' }}
           >
             {/* Legal Links Section */}
-            <Stack 
-              direction={{ xs: 'row', md: 'column' }} 
-              spacing={{ xs: 2, md: 0.5 }} 
-              justifyContent="center" 
-              alignItems={{ xs: 'center', md: 'left' }}
-              flexWrap="wrap"
-            >
+            <Stack direction="column" spacing={0.5} justifyContent="center" alignItems="flex-start">
               <StyledRouterLink to="/datenschutz">{this.props.t ? this.props.t('footer.legal.datenschutz') : 'Datenschutz'}</StyledRouterLink>
               <StyledRouterLink to="/agb">{this.props.t ? this.props.t('footer.legal.agb') : 'AGB'}</StyledRouterLink>
               <StyledRouterLink to="/sitemap">{this.props.t ? this.props.t('footer.legal.sitemap') : 'Sitemap'}</StyledRouterLink>
             </Stack>
 
-            <Stack 
-              direction={{ xs: 'row', md: 'column' }} 
-              spacing={{ xs: 2, md: 0.5 }} 
-              justifyContent="center" 
-              alignItems={{ xs: 'center', md: 'left' }}
-              flexWrap="wrap"
-            >
+            <Stack direction="column" spacing={0.5} justifyContent="center" alignItems="flex-start">
               <StyledRouterLink to="/impressum">{this.props.t ? this.props.t('footer.legal.impressum') : 'Impressum'}</StyledRouterLink>
               <StyledRouterLink to="/batteriegesetzhinweise">{this.props.t ? this.props.t('footer.legal.batteriegesetzhinweise') : 'Batteriegesetzhinweise'}</StyledRouterLink>
               <StyledRouterLink to="/widerrufsrecht">{this.props.t ? this.props.t('footer.legal.widerrufsrecht') : 'Widerrufsrecht'}</StyledRouterLink>
@@ -346,7 +335,7 @@ class Footer extends Component {
             
             {/* Copyright Section */}
             <Box sx={{ pb: 0, textAlign: 'center', filter: 'drop-shadow(0 4px 8px rgba(0, 0, 0, 0.3))', opacity: 0.7 }}>
-              <Typography variant="body2" sx={{ mb: 1, fontSize: { xs: '11px', md: '14px' }, lineHeight: 1.5 }}>
+              <Typography variant="body2" sx={{ mb: 1, fontSize: { xs: '11px', md: '14px' }, lineHeight: 1.5, whiteSpace: 'nowrap' }}>
                 {this.props.t ? this.props.t('footer.allPricesIncl') : '* Alle Preise inkl. gesetzlicher USt., zzgl. Versand'}
               </Typography>
               <Typography
diff --git a/src/components/header/CategoryList.js b/src/components/header/CategoryList.js
index 27caf7e..a0037de 100644
--- a/src/components/header/CategoryList.js
+++ b/src/components/header/CategoryList.js
@@ -183,7 +183,7 @@ class CategoryList extends Component {
           display: "flex",
           justifyContent: "flex-start",
           alignItems: "center",
-          flexWrap: "wrap",
+          flexWrap: isMobile ? "wrap" : "nowrap",
           overflowX: "visible",
           flexDirection: isMobile ? "column" : "row",
           py: 0.5, // Add vertical padding to prevent border clipping