diff --git a/rental_base/__manifest__.py b/rental_base/__manifest__.py
index ffcec7b7..d6a22f2b 100644
--- a/rental_base/__manifest__.py
+++ b/rental_base/__manifest__.py
@@ -8,6 +8,7 @@
     "author": "elego Software Solutions GmbH, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/vertical-rental",
     "depends": [
+        "base",
         "account",
         "product_analytic",
         "sale",
diff --git a/rental_base/models/sale.py b/rental_base/models/sale.py
index 3313495e..76106997 100644
--- a/rental_base/models/sale.py
+++ b/rental_base/models/sale.py
@@ -72,22 +72,6 @@ class SaleOrderLine(models.Model):
         related="product_id.rented_product_id.uom_id",
     )
 
-    start_date = fields.Date(
-        states={
-            "draft": [("readonly", False)],
-            "sent": [("readonly", False)],
-            "sale": [("readonly", False)],
-        }
-    )
-
-    end_date = fields.Date(
-        states={
-            "draft": [("readonly", False)],
-            "sent": [("readonly", False)],
-            "sale": [("readonly", False)],
-        }
-    )
-
     @api.constrains(
         "rental_type",
         "extension_rental_id",
diff --git a/rental_base/views/res_config_settings_view.xml b/rental_base/views/res_config_settings_view.xml
index 67459319..a3ea3686 100644
--- a/rental_base/views/res_config_settings_view.xml
+++ b/rental_base/views/res_config_settings_view.xml
@@ -5,52 +5,42 @@
         <field name="priority" eval="10" />
         <field name="inherit_id" ref="base.res_config_settings_view_form" />
         <field name="arch" type="xml">
-            <xpath expr="//div[hasclass('settings')]" position="inside">
-                <div
-                    class="app_settings_block"
-                    data-string="Rental"
-                    string="Rental"
-                    data-key="rental_base"
-                >
-                    <h2>Product</h2>
-                    <div class="row mt16 o_settings_container">
-                        <div class="col-12 col-lg-6 o_setting_box">
-                            <div class="o_setting_left_pane">
-                                <field name="group_product_variant" />
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <label for="group_product_variant" />
-                                <div class="text-muted">
-                                    Configure your products with variants
-                                </div>
-                                <div
-                                    class="content-group"
-                                    attrs="{'invisible': [('group_product_variant','=',False)]}"
-                                >
-                                    <div class="mt16">
-                                        <button
-                                            name="%(product.attribute_action)d"
-                                            icon="fa-arrow-right"
-                                            type="action"
-                                            string="Attributes"
-                                            class="btn-link"
-                                        />
-                                    </div>
+            <xpath expr="//form" position="inside">
+                <app data-string="Rental" string="Rental" name="rental_base">
+                    <block title="Product">
+                        <setting
+                            id="variant_options"
+                            help="Configure your products with variants"
+                        >
+                            <field name="group_product_variant" />
+                            <div
+                                class="content-group"
+                                invisible="not group_product_variant"
+                            >
+                                <div class="mt8">
+                                    <button
+                                        name="%(product.attribute_action)d"
+                                        icon="oi-arrow-right"
+                                        type="action"
+                                        string="Attributes"
+                                        class="btn-link"
+                                    />
                                 </div>
                             </div>
-                        </div>
-                    </div>
-                </div>
+                        </setting>
+                    </block>
+
+                </app>
             </xpath>
         </field>
     </record>
 
     <record id="action_rental_configuration" model="ir.actions.act_window">
         <field name="name">Settings</field>
-        <field name="type">ir.actions.act_window</field>
         <field name="res_model">res.config.settings</field>
+        <field name="view_id" ref="res_config_settings_view_form" />
         <field name="view_mode">form</field>
         <field name="target">inline</field>
-        <field name="context">{'module' : 'rental_base'}</field>
+        <field name="context">{'module' : 'rental_base', 'bin_size': False}</field>
     </record>
 </odoo>
diff --git a/rental_base/views/sale_view.xml b/rental_base/views/sale_view.xml
index 0875fd3b..40ea107b 100644
--- a/rental_base/views/sale_view.xml
+++ b/rental_base/views/sale_view.xml
@@ -7,19 +7,19 @@
         <field name="inherit_id" ref="sale_rental.view_order_form" />
         <field name="arch" type="xml">
             <xpath expr="//field[@name='rental_type']" position="attributes">
-                <attribute name="attrs">{'invisible': 1}</attribute>
+                <attribute name="invisible">1</attribute>
             </xpath>
             <xpath expr="//field[@name='extension_rental_id']" position="attributes">
-                <attribute name="attrs">{'invisible': 1}</attribute>
+                <attribute name="invisible">1</attribute>
             </xpath>
             <xpath expr="//field[@name='can_sell_rental']" position="attributes">
-                <attribute name="attrs">{'invisible': 1}</attribute>
+                <attribute name="invisible">1</attribute>
             </xpath>
             <xpath expr="//field[@name='sell_rental_id']" position="attributes">
-                <attribute name="attrs">{'invisible': 1}</attribute>
+                <attribute name="invisible">1</attribute>
             </xpath>
             <xpath expr="//field[@name='rental_qty']" position="attributes">
-                <attribute name="attrs">{'invisible': 1}</attribute>
+                <attribute name="invisible">1</attribute>
             </xpath>
         </field>
     </record>
@@ -37,12 +37,13 @@
             <field name="validity_date" position="after">
                 <span class="o_form_label font-weight-bold">Service Period</span>
                 <div name="service_period" string="Service Period">
-                    <field name="default_start_date" class="oe_inline" nolabel="1" /> to
+                    <field name="default_start_date" class="oe_inline" nolabel="1" />
+                    to
                     <field name="default_end_date" class="oe_inline" nolabel="1" />
                 </div>
             </field>
             <field name="number_of_days" position="attributes">
-                <attribute name="attrs">{'invisible': 1}</attribute>
+                <attribute name="invisible">1</attribute>
             </field>
         </field>
     </record>
@@ -53,7 +54,7 @@
         <field name="inherit_id" ref="sale_stock.view_order_form_inherit_sale_stock" />
         <field name="arch" type="xml">
             <xpath expr="//field[@name='product_packaging_id']" position="attributes">
-                <attribute name="attrs">{'invisible': 1}</attribute>
+                <attribute name="invisible">1</attribute>
             </xpath>
         </field>
     </record>
@@ -64,7 +65,7 @@
         <field name="inherit_id" ref="sale_order_type.sot_view_order_form" />
         <field name="arch" type="xml">
             <xpath expr="//field[@name='type_id']" position="attributes">
-                <attribute name="attrs">{'invisible': 1}</attribute>
+                <attribute name="invisible">1</attribute>
                 <attribute name="widget">radio</attribute>
                 <attribute name="options">{'horizontal': true}</attribute>
             </xpath>
@@ -82,7 +83,7 @@
                     name="%(action_update_sale_line_date)d"
                     string="Update Times"
                     type="action"
-                    attrs="{'invisible': [('state', 'in', ['draft', 'sent'])]}"
+                    invisible="state in ('draft', 'sent')"
                 />
             </xpath>
             <!-- Hide fields inserted by sale module to move them to new location -->
@@ -90,13 +91,13 @@
                 expr="//group[@name='sales_person']//field[@name='client_order_ref']"
                 position="attributes"
             >
-                <attribute name="attrs">{'invisible': 1}</attribute>
+                <attribute name="invisible">1</attribute>
             </xpath>
             <xpath
                 expr="//group[@name='sale_info']//field[@name='analytic_account_id']"
                 position="attributes"
             >
-                <attribute name="attrs">{'invisible': 1}</attribute>
+                <attribute name="invisible">1</attribute>
             </xpath>
             <!-- Sheet -->
             <xpath expr="//field[@name='partner_id']" position="before">
@@ -117,7 +118,7 @@
                 <field
                     name="analytic_account_id"
                     context="{'default_partner_id':partner_invoice_id, 'default_name':name}"
-                    attrs="{'readonly': [('invoice_count','!=',0),('state','=','sale')]}"
+                    readonly="invoice_count > 0 and state == 'sale'"
                     groups="analytic.group_analytic_accounting"
                     force_save="1"
                 />
@@ -125,47 +126,45 @@
             <!-- Sale Order Lines -->
             <!-- Hide fields inserted by sale module to move them to new location -->
             <xpath expr="//field[@name='tax_id']" position="attributes">
-                <attribute name="attrs">{'invisible': 1}</attribute>
+                <attribute name="invisible">1</attribute>
             </xpath>
             <xpath expr="//label[@for='customer_lead']" position="attributes">
-                <attribute name="attrs">{'invisible': 1}</attribute>
+                <attribute name="invisible">1</attribute>
             </xpath>
             <xpath expr="//div[field[@name='customer_lead']]" position="attributes">
-                <attribute name="attrs">{'invisible': 1}</attribute>
+                <attribute name="invisible">1</attribute>
             </xpath>
             <xpath expr="//field[@name='analytic_distribution']" position="attributes">
-                <attribute name="attrs">{'invisible': 1}</attribute>
+                <attribute name="invisible">1</attribute>
             </xpath>
             <xpath expr="//label[@for='qty_delivered']" position="attributes">
-                <attribute name="attrs">
-                    {'invisible': ['|', ('rental', '=', True), ('parent.state', 'not in', ['sale', 'done'])]}
-                </attribute>
+                <attribute
+                    name="invisible"
+                >rental or parent.state not in ('sale','done')</attribute>
             </xpath>
             <xpath expr="//div[field[@name='qty_delivered']]" position="attributes">
-                <attribute name="attrs">
-                    {'invisible': ['|', ('rental', '=', True), ('parent.state', 'not in', ['sale', 'done'])]}
-                </attribute>
+                <attribute
+                    name="invisible"
+                >rental or parent.state not in ('sale','done')</attribute>
             </xpath>
             <xpath expr="//label[@for='qty_invoiced']" position="attributes">
-                <attribute name="attrs">
-                    {'invisible': ['|', ('rental', '=', True), ('parent.state', 'not in', ['sale', 'done'])]}
-                </attribute>
+                <attribute
+                    name="invisible"
+                >rental or parent.state not in ('sale','done')</attribute>
             </xpath>
             <xpath expr="//div[field[@name='qty_invoiced']]" position="attributes">
-                <attribute name="attrs">
-                    {'invisible': ['|', ('rental', '=', True), ('parent.state', 'not in', ['sale', 'done'])]}
-                </attribute>
+                <attribute
+                    name="invisible"
+                >rental or parent.state not in ('sale','done')</attribute>
             </xpath>
             <xpath expr="//label[@for='name']" position="attributes">
-                <attribute name="attrs">{'invisible': 1}</attribute>
+                <attribute name="invisible">1</attribute>
             </xpath>
             <xpath
                 expr="//page[@name='order_lines']//form//field[@name='name']"
                 position="attributes"
             >
-                <attribute
-                    name="attrs"
-                >{'invisible': [('display_type', '=', False)]}</attribute>
+                <attribute name="invisible">display_type == False</attribute>
             </xpath>
             <!-- Group: Order Information -->
             <xpath expr="//group[field[@name='product_id']]" position="attributes">
@@ -173,35 +172,23 @@
                 <attribute name="string">Order Information</attribute>
             </xpath>
             <xpath expr="//label[@for='product_uom_qty']" position="attributes">
-                <attribute
-                    name="attrs"
-                >{'invisible': [('rental', '=', True)]}</attribute>
+                <attribute name="invisible">rental</attribute>
             </xpath>
             <xpath expr="//div[field[@name='product_uom_qty']]" position="attributes">
-                <attribute
-                    name="attrs"
-                >{'invisible': [('rental', '=', True)]}</attribute>
+                <attribute name="invisible">rental</attribute>
             </xpath>
             <xpath expr="//field[@name='product_uom']" position="attributes">
                 <attribute name="options">{'no_create': True}</attribute>
             </xpath>
             <xpath expr="//field[@name='product_id']" position="after">
-                <label
-                    for="rental_qty"
-                    string="Rental Quantity"
-                    attrs="{'invisible': [('rental', '=', False)]}"
-                />
-                <div attrs="{'invisible': [('rental', '=', False)]}">
-                    <field
-                        name="rental_qty"
-                        attrs="{'required': [('rental', '=', True)]}"
-                        class="oe_inline"
-                    />
+                <label for="rental_qty" string="Rental Quantity" invisible="rental" />
+                <div invisible="rental==False">
+                    <field name="rental_qty" required="rental" class="oe_inline" />
                     <span>&amp;nbsp;</span>
                     <field
                         name="rental_qty_uom"
                         groups="uom.group_uom"
-                        attrs="{'readonly': 1}"
+                        readonly="1"
                         class="oe_inline oe_no_button"
                     />
                 </div>
@@ -212,16 +199,16 @@
                     groups="uom.group_uom"
                     options="{'no_create': True}"
                     class="oe_inline oe_no_button"
-                    attrs="{'readonly': [('state', 'in', ('sale', 'done', 'cancel'))],
-                               'required': [('display_type', '=', False)],
-                               'invisible': [('rental', '=', False)]}"
+                    readonly="state in ('sale', 'done', 'cancel')"
+                    required="display_type == False"
+                    invisible="rental == False"
                 />
             </xpath>
             <xpath expr="//div[@name='discount']" position="after">
                 <separator
                     id="description"
                     string="Description"
