diff --git a/.tool-versions b/.tool-versions
deleted file mode 100644
index c15dc81..0000000
--- a/.tool-versions
+++ /dev/null
@@ -1 +0,0 @@
-nodejs 22.18.0
\ No newline at end of file
diff --git a/assets/critical.css b/assets/critical.css
index 153c0bb..903a8f5 100644
--- a/assets/critical.css
+++ b/assets/critical.css
@@ -304,6 +304,10 @@ img {
   flex-direction: column;
 }
 
+.images__item {
+  width: 100%;
+}
+
 .images__text-area {
   flex: 1 1 auto;
   display: flex;
diff --git a/assets/images.css b/assets/images.css
index 0411180..e9e6934 100644
--- a/assets/images.css
+++ b/assets/images.css
@@ -1,3 +1,7 @@
+.images:not(:has(.carousel)) .block-frame .block-frame__buttons {
+  transform: translateX(-50%) !important;
+}
+
 .images__container--padding-top {
   padding-top: var(--padding-top-mobile, 0);
 }
diff --git a/assets/product-card.css b/assets/product-card.css
index 0fb5372..c432888 100644
--- a/assets/product-card.css
+++ b/assets/product-card.css
@@ -3,6 +3,7 @@
   grid-template-rows: max-content 1fr;
   position: relative;
   min-width: 298px;
+  height: 100%;
   overflow: clip;
   border-radius: var(--border-radius-block-rounded);
   contain: content;
diff --git a/sections/images.liquid b/sections/images.liquid
index 7981d49..038f57e 100644
--- a/sections/images.liquid
+++ b/sections/images.liquid
@@ -334,14 +334,12 @@
             {%- endif -%}
             {% comment %} CSS variables end {% endcomment %}
 
-            {%- if carousel -%}
-              <div id="{{ block.id }}" class="carousel__item{% if effect == 'fade' and first == false %} hide{% endif %}{% if effect == 'fade' and first %} show{%- endif -%}" data-block-key="{{ block.id }}" data-block-name="{{ block.name }}"{% if show_overlay %} data-overlay-color="{{- overlay_color | escape -}}"{% endif %} aria-label="Slide {{ index }}">
+
+            <div class="images__item{% if carousel %} carousel__item{% if effect == 'fade' and first == false %} hide{% endif %}{% if effect == 'fade' and first %} show{%- endif -%}{%- endif -%}" id="{{- block.id -}}" data-block-key="{{- block.id -}}" data-block-name="{{- block.name -}}"{% if carousel %}{% if show_overlay %} data-overlay-color="{{- overlay_color | escape -}}"{% endif %} aria-label="Slide {{ index }}"{%- endif -%}>
+              {%- if carousel -%}
                 <div class="carousel__inner">
-            {%- else -%}
-              <div data-block-key="{{ block.id }}" data-block-name="{{ block.name }}">
-            {%- endif -%}
+              {%- endif -%}
                   <div
-                    id="{{ block.id }}"
                     class="images__container container{% if padding_top != blank or padding_top_mobile != blank %} images__container--padding-top{% endif %}{% if padding_bottom != blank or padding_bottom_mobile != blank %} images__container--padding-bottom{% endif %}"
                     style="{{- text_variables | escape -}}"
                   >
@@ -412,12 +410,10 @@
                       {%- endif -%}
                     {%- endif -%}
                   </div>
-            {%- if carousel -%}
+              {%- if carousel -%}
                 </div>
-              </div>
-            {%- else -%}
-              </div>
-            {%- endif -%}
+              {%- endif -%}
+            </div>
           {%- endfor -%}
 
     {%- if carousel -%}
diff --git a/sections/products.liquid b/sections/products.liquid
index 2a6976b..e94761a 100644
--- a/sections/products.liquid
+++ b/sections/products.liquid
@@ -122,41 +122,28 @@
             {%- for item in items limit: items_limit -%}
               {%- assign index = forloop.index -%}
 
-              {% case items_type %}
-                {% when "blocks" %}
-                  {% assign product = item.settings.product %}
-                {% when "collection" %}
-                  {% assign product = item %}
-              {% endcase %}
+              {%- case items_type -%}
+                {%- when "blocks" -%}
+                  {%- assign product = item.settings.product -%}
+                  {%- assign id      = item.id -%}
+                {%- when "collection" -%}
+                  {%- assign product = item -%}
+                  {%- assign id      = product.id -%}
+              {%- endcase -%}
 
-              {%-  if items_type == 'blocks' -%}
-                {%  assign id = item.id %}  
-              {%- else -%}
-                {%  assign id = product.id %}
-              {%- endif -%}
-
-              {%- if carousel -%}
-                <div id="{{ id }}" class="carousel__item"{% if items_type == 'blocks' %} data-block-key="{{ item.id }}" data-block-name="{{ item.name }}"{% endif %} data-index="{{- index -}}" aria-label="Slide {{ index }}">
+              <div class="products__item{% if carousel %} carousel__item{%- endif -%}" id="{{- id -}}"{% if items_type == 'blocks' %} data-block-key="{{- item.id -}}" data-block-name="{{- item.name -}}"{% endif %}{% if carousel %} data-index="{{- index -}}" aria-label="Slide {{ index }}"{%- endif -%}>
+                {%- if carousel -%}
                   <div class="carousel__inner">
-              {%- else -%}
-                {%- if items_type == 'blocks' -%}
-                  <div id="{{ id }}" data-block-key="{{ item.id }}" data-block-name="{{ item.name }}">
                 {%- endif -%}
-              {%- endif -%}
                     {%- render 'product-card',
-                        block_id: id,
                         product: product,
                         settings: settings,
                         image_loading: loading_strategy
                     -%}
-              {%- if carousel -%}
-                  </div>
-                </div>
-              {%- else -%}
-                {%- if items_type == 'blocks' -%}
+                {%- if carousel -%}
                   </div>
                 {%- endif -%}
-              {%- endif -%}
+              </div>
             {%- endfor -%}
 
         {%- if carousel -%}
diff --git a/sections/testimonials.liquid b/sections/testimonials.liquid
index 63a2e95..0f0a835 100644
--- a/sections/testimonials.liquid
+++ b/sections/testimonials.liquid
@@ -116,13 +116,11 @@
               {%- assign position    = block.settings.position -%}
               {%- assign stars       = block.settings.stars -%}
 
-              {%- if carousel -%}
-                <div id="{{ block.id }}" class="carousel__item" data-block-key="{{ block.id }}" data-block-name="{{ block.name }}" data-index="{{- index -}}" aria-label="Slide {{ index }}">
+              <div class="testimonials__item{% if carousel %} carousel__item{%- endif -%}" id="{{- block.id -}}" data-block-key="{{- block.id -}}" data-block-name="{{- block.name -}}"{% if carousel %} data-index="{{- index -}}" aria-label="Slide {{ index }}"{%- endif -%}>
+                {%- if carousel -%}
                   <div class="carousel__inner">
-              {%- else -%}
-                <div data-block-key="{{ block.id }}" data-block-name="{{ block.name }}">
-              {%- endif -%}
-                    <div  id="{{ block.id }}" class="testimonials__content">
+                {%- endif -%}
+                    <div class="testimonials__content">
                       {%- if title != blank or description != blank -%}
                         <div class="testimonials__col">
                           {%- if title != blank -%}
@@ -186,12 +184,10 @@
                         </div>
                       {%- endif -%}
                     </div>
-              {%- if carousel -%}
+                {%- if carousel -%}
                   </div>
-                </div>
-              {%- else -%}
-                </div>
-              {%- endif -%}
+                {%- endif -%}
+              </div>
             {%- endfor -%}
 
       {%- if carousel -%}
diff --git a/snippets/product-card.liquid b/snippets/product-card.liquid
index 2dbef5c..bdddb11 100644
--- a/snippets/product-card.liquid
+++ b/snippets/product-card.liquid
@@ -20,7 +20,6 @@
 
 {%- assign color_palette = settings.card_color_palette -%}
 {%- assign excerpt       = "" -%}
-{%- assign id            = "" -%}
 {%- assign image         = "" -%}
 {%- assign image_bg      = settings.card_image_background -%}
 {%- assign image_fit     = settings.card_image_fit -%}
@@ -51,7 +50,6 @@
     {%- assign points = image.coordinates -%}
   {%- endif -%}
 
-  {%- assign id      = product.id -%}
   {%- assign url     = product.url -%}
   {%- assign name    = product.name -%}
   {%- assign excerpt = product.excerpt -%}
@@ -82,7 +80,7 @@
 {%- endcapture -%}
 {% comment %} CSS variables end {% endcomment %}
 
-<div id={{ block_id }} class="product-card{% if use_colors %} palette-{{ color_palette }}{%- endif -%}"{% if id != blank %} id="{{- id -}}"{% endif %} style="{{- card_variables | escape -}}">
+<div class="product-card{% if use_colors %} palette-{{ color_palette }}{%- endif -%}" style="{{- card_variables | escape -}}">
   <div class="product-card__vision{% if image_fit == 'contain' %}{% unless image_bg %} product-card__vision--white{% endunless %}{% endif %}{% unless image != blank %} no-image{%- endunless -%}">
     {%- if image.url != blank -%}
       {%- render 'image',