diff --git a/__manifest__.py b/__manifest__.py
index f19f641..631a470 100644
--- a/__manifest__.py
+++ b/__manifest__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 {
     'name': 'POS Custom Closing',
-    'version': '1.0',
+    'version': '19.0.1.0',
     'category': 'Sales/Point of Sale',
     'summary': 'Customize Point of sale Closing Register modal',
     'author': 'Aziz',
diff --git a/static/src/app/close_pos_popup_inherit.xml b/static/src/app/close_pos_popup_inherit.xml
index 948d712..b31ff73 100644
--- a/static/src/app/close_pos_popup_inherit.xml
+++ b/static/src/app/close_pos_popup_inherit.xml
@@ -1,22 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates id="template" xml:space="preserve">
-    <t t-name="pos_custom_closing.ClosePosPopup" t-inherit="point_of_sale.ClosePosPopup" t-inherit-mode="extension" owl="1">
+    <t t-name="pos_custom_closing.ClosePosPopup" t-inherit="point_of_sale.ClosePosPopup" t-inherit-mode="extension">
 
         <!-- 1. Hide Payment Details -->
+        <!-- Base POS (when pos_hr is disabled) -->
         <xpath expr="//div[hasclass('payment-methods-overview')]" position="attributes">
-            <attribute name="t-att-class">pos.config.custom_hide_payment_details ? 'd-none' : ''</attribute>
+            <attribute name="t-if">!pos.config.module_pos_hr and !pos.config.custom_hide_payment_details</attribute>
         </xpath>
+        <!-- POS HR block (when pos_hr is enabled) -->
         <xpath expr="//t[@t-if='pos.config.module_pos_hr']" position="attributes">
             <attribute name="t-if">pos.config.module_pos_hr and !pos.config.custom_hide_payment_details</attribute>
         </xpath>
 
         <!-- 2. Hide Non Cash Input Fields -->
-        <xpath expr="//div[@t-foreach='props.non_cash_payment_methods']//t[@t-if='_showDiff']" position="attributes">
-            <attribute name="t-if">_showDiff and !pos.config.custom_hide_non_cash_inputs</attribute>
+        <!-- We use t-att-class to hide them if the setting is on -->
+        <xpath expr="//div[@t-foreach='props.non_cash_payment_methods']" position="attributes">
+            <attribute name="t-att-class">pos.config.custom_hide_non_cash_inputs ? 'd-none' : 'w-100 mb-3'</attribute>
         </xpath>
 
         <!-- 3. Hide Cash In/Out -->
-        <xpath expr="//button[@t-on-click='() =&gt; this.cashMove()']" position="attributes">
+        <xpath expr="//button[contains(@t-on-click, 'this.cashMove()')]" position="attributes">
             <attribute name="t-if">pos.showCashMoveButton and !pos.config.custom_hide_cash_in_out</attribute>
         </xpath>
 
@@ -31,7 +34,7 @@
             <attribute name="t-if">!pos.config.custom_hide_copy_btn</attribute>
         </xpath>
         <!-- PM count autofill -->
-        <xpath expr="//button[@t-on-click='() =&gt; this.autoFillPMCount(pm.id)']" position="attributes">
+        <xpath expr="//button[contains(@t-on-click, 'this.autoFillPMCount')]" position="attributes">
             <attribute name="t-if">!pos.config.custom_hide_copy_btn</attribute>
         </xpath>