-                    attrs="{'invisible': [('display_type', '!=', False)]}"
+                    invisible="display_type"
                     colspan="2"
                 />
                 <field name="name" nolabel="1" colspan="2" />
@@ -235,21 +222,21 @@
                     <field name="rental" />
                     <field
                         name="rental_type"
-                        attrs="{'invisible': [('rental', '=', False)],
-                                   'required': [('rental', '=', True)]}"
+                        invisible="rental == False"
+                        required="rental"
                     />
                     <field
                         name="extension_rental_id"
                         options="{'no_quick_create': True, 'no_create_edit': True}"
-                        attrs="{'invisible': [('rental_type', '!=', 'rental_extension')],
-                                   'required': [('rental_type', '=', 'rental_extension')]}"
+                        invisible="rental_type != 'rental_extension'"
+                        required="rental_type == 'rental_extension'"
                         domain="[('rental_product_id', '=', product_id), ('state', 'in', ('ordered', 'out'))]"
                     />
                     <field name="can_sell_rental" invisible="1" />
                     <field
                         name="sell_rental_id"
                         options="{'no_quick_create': True, 'no_create_edit': True}"
-                        attrs="{'invisible': [('can_sell_rental', '=', False)]}"
+                        invisible="can_sell_rental == False"
                         domain="[('rented_product_id', '=', product_id), ('state', '=', 'out')]"
                     />
                 </group>
