diff --git a/addons/dine360_theme_chennora/views/checkout_address.xml b/addons/dine360_theme_chennora/views/checkout_address.xml
index 08c40f8..fb0dcdd 100644
--- a/addons/dine360_theme_chennora/views/checkout_address.xml
+++ b/addons/dine360_theme_chennora/views/checkout_address.xml
@@ -13,9 +13,11 @@
         <!-- 3. Remove VAT Warning Message if it exists (Optional/Resilient) -->
         <!-- <xpath expr="//small[contains(text(), 'VAT number is not allowed')]/.." position="replace"/> -->
 
-        <!-- 4. Rename Zip Code Label to Postal Code (Using more robust match) -->
-        <!-- 4. Rename Zip Code Label to Postal Code -->
-        <xpath expr="//label[@for='zip']" position="replace">
+        <!-- 4. Rename ALL Zip Code Labels to Postal Code (Handles both layout versions) -->
+        <xpath expr="(//label[@for='zip'])[1]" position="replace">
+            <label class="col-form-label label-optional" for="zip">Postal Code</label>
+        </xpath>
+        <xpath expr="(//label[@for='zip'])[2]" position="replace">
             <label class="col-form-label label-optional" for="zip">Postal Code</label>
         </xpath>
         
@@ -212,8 +214,8 @@
 
 
 
-        <!-- 9. Remove the "Be aware!" warning box (Already removed or hidden) -->
-        <!-- <xpath expr="//div[contains(@class, 'alert-warning') and .//h4[contains(., 'Be aware')]]" position="replace"/> -->
+        <!-- 9. Remove the "Be aware!" warning box completely -->
+        <xpath expr="//div[@role='alert' and .//h4[contains(text(), 'Be aware')]]" position="replace"/>
     </template>
 
     <!-- Change Billing & Shipping Label on Payment Page -->