diff --git a/addons/dine360_theme_chennora/views/checkout_address.xml b/addons/dine360_theme_chennora/views/checkout_address.xml
index c2ce7c3..b6b729f 100644
--- a/addons/dine360_theme_chennora/views/checkout_address.xml
+++ b/addons/dine360_theme_chennora/views/checkout_address.xml
@@ -22,17 +22,18 @@
 
     <!-- Simplify Checkout: Show only Billing Address, Hide Shipping Address UI -->
     <template id="chennora_checkout_custom" inherit_id="website_sale.checkout" name="Chennora Checkout Custom" priority="99">
-        <!-- 1. Hide the Shipping Address Block entirely using its unique t-group attribute -->
-        <xpath expr="//div[@t-groups='account.group_delivery_invoice_address']" position="attributes">
+        <!-- 1. Hide the Shipping Address Block entirely by finding its header parent -->
+        <xpath expr="//h4[contains(., 'Shipping')]/ancestor::div[1]" position="attributes">
             <attribute name="style">display: none !important;</attribute>
+            <attribute name="class" add="d-none" separator=" "/>
         </xpath>
         
         <!-- 2. Make the Billing Address section full-width since Shipping is hidden -->
-        <xpath expr="//div[h4[contains(., 'Billing')]]" position="attributes">
+        <xpath expr="//h4[contains(., 'Billing')]/ancestor::div[1]" position="attributes">
             <attribute name="class" add="col-12" remove="col-md-6" separator=" "/>
         </xpath>
 
-        <!-- 3. Rename Billing to just 'Address' or 'Delivery Address' -->
+        <!-- 3. Rename Billing to 'Delivery Address' -->
         <xpath expr="//h4[contains(., 'Billing')]" position="replace">
             <h3 class="mb-4">Delivery Address</h3>
         </xpath>