@@ -258,7 +245,7 @@
                     id="rental_times"
                     string="Rental Times"
                     colspan="4"
-                    attrs="{'invisible': [('rental', '=', False)]}"
+                    invisible="rental == False"
                 >
                     <field name="number_of_days" />
                     <label for="product_uom_qty" string="Ordered Rental Time" />
@@ -279,41 +266,37 @@
                             force_save="1"
                             groups="uom.group_uom"
                             class="oe_inline oe_no_button"
-                            attrs="{'readonly': 1}"
+                            readonly="1"
                         />
                     </div>
                     <label
                         for="qty_delivered"
                         string="Delivered Rental Quantity"
-                        attrs="{'invisible': [('parent.state', 'not in', ['sale', 'done'])]}"
+                        invisible="parent.state not in ('sale', 'done')"
                     />
-                    <div
-                        attrs="{'invisible': [('parent.state', 'not in', ['sale', 'done'])]}"
-                    >
+                    <div invisible="parent.state not in ('sale', 'done')">
                         <field
                             name="qty_delivered"
-                            attrs="{'readonly': [('qty_delivered_method', '!=', 'manual')]}"
+                            readonly="qty_delivered_method != 'manual'"
                             class="oe_inline"
                         />
                         <span>&amp;nbsp;</span>
                         <field
                             name="rental_qty_uom"
                             groups="uom.group_uom"
