diff --git a/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/layout/_footer.scss b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/layout/_footer.scss
index 709d96a..a0b162e 100644
--- a/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/layout/_footer.scss
+++ b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/layout/_footer.scss
@@ -8,9 +8,13 @@
 }
 
 .footer-newsletter {
+  .newsletter-block {
+    width: 100%;
+  }
     .newsletter-inner-text {
         font-size: 18px;
         line-height: 24px;
+        max-width: 450px;
     }
     .footer-newsletter-column-input-email {
         border-bottom: 2px solid $sw-color-brand-primary;
diff --git a/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/overrides.scss b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/overrides.scss
index 30b8031..57b573c 100644
--- a/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/overrides.scss
+++ b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/overrides.scss
@@ -182,3 +182,19 @@ input.custom-number[type=number] {
 #spwn-delivery.do-not-show {
   display: none !important;
 }
+
+.swag-custom-notification-info-modal__content {
+  padding-bottom: 40px;
+  .row {
+    align-items: center;
+    h3 {
+      font-family: $sw-font-family-headline !important;
+      font-size: 44px;
+      font-weight: 700 !important;
+      margin-bottom: 30px;
+    }
+      img {
+      width: 100%;
+    }
+  }
+}
diff --git a/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/page/product-detail/_product-detail.scss b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/page/product-detail/_product-detail.scss
index b77348a..076a121 100644
--- a/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/page/product-detail/_product-detail.scss
+++ b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/page/product-detail/_product-detail.scss
@@ -80,15 +80,18 @@
         }
     }
     .product-detail-buy {
-        border-radius: 3px;
-        background-color: #E9F4FC;
-        padding-top: 40px;
+      .inside {
+          border-radius: 3px;
+          background-color: #E9F4FC;
+          padding: 40px 20px 0;
+      }
         .product-detail-short-description {
             border-bottom: 1px solid #B1C3D9;
         }
         .product-detail-name {
             font-size: 60px;
             line-height: 54px;
+            font-weight: 700;
             color: $sw-color-brand-primary;
         }
         .product-detail-price-container {
diff --git a/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/page/product-detail/_tabs.scss b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/page/product-detail/_tabs.scss
index 3ddf77a..117ab11 100644
--- a/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/page/product-detail/_tabs.scss
+++ b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/page/product-detail/_tabs.scss
@@ -23,4 +23,8 @@
       max-width: 900px;
     }
   }
+}
+
+.product-detail-tabs {
+    padding: 0px 40px;
 }
\ No newline at end of file
diff --git a/zenitPlatformAtmosSet1/src/Resources/views/storefront/block/cms-block-gallery-buybox.html.twig b/zenitPlatformAtmosSet1/src/Resources/views/storefront/block/cms-block-gallery-buybox.html.twig
index b318ec2..5ff3a4f 100644
--- a/zenitPlatformAtmosSet1/src/Resources/views/storefront/block/cms-block-gallery-buybox.html.twig
+++ b/zenitPlatformAtmosSet1/src/Resources/views/storefront/block/cms-block-gallery-buybox.html.twig
@@ -17,6 +17,7 @@
         {% set element = block.slots.getSlot('right') %}
 
         <div class="col-lg-4 product-detail-buy js-sticky" data-sticky-buybox="true">
