diff --git a/templates/catalog/_partials/product-details.tpl b/templates/catalog/_partials/product-details.tpl
index 4273fb3..d705107 100644
--- a/templates/catalog/_partials/product-details.tpl
+++ b/templates/catalog/_partials/product-details.tpl
@@ -1,25 +1,17 @@
-<div class="w-full" id="product-details">
-
-  {block name='product_features'}
-    {if $product.grouped_features}
+{block name='product_features'}
+  {if $product.grouped_features}
+    <div class='w-full flex items-center flex-col'>
+      <h1 class='text-base font-semibold text-gray-600'>
+        Description
+      </h1>
       <ul class="product-features list-[square] w-full">
-          {foreach from=$product.grouped_features item=feature}
-            <li>
-              <span class="name inline-flex w-16 font-semibold">{$feature.name}</span>
-              <span class="value">{$feature.value|escape:'htmlall'|nl2br nofilter}</span>
-            </li>
-          {/foreach}
+        {foreach from=$product.grouped_features item=feature}
+          <li>
+            <span class="name inline-flex w-40 font-semibold">{$feature.name}</span>
+            <span class="value">{$feature.value|escape:'htmlall'|nl2br nofilter}</span>
+          </li>
+        {/foreach}
       </ul>
-    {/if}
-  {/block}
-
-  {block name='product_condition'}
-    {if $product.condition}
-      <div class="product-condition">
-        <label class="label">{l s='Condition' d='Shop.Theme.Catalog'} </label>
-        <link itemprop="itemCondition" href="{$product.condition.schema_url}"/>
-        <span>{$product.condition.label}</span>
-      </div>
-    {/if}
-  {/block}
-</div>
+    </div>
+  {/if}
+{/block}
diff --git a/templates/catalog/product.tpl b/templates/catalog/product.tpl
index 976f1d1..d7a64c9 100644
--- a/templates/catalog/product.tpl
+++ b/templates/catalog/product.tpl
@@ -137,9 +137,6 @@
 
             {block name='product_tabs'}
             <div class='w-full flex items-center flex-col mt-12'>
-              <h1 class='text-base font-semibold text-gray-600'>
-                Description
-              </h1>
               {block name='product_details'}
                 {include file='catalog/_partials/product-details.tpl'}
               {/block}
diff --git a/templates/checkout/_partials/cart-summary-subtotals.tpl b/templates/checkout/_partials/cart-summary-subtotals.tpl
index 81ba29a..a4a5938 100644
--- a/templates/checkout/_partials/cart-summary-subtotals.tpl
+++ b/templates/checkout/_partials/cart-summary-subtotals.tpl
@@ -25,7 +25,7 @@
 
 <div class="flex">
   {foreach from=$cart.subtotals item="subtotal"}
-    {if $subtotal.value && $subtotal.type !== 'tax'}
+    {if $subtotal && $subtotal.value|count_characters > 0 && $subtotal.type !== 'tax'}
       <div class="flex justify-between font-medium" id="cart-subtotal-{$subtotal.type}">
         <span>
             {$subtotal.label}
diff --git a/templates/customer/my-account.tpl b/templates/customer/my-account.tpl
index 869cc4a..b3b95d8 100644
--- a/templates/customer/my-account.tpl
+++ b/templates/customer/my-account.tpl
@@ -32,7 +32,7 @@
 
 {block name='page_content'}
   <div class="w-full my-8">
-    <div class="links flex justify-center flex-wrap py-4">
+    <div class="links flex flex-wrap py-4">
 
       <a class="w-full md:w-1/3 lg:w-1/4 flex flex-col p-4 border-gray-500" id="identity-link" href="{$urls.pages.identity}">
         <span class="flex flex-col items-center font-semibolds text-lg">