-                            attrs="{'readonly': 1}"
+                            readonly="1"
                             class="oe_inline oe_no_button"
                         />
                     </div>
                     <label
                         for="qty_invoiced"
                         string="Invoiced Rental Time"
-                        attrs="{'invisible': [('parent.state', 'not in', ['sale', 'done'])]}"
+                        invisible="parent.state not in ('sale', 'done')"
                     />
-                    <div
-                        attrs="{'invisible': [('parent.state', 'not in', ['sale', 'done'])]}"
-                    >
+                    <div invisible="parent.state not in ('sale', 'done')">
                         <field
                             name="qty_invoiced"
-                            attrs="{'invisible': [('parent.state', 'not in', ['sale', 'done'])]}"
+                            invisible="parent.state not in ('sale', 'done')"
                             class="oe_inline"
                         />
                         <span>&amp;nbsp;</span>
@@ -322,7 +305,7 @@
                             force_save="1"
                             groups="uom.group_uom"
                             class="oe_inline oe_no_button"
-                            attrs="{'readonly': 1}"
+                            readonly="1"
                         />
                     </div>
                 </group>
@@ -330,7 +313,7 @@
                 <group id="rental_transport" string="Transport" colspan="4">
                     <field
                         name="product_packaging_id"
-                        attrs="{'invisible': [('product_id', '=', False)]}"
+                        invisible="product_id == False"
                         context="{'default_product_id': product_id,
                                      'tree_view_ref':'product.product_packaging_tree_view',
                                      'form_view_ref':'product.product_packaging_form_view',