+            <div class="inside">
             {# ... add headline here #}
             {% block page_product_detail_headline %}
                 <div class="row product-detail-headline">
@@ -35,6 +36,7 @@
             {% block block_gallery_buybox_column_right_inner %}
                 {% sw_include "@Storefront/storefront/element/cms-element-" ~ element.type ~ ".html.twig" ignore missing %}
             {% endblock %}
+            </div>
         </div>
     {% endblock %}
 {% endblock %}
\ No newline at end of file
diff --git a/zenitPlatformAtmosSet1/src/Resources/views/storefront/component/product/card/price-unit.html.twig b/zenitPlatformAtmosSet1/src/Resources/views/storefront/component/product/card/price-unit.html.twig
index 1f0ed1c..bfb021a 100644
--- a/zenitPlatformAtmosSet1/src/Resources/views/storefront/component/product/card/price-unit.html.twig
+++ b/zenitPlatformAtmosSet1/src/Resources/views/storefront/component/product/card/price-unit.html.twig
@@ -1,5 +1,8 @@
 {% sw_extends '@Storefront/storefront/component/product/card/price-unit.html.twig' %}
 
+{% block component_product_box_price_reference_unit %}
+{% endblock %}
+
 {% block component_product_box_price %}
     <div class="product-price-wrapper">
         {% set price = real %}
@@ -45,6 +48,12 @@
         {% if weekProductCount >= 1 %}
             <span class="spwn-week-count"><small>{{ (price.unitPrice / weekProductCount) | json_encode() | round(2) | number_format(2, ',', '.') }} € pro Tag</small></span>
         {% endif %}
+
+        {% if referencePrice is not null %}
+            <span class="price-unit-reference">
+                <small>({{ referencePrice.price|currency }}{{ "general.star"|trans|sw_sanitize }} / {{ referencePrice.referenceUnit }} {{ referencePrice.unitName }})</small>
+            </span>
+        {% endif %}
     </div>
     {% if product.translated.customFields.deposittype %}
         <div class="product-deposittype">
@@ -61,4 +70,5 @@
             </small>
         </div>
     {% endif %}
+
 {% endblock %}
\ No newline at end of file
diff --git a/zenitPlatformAtmosSet1/src/Resources/views/storefront/layout/navigation/categories.html.twig b/zenitPlatformAtmosSet1/src/Resources/views/storefront/layout/navigation/categories.html.twig
new file mode 100644
index 0000000..2a2787c
--- /dev/null
+++ b/zenitPlatformAtmosSet1/src/Resources/views/storefront/layout/navigation/categories.html.twig
@@ -0,0 +1,73 @@
+{% sw_extends '@Storefront/storefront/layout/navigation/categories.html.twig' %}
+
+{% block layout_navigation_categories %}
+
+    {% set navigationMaxDepth = 3 %}
+
+    {% if not level %}
+        {% set level = 0 %}
+    {% endif %}
+    {% set activeId = page.header.navigation.active.id %}
+
+    {% if page.product is defined %}
+        {% set activePath = page.product.categoryTree %}
+    {% else %}
+        {% set activePath = page.header.navigation.active.path %}
+    {% endif %}
+
+    <div class="{% if level == 0 %}row {% endif %}navigation-flyout-categories is-level-{{ level }}">
+        {% for treeItem in navigationTree %}
+            {% set id = treeItem.category.id %}
+            {% set name = treeItem.category.translated.name %}
+            {% set link = category_url(treeItem.category) %}
+
+            {% block layout_navigation_flyout_bar_category_link %}
+                {% if category.type == 'page' %}
+                    <a class="nav-link"
+                        href="{{ seoUrl('frontend.navigation.page', { navigationId: category.id }) }}"
+                        itemprop="url"
+                        title="{{ name }}">
+                        {% block layout_navigation_flyout_bar_category_link_text %}
+                            {{ "general.toCategory"|trans|sw_sanitize }} {{ name }}
+                            {% sw_icon 'arrow-right' style {
+                                'color': 'primary',
+                                'pack':'solid'
+                            } %}
+                        {% endblock %}
+                    </a>
+                {% endif %}
+            {% endblock %}
+
+            {% block layout_navigation_categories_item %}
+                <div class="{% if level == 0 %}{% if navigationMedia %}col-4 {% else %}col-3 {% endif %}{% endif %}navigation-flyout-col">
+                    {% block layout_navigation_categories_item_link %}
+                        {% if treeItem.category.type == 'folder' %}
+                            <div class="nav-item nav-link navigation-flyout-link is-level-{{ level }}"
+                                 title="{{ name }}">
+                                <span itemprop="name">{{ name }}</span>
+                            </div>
+                        {% else %}
+                            <a class="nav-item nav-link navigation-flyout-link is-level-{{ level }}{% if id == activeId or id in activePath %} active{% endif %}"
+                               href="{{ link }}"
+                               itemprop="url"
+                               {% if category_linknewtab(treeItem.category) %}target="_blank"{% endif %}
+                               title="{{ name }}">
+                                <span itemprop="name">{{ name }}</span>
+                            </a>
+                        {% endif %}
+                    {% endblock %}
+
+                    {% block layout_navigation_categories_recoursion %}
+                        {% if level < navigationMaxDepth %}
+                            {% sw_include '@Storefront/storefront/layout/navigation/categories.html.twig' with {
+                                navigationTree: treeItem.children,
+                                level: level + 1,
+                                page: page
+                            } only %}
+                        {% endif %}
+                    {% endblock %}
+                </div>
+            {% endblock %}
+        {% endfor %}
+    </div>
+{% endblock %}
\ No newline at end of file
diff --git a/zenitPlatformAtmosSet1/src/Resources/views/storefront/page/product-detail/index.html.twig b/zenitPlatformAtmosSet1/src/Resources/views/storefront/page/product-detail/index.html.twig
index f6ae9a8..fcc6930 100644
--- a/zenitPlatformAtmosSet1/src/Resources/views/storefront/page/product-detail/index.html.twig
+++ b/zenitPlatformAtmosSet1/src/Resources/views/storefront/page/product-detail/index.html.twig
@@ -28,6 +28,7 @@
 
 {% block page_product_detail_buy %}
     <div class="col-lg-4 col-xl-{{ buyboxWidthConfig }} product-detail-buy" data-sticky-buybox="true">
+        <div class="inside">
 
         {# ... add headline here #}
         {% block page_product_detail_headline %}
@@ -46,5 +47,6 @@
         {% endblock %}
 
         {% sw_include '@Storefront/storefront/page/product-detail/buy-widget.html.twig' %}
+        </div>
     </div>
 {% endblock %}
\ No newline at end of file
diff --git a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/base.scss b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/base.scss
index ce0008b..bb6a9ac 100644
--- a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/base.scss
+++ b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/base.scss
@@ -16,4 +16,5 @@
 @import 'page/checkout/register';
 @import 'page/checkout/cart';
 @import 'page/product-detail/product-detail';
+@import 'page/product-detail/tabs';
 @import 'page/product-detail/review';
\ No newline at end of file
diff --git a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/component/_cms-element.scss b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/component/_cms-element.scss
index 77a480b..1dc949e 100644
--- a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/component/_cms-element.scss
+++ b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/component/_cms-element.scss
@@ -37,7 +37,8 @@
     line-height: 24px;
 }
 
-.is-act-home {
+.is-act-home,
+.aku-cms-factory-element {
   h2 {
       font-size: 3.125rem;
       line-height: 50px !important;
diff --git a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_footer.scss b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_footer.scss
index 806c330..6ec4c34 100644
--- a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_footer.scss
+++ b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_footer.scss
@@ -26,6 +26,9 @@
         .footer-logo {
             max-width: 170px;
         }
+        .newsletter-block {
+          width: 100%;
+        }
         .newsletter-inner-text {
             font-size: 18px;
             line-height: 24px;
diff --git a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/overrides.scss b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/overrides.scss
index 9751288..e2d45ba 100644
--- a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/overrides.scss
+++ b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/overrides.scss
@@ -170,3 +170,25 @@ input.custom-number[type=number] {
 #spwn-delivery.do-not-show {
   display: none !important;
 }
+
+.confirm-delivery-date.do-not-show,
+#spwn-delivery.do-not-show {
+  display: none !important;
+}
+
+.swag-custom-notification-info-modal__content {
+  padding-bottom: 40px;
+  .row {
+    align-items: center;
+    h3 {
+      font-family: $sw-font-family-headline !important;
+      font-size: 34px;
+      font-weight: 700 !important;
+      margin-bottom: 30px;
+      font-style: italic;
+    }
+      img {
+      width: 100%;
+    }
+  }
+}
\ No newline at end of file
diff --git a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/page/product-detail/_product-detail.scss b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/page/product-detail/_product-detail.scss
index 29ad244..19f82ce 100644
--- a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/page/product-detail/_product-detail.scss
+++ b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/page/product-detail/_product-detail.scss
@@ -1,8 +1,12 @@
 .is-ctl-product {
   .cms-page {
-    @media (min-width: 992px) {
-      padding-left: 36px;
-      padding-right: 36px;
+    .cms-section.full-width {
+      padding-left: 20px;
+      padding-right: 20px;
+      @media (min-width: 992px) {
+        padding-left: 36px;
+        padding-right: 56px;
+      }
     }
   }
     .product-detail-media {
@@ -78,13 +82,16 @@
         }
     }
     .product-detail-buy {
-        border-radius: 3px;
-        background-color: #e8f4df;
-        padding-top: 40px;
+        .inside {
+          border-radius: 3px;
+          background-color: #e8f4df;
+          padding: 40px 20px 0;
+        }
         .product-detail-short-description {
           border-bottom: 1px solid #86b04b;
         }
         .product-detail-name {
+            font-size: 34px;
             font-weight: bold;
             color: $sw-color-brand-secondary;
             line-height: 40px !important;
@@ -118,19 +125,16 @@
           padding: 25px 0;
       }
         .btn-primary {
-            background: transparent;
-            color: $sw-color-brand-primary;
-            font-size: 16px;
+            font-size: 18px;
             font-weight: 600;
-            letter-spacing: 1px;
+            letter-spacing: 0.5px;
             line-height: 18px;
             text-align: center;
-            text-transform: uppercase;
             border: 2px solid $sw-color-brand-primary;
             padding: 12px 12px;
             &:hover {
-                background: $sw-color-brand-primary;
-                color: #fff;
+                background: transparent;
+                color: #000;
             }
         }
         .product-wishlist-btn-content {
diff --git a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/page/product-detail/_tabs.scss b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/page/product-detail/_tabs.scss
new file mode 100644
index 0000000..0fedc2f
--- /dev/null
+++ b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/page/product-detail/_tabs.scss
@@ -0,0 +1,29 @@
+.cms-block-product-description-reviews .cms-block-container {
+  background: #EFEDE6;
+  padding-top: 3rem;
+  padding-bottom: 3rem;
+  color: #222;
+}
+.card-tabs {
+.nav-link {
+  letter-spacing: 0.5px;
+}
+.tab-content {
+  h2 {
+    font-family: $sw-font-family-base;
+    font-size: 1.375rem;
+    font-weight: 500;
+    color: #222;
+  }
+  h3, h4, h5, h6 {
+    color: #222;
+  }
+  .product-detail-description-text {
+    max-width: 900px;
+  }
+}
+}
+
+.product-detail-tabs {
+  padding: 0 40px;
+}
\ No newline at end of file
diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/block/cms-block-gallery-buybox.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/block/cms-block-gallery-buybox.html.twig
index b318ec2..5ff3a4f 100644
--- a/zenitPlatformAtmosSet2/src/Resources/views/storefront/block/cms-block-gallery-buybox.html.twig
+++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/block/cms-block-gallery-buybox.html.twig
@@ -17,6 +17,7 @@
         {% set element = block.slots.getSlot('right') %}
 
         <div class="col-lg-4 product-detail-buy js-sticky" data-sticky-buybox="true">
+            <div class="inside">
             {# ... add headline here #}
             {% block page_product_detail_headline %}
                 <div class="row product-detail-headline">
@@ -35,6 +36,7 @@
             {% block block_gallery_buybox_column_right_inner %}
                 {% sw_include "@Storefront/storefront/element/cms-element-" ~ element.type ~ ".html.twig" ignore missing %}
             {% endblock %}
+            </div>
         </div>
     {% endblock %}
 {% endblock %}
\ No newline at end of file
diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/product/card/price-unit.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/product/card/price-unit.html.twig
index ae9944a..3ba280c 100644
--- a/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/product/card/price-unit.html.twig
+++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/product/card/price-unit.html.twig
@@ -1,5 +1,8 @@
 {% sw_extends '@Storefront/storefront/component/product/card/price-unit.html.twig' %}
 
+{% block component_product_box_price_reference_unit %}
+{% endblock %}
+
 {% block component_product_box_price %}
     <div class="product-price-wrapper">
         {% set price = real %}
@@ -45,6 +48,13 @@
         {% if weekProductCount >= 1 %}
             <span class="spwn-week-count"><small>{{ (price.unitPrice / (weekProductCount * 2)) | json_encode() | round(2) | number_format(2, ',', '.') }} € pro Mahlzeit</small></span>
         {% endif %}
+
+        {% if referencePrice is not null %}
+            <span class="price-unit-reference">
+                <small>({{ referencePrice.price|currency }}{{ "general.star"|trans|sw_sanitize }} / {{ referencePrice.referenceUnit }} {{ referencePrice.unitName }})</small>
+            </span>
+        {% endif %}
+
     </div>
     {% if product.translated.customFields.deposittype %}
         <div class="product-deposittype">
diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/product-detail/index.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/product-detail/index.html.twig
index f6ae9a8..fcc6930 100644
--- a/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/product-detail/index.html.twig
+++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/product-detail/index.html.twig
@@ -28,6 +28,7 @@
 
 {% block page_product_detail_buy %}
     <div class="col-lg-4 col-xl-{{ buyboxWidthConfig }} product-detail-buy" data-sticky-buybox="true">
+        <div class="inside">
 
         {# ... add headline here #}
         {% block page_product_detail_headline %}
@@ -46,5 +47,6 @@
         {% endblock %}
 
         {% sw_include '@Storefront/storefront/page/product-detail/buy-widget.html.twig' %}
+        </div>
     </div>
 {% endblock %}
\ No newline at end of file