@@ -340,7 +323,8 @@
                     />
                     <label for="customer_lead" />
                     <div>
-                        <field name="customer_lead" class="oe_inline" /> Day(s)
+                        <field name="customer_lead" class="oe_inline" />
+                        Day(s)
                     </div>
                 </group>
                 <!-- Group: Invoicing -->
@@ -351,7 +335,7 @@
                         options="{'no_create': True}"
                         context="{'search_view_ref': 'account.account_tax_view_search'}"
                         domain="[('type_tax_use','=','sale'),('company_id','=',parent.company_id)]"
-                        attrs="{'readonly': [('qty_invoiced', '&gt;', 0)]}"
+                        readonly="qty_invoiced &gt; 0"
                     />
                     <label
                         for="analytic_distribution"
@@ -365,6 +349,24 @@
                     />
                 </group>
             </xpath>
+            <!--  Hide the start_date and end_date fields based on the states defined below. -->
+            <xpath
+                expr="//field[@name='order_line']/form//field[@name='start_date']"
+                position="attributes"
+            >
+                <attribute
+                    name="readonly"
+                >state not in ('draft','sent','sale')</attribute>
+            </xpath>
+            <xpath
+                expr="//field[@name='order_line']/form//field[@name='end_date']"
+                position="attributes"
+            >
+                <attribute
+                    name="readonly"
+                >state not in ('draft','sent','sale')</attribute>
+            </xpath>
+
         </field>
     </record>
 </odoo>
diff --git a/rental_base/wizard/update_sale_line_date_view.xml b/rental_base/wizard/update_sale_line_date_view.xml
index 016626da..3ac602c1 100644
--- a/rental_base/wizard/update_sale_line_date_view.xml
+++ b/rental_base/wizard/update_sale_line_date_view.xml
@@ -13,23 +13,19 @@ Part of rental-vertical See LICENSE file for full copyright and licensing detail
                 >By changing the start and end dates of order lines, the dates are also updated in the timeline,the related stock pickings and contracts, if available.
                 Attention: The ordered quantities are not updated!</p>
                 <group name="main">
-                    <field
-                        name="date_start"
-                        attrs="{'invisible': [('date_in_line', '=', True)]}"
-                    />
-                    <field
-                        name="date_end"
-                        attrs="{'invisible': [('date_in_line', '=', True)]}"
-                    />
+                    <field name="date_start" invisible="date_in_line" />
+                    <field name="date_end" invisible="date_in_line" />
                     <field name="date_in_line" />
                     <field name="all_line" />
                     <field
                         name="from_line"
-                        attrs="{'invisible': [('all_line', '=', True)], 'required': [('all_line', '=', False)]}"
+                        invisible="all_line"
+                        required="all_line == False"
                     />
                     <field
                         name="to_line"
-                        attrs="{'invisible': [('all_line', '=', True)], 'required': [('all_line', '=', False)]}"
+                        invisible="all_line"
+                        required="all_line == False"
                     />
                 </group>
                 <field name="line_ids" no_label="1">