diff --git a/car_rental/__manifest__.py b/car_rental/__manifest__.py
index 592f60df2..5cc40ee5e 100644
--- a/car_rental/__manifest__.py
+++ b/car_rental/__manifest__.py
@@ -10,7 +10,8 @@
         'base_automation',
         'knowledge',
         'payment_demo',
-        'project_timesheet',
+        'project',
+        'timesheet_grid',
         'purchase_stock',
         'sale_management',
         'web_studio',
@@ -24,19 +25,21 @@
         'data/ir_actions_server.xml',
         'data/ir_ui_view.xml',
         'data/ir_attachment_pre.xml',
-        'data/product_category.xml',
         'data/project_project.xml',
         'data/product_template.xml',
         'data/product_attribute.xml',
         'data/product_attribute_value.xml',
         'data/product_template_attribute_line.xml',
         'data/product_template_attribute_value.xml',
+        'data/product_category.xml',
         'data/product_product.xml',
         'data/res_config_settings.xml',
         'data/knowledge_cover.xml',
         'data/knowledge_article.xml',
-        'data/payment_provider_demo.xml',
         'data/ir_attachment_post.xml',
+        'data/website_view.xml',
+        'data/website_theme_apply.xml',
+        'data/ir_model_data.xml',
         'data/mail_message.xml',
     ],
     'demo': [
@@ -59,7 +62,7 @@
         'demo/sale_order_post.xml',
         'demo/purchase_order_line_post.xml',
         'demo/website_ir_attachment.xml',
-        'demo/payment_provider_demo.xml',
+        'demo/payment_provider_demo_post.xml',
         'demo/website_view.xml',
         'demo/website_theme_apply.xml',
     ],
diff --git a/car_rental/data/ir_model_data.xml b/car_rental/data/ir_model_data.xml
new file mode 100644
index 000000000..8a26afb15
--- /dev/null
+++ b/car_rental/data/ir_model_data.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<odoo>
+    <record id="cloc_exclude_website_view" model="ir.model.data">
+        <field name="name">cloc_exclude_website_view</field>
+        <field name="model">ir.ui.view</field>
+        <field name="module">__cloc_exclude__</field>
+        <field name="res_id" eval="ref('contactus')"/>
+    </record>
+</odoo>
diff --git a/car_rental/data/payment_provider_demo.xml b/car_rental/data/payment_provider_demo.xml
deleted file mode 100644
index 1ab663d4c..000000000
--- a/car_rental/data/payment_provider_demo.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<odoo noupdate="1">
-    <record id="payment.payment_provider_demo" model="payment.provider">
-        <field name="is_published" eval="0"/>
-        <field name="state">disabled</field>
-    </record>
-</odoo>
diff --git a/car_rental/data/product_category.xml b/car_rental/data/product_category.xml
new file mode 100644
index 000000000..aaf2e7a7e
--- /dev/null
+++ b/car_rental/data/product_category.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<odoo noupdate="1">
+    <record id="product_category_1" model="product.category">
+        <field name="name">Sedan</field>
+        <field name="parent_id" ref="product.product_category_all"/>
+    </record>
+    <record id="product_category_2" model="product.category">
+        <field name="name">SUV</field>
+        <field name="parent_id" ref="product.product_category_all"/>
+    </record>
+    <record id="product_category_3" model="product.category">
+        <field name="name">hatchback</field>
+        <field name="parent_id" ref="product.product_category_all"/>
+    </record>
+</odoo>
diff --git a/car_rental/data/product_product.xml b/car_rental/data/product_product.xml
index 354fee300..f168d7740 100644
--- a/car_rental/data/product_product.xml
+++ b/car_rental/data/product_product.xml
@@ -87,4 +87,64 @@
         <field name="purchase_method">purchase</field>
         <field name="default_code">RENTAL</field>
     </record>
+    <record id="product_product_17" model="product.product">
+        <field name="name">Audi/A5/HJU47634</field>
+        <field name="detailed_type">product</field>
+        <field name="categ_id" ref="product_category_1"/>
+        <field name="image_1920" type="base64" file="car_rental/static/src/binary/product_template/10-image_1920.png"/>
+    </record>
+    <record id="product_product_18" model="product.product">
+        <field name="name">Opel/Agila/KL6464t6</field>
+        <field name="detailed_type">product</field>
+        <field name="categ_id" ref="product_category_3"/>
+        <field name="image_1920" type="base64" file="car_rental/static/src/binary/product_template/11-image_1920.png"/>
+    </record>
+    <record id="product_product_19" model="product.product">
+        <field name="name">Audi/A1/GJ/987656</field>
+        <field name="detailed_type">product</field>
+        <field name="categ_id" ref="product_category_3"/>
+        <field name="image_1920" type="base64" file="car_rental/static/src/binary/product_template/14-image_1920.png"/>
+    </record>
+    <record id="product_product_20" model="product.product">
+        <field name="name">Audi/A5/GJ657863</field>
+        <field name="detailed_type">product</field>
+        <field name="categ_id" ref="product_category_1"/>
+        <field name="image_1920" type="base64" file="car_rental/static/src/binary/product_template/4-image_1920"/>
+    </record>
+    <record id="product_product_21" model="product.product">
+        <field name="name">Audi/A5/KGF62652</field>
+        <field name="detailed_type">product</field>
+        <field name="categ_id" ref="product_category_1"/>
+        <field name="image_1920" type="base64" file="car_rental/static/src/binary/product_template/5-image_1920"/>
+    </record>
+    <record id="product_product_22" model="product.product">
+        <field name="name">Mercedes/Class M/JK46556</field>
+        <field name="detailed_type">product</field>
+        <field name="categ_id" ref="product_category_2"/>
+        <field name="image_1920" type="base64" file="car_rental/static/src/binary/product_template/6-image_1920.png"/>
+    </record>
+    <record id="product_product_23" model="product.product">
+        <field name="name">Audi/A3/Mh47535H</field>
+        <field name="detailed_type">product</field>
+        <field name="categ_id" ref="product_category_1"/>
+        <field name="image_1920" type="base64" file="car_rental/static/src/binary/product_template/7-image_1920.jpg"/>
+    </record>
+    <record id="product_product_24" model="product.product">
+        <field name="name">Hyundai/i20/DG6864464</field>
+        <field name="detailed_type">product</field>
+        <field name="categ_id" ref="product_category_3"/>
+        <field name="image_1920" type="base64" file="car_rental/static/src/binary/product_template/12-image_1920.png"/>
+    </record>
+    <record id="product_product_25" model="product.product">
+        <field name="name">Toyota/Fortuner/GJU685657</field>
+        <field name="detailed_type">product</field>
+        <field name="categ_id" ref="product_category_2"/>
+        <field name="image_1920" type="base64" file="car_rental/static/src/binary/product_template/9-image_1920.png"/>
+    </record>
+    <record id="product_product_26" model="product.product">
+        <field name="name">Hyundai/Creta/GJ567655</field>
+        <field name="detailed_type">product</field>
+        <field name="categ_id" ref="product_category_2"/>
+        <field name="image_1920" type="base64" file="car_rental/static/src/binary/product_template/8-image_1920.png"/>
+    </record>
 </odoo>
diff --git a/car_rental/data/website_theme_apply.xml b/car_rental/data/website_theme_apply.xml
new file mode 100644
index 000000000..4e113077d
--- /dev/null
+++ b/car_rental/data/website_theme_apply.xml
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<odoo>
+    <function name="write" model="ir.ui.view">
+        <value model="ir.ui.view" eval="obj().env['website'].with_context(website_id=obj().env.ref('website.default_website').id).viewref('website.contactus').id"/>
+        <value model="ir.ui.view" eval="{'arch': obj().env.ref('car_rental.contactus').arch}"/>
+    </function>
+</odoo>
diff --git a/car_rental/data/website_view.xml b/car_rental/data/website_view.xml
new file mode 100644
index 000000000..aa48d7615
--- /dev/null
+++ b/car_rental/data/website_view.xml
@@ -0,0 +1,304 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <record id="contactus" model="ir.ui.view">
+        <field name="name">Contact Us</field>
+        <field name="key">car_rental.contactus</field>
+        <field name="type">qweb</field>
+        <field name="website_id" ref="website.default_website"/>
+        <field name="arch" type="xml">
+            <t name="Contact Us" t-name="website.contactus">
+                <t t-call="website.layout">
+                    <t t-set="logged_partner"
+                        t-value="request.env['website.visitor']._get_visitor_from_request().partner_id"/>
+                    <t t-set="contactus_form_values"
+                        t-value="{'email_to': res_company.email, 'name': request.params.get('name', ''), 'phone': request.params.get('phone', ''), 'email_from': request.params.get('email_from', ''), 'company': request.params.get('company', ''), 'subject': request.params.get('subject', '')}"/>
+                    <span class="hidden" data-for="contactus_form"
+                        t-att-data-values="contactus_form_values"/>
+                    <div id="wrap" class="oe_structure oe_empty">
+                        <section
+                            class="s_title parallax s_parallax_is_fixed bg-black-50 pt24 pb24 o_colored_level"
+                            data-vcss="001" data-snippet="s_title" data-scroll-background-ratio="1"
+                            data-name="Title" style="background-image: none;">
+                            <span class="s_parallax_bg oe_img_bg"
+                                style="background-image: url('/web/image/website.s_banner_default_image'); background-position: 50% 0;"/>
+                            <div class="o_we_bg_filter bg-black-50"/>
+                            <div class="container">
+                                <h1>
+                                    Contact Us
+                                </h1>
+                            </div>
+                        </section>
+                        <section class="s_text_block pt40 pb40 o_colored_level"
+                            data-snippet="s_text_block" data-name="Text"
+                            style="background-image: none;">
+                            <div class="s_allow_columns container">
+                                <div class="row">
+                                    <div class="col-lg-8 mt-4 mt-lg-0 o_colored_level">
+                                        <p> Contact us about anything related to our company or
+                                            services. <br/> We'll do our best to get back to you as
+                                            soon as possible. </p>
+                                        <section class="s_website_form" data-vcss="001"
+                                            data-snippet="s_website_form" data-name="Form">
+                                            <div class="container">
+                                                <form id="contactus_form" action="/website/form/"
+                                                    method="post" enctype="multipart/form-data"
+                                                    class="o_mark_required" data-mark="*"
+                                                    data-model_name="crm.lead"
+                                                    data-success-mode="redirect"
+                                                    data-success-page="/contactus-thank-you"
+                                                    data-pre-fill="true">
+                                                    <div
+                                                        class="s_website_form_rows row s_col_no_bgcolor">
+                                                        <div
+                                                            class="s_website_form_field mb-3 col-12 s_website_form_required"
+                                                            data-type="char" data-name="Field">
+                                                            <div
+                                                                class="row s_col_no_resize s_col_no_bgcolor">
+                                                                <label
+                                                                    class="col-form-label col-sm-auto s_website_form_label"
+                                                                    style="width: 200px"
+                                                                    for="o4jrpyx7skv9">
+                                                                    <span
+                                                                        class="s_website_form_label_content">
+                                                                        Your
+                                                                        Name
+                                                                    </span>
+                                                                    <span
+                                                                        class="s_website_form_mark">
+                                                                        *
+                                                                    </span>
+                                                                </label>
+                                                                <div class="col-sm">
+                                                                    <input type="text"
+                                                                        class="form-control s_website_form_input"
+                                                                        name="contact_name"
+                                                                        required="1"
+                                                                        data-fill-with="name"
+                                                                        id="o4jrpyx7skv9"/>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                        <div
+                                                            class="s_website_form_field mb-3 col-12"
+                                                            data-type="tel" data-name="Field">
+                                                            <div
+                                                                class="row s_col_no_resize s_col_no_bgcolor">
+                                                                <label
+                                                                    class="col-form-label col-sm-auto s_website_form_label"
+                                                                    style="width: 200px"
+                                                                    for="oliopwl9suva">
+                                                                    <span
+                                                                        class="s_website_form_label_content">
+                                                                        Phone
+                                                                        Number
+                                                                    </span>
+                                                                </label>
+                                                                <div class="col-sm">
+                                                                    <input type="tel"
+                                                                        class="form-control s_website_form_input"
+                                                                        name="phone"
+                                                                        data-fill-with="phone"
+                                                                        id="oliopwl9suva"/>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                        <div
+                                                            class="s_website_form_field mb-3 col-12 s_website_form_required"
+                                                            data-type="email" data-name="Field">
+                                                            <div
+                                                                class="row s_col_no_resize s_col_no_bgcolor">
+                                                                <label
+                                                                    class="col-form-label col-sm-auto s_website_form_label "
+                                                                    style="width: 200px"
+                                                                    for="od9cbbp6zjsq">
+                                                                    <span
+                                                                        class="s_website_form_label_content">
+                                                                        Your
+                                                                        Email
+                                                                    </span>
+                                                                    <span
+                                                                        class="s_website_form_mark">
+                                                                        *
+                                                                    </span>
+                                                                </label>
+                                                                <div class="col-sm">
+                                                                    <input type="email"
+                                                                        class="form-control s_website_form_input"
+                                                                        name="email_from"
+                                                                        required="1"
+                                                                        data-fill-with="email"
+                                                                        id="od9cbbp6zjsq"/>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                        <div data-visibility-condition=""
+                                                            data-visibility-between=""
+                                                            class="s_website_form_field mb-3 col-12 s_website_form_custom"
+                                                            data-type="char" data-name="Field">
+                                                            <div
+                                                                class="row s_col_no_resize s_col_no_bgcolor">
+                                                                <label
+                                                                    class="col-form-label col-sm-auto s_website_form_label"
+                                                                    style="width: 200px"
+                                                                    for="o28ga49ti47li">
+                                                                    <span
+                                                                        class="s_website_form_label_content">
+                                                                        Vehicle
+                                                                        Required
+                                                                    </span>
+                                                                </label>
+                                                                <div class="col-sm">
+                                                                    <input type="text"
+                                                                        class="form-control s_website_form_input"
+                                                                        name="Vehicle Required"
+                                                                        id="o28ga49ti47li"
+                                                                        data-fill-with="commercial_company_name"/>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                        <div data-visibility-condition="" data-visibility-between="" class="s_website_form_field mb-3 col-12 s_website_form_custom"
+                                                            data-type="integer" data-name="Field">
+                                                            <div
+                                                                class="row s_col_no_resize s_col_no_bgcolor">
+                                                                <label
+                                                                    class="col-form-label col-sm-auto s_website_form_label"
+                                                                    style="width: 200px"
+                                                                    for="ocqozwlmqrgg">
+                                                                    <span
+                                                                        class="s_website_form_label_content">
+                                                                        No.
+                                                                        of days
+                                                                    </span>
+                                                                </label>
+                                                                <div class="col-sm">
+                                                                    <input type="number"
+                                                                        class="form-control s_website_form_input"
+                                                                        name="No. of days" step="1"
+                                                                        id="ocqozwlmqrgg"
+                                                                        data-fill-with="undefined"/>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                        <div data-visibility-condition=""
+                                                            data-visibility-between=""
+                                                            class="s_website_form_field mb-3 col-12 s_website_form_custom"
+                                                            data-type="many2one" data-name="Field">
+                                                            <div
+                                                                class="row s_col_no_resize s_col_no_bgcolor">
+                                                                <label
+                                                                    class="col-form-label col-sm-auto s_website_form_label"
+                                                                    style="width: 200px"
+                                                                    for="opy82v15gred">
+                                                                    <span class="s_website_form_label_content"> Service </span>
+                                                                </label>
+                                                                <div class="col-sm">
+                                                                    <select class="form-select s_website_form_input"  name="Service" id="opy82v15gred">
+                                                                        <option
+                                                                            value="Airport pick up and drop"
+                                                                            selected="selected">
+                                                                            Airport
+                                                                            pick up and drop
+                                                                        </option>
+                                                                        <option value="Employee pick up and drop"> Employee pick up and drop </option>
+                                                                        <option  value="Monthly rental"> Monthly rental </option>
+                                                                    </select>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                        <div data-visibility-condition=""
+                                                            data-visibility-between=""
+                                                            class="s_website_form_field mb-3 col-12 s_website_form_model_required"
+                                                            data-type="char" data-name="Field">
+                                                            <div  class="row s_col_no_resize s_col_no_bgcolor">
+                                                                <label
+                                                                    class="col-form-label col-sm-auto s_website_form_label"
+                                                                    style="width: 200px"
+                                                                    for="okxn3dd9166">
+                                                                    <span class="s_website_form_label_content">Subject</span>
+                                                                    <span
+                                                                        class="s_website_form_mark">
+                                                                        *
+                                                                    </span>
+                                                                </label>
+                                                                <div class="col-sm">
+                                                                    <input type="text"
+                                                                        class="form-control s_website_form_input"
+                                                                        name="name" required="true"
+                                                                        id="okxn3dd9166"
+                                                                        data-fill-with="undefined"/>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                        <div data-visibility-condition=""
+                                                            data-visibility-between=""
+                                                            class="s_website_form_field mb-3 col-12 s_website_form_required"
+                                                            data-type="text" data-name="Field">
+                                                            <div class="row s_col_no_resize s_col_no_bgcolor">
+                                                                <label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="o1bjoa0di5kz">
+                                                                    <span class="s_website_form_label_content">Additional Information</span>
+                                                                    <span
+                                                                        class="s_website_form_mark">
+                                                                        *
+                                                                    </span>
+                                                                </label>
+                                                                <div class="col-sm">
+                                                                    <textarea
+                                                                        class="form-control s_website_form_input"
+                                                                        name="description"
+                                                                        required="1"
+                                                                        id="o1bjoa0di5kz" rows="3"/>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                        <div
+                                                            class="mb-0 py-2 col-12 s_website_form_submit"
+                                                            data-name="Submit Button">
+                                                            <div style="width: 200px;"
+                                                                class="s_website_form_label"/>
+                                                            <a href="#" role="button"
+                                                                class="btn btn-primary btn-lg s_website_form_send"
+                                                                data-bs-original-title="">
+                                                                Submit
+                                                            </a>
+                                                            <span id="s_website_form_result"/>
+                                                        </div>
+                                                    </div>
+                                                </form>
+                                            </div>
+                                        </section>
+                                    </div>
+                                    <div class="col-lg-4 mt-4 mt-lg-0 o_colored_level">
+                                        <ul class="list-unstyled mb-0 ps-2">
+                                            <li>
+                                                Trip Rental
+                                            </li>
+                                            <li>
+                                                <i class="fa fa-map-marker fa-fw me-2"/>
+                                                <span class="o_force_ltr">
+                                                    3575&amp;nbsp;Buena Vista
+                                                    Avenue
+                                                </span>
+                                            </li>
+                                            <li>
+                                                <i class="fa fa-phone fa-fw me-2"/>
+                                                <span class="o_force_ltr">
+                                                    +1 (650) 555-0111
+                                                </span>
+                                            </li>
+                                            <li>
+                                                <i class="fa fa-1x fa-fw fa-envelope me-2"/>
+                                                <span>
+                                                    info@yourcompany.example.com
+                                                </span>
+                                            </li>
+                                        </ul>
+                                    </div>
+                                </div>
+                            </div>
+                        </section>
+                    </div>
+                </t>
+            </t>
+        </field>
+    </record>
+</odoo>
diff --git a/car_rental/demo/payment_provider_demo.xml b/car_rental/demo/payment_provider_demo.xml
deleted file mode 100644
index c38257a4a..000000000
--- a/car_rental/demo/payment_provider_demo.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<odoo noupdate="1">
-    <record id="payment.payment_provider_demo" model="payment.provider">
-        <field name="is_published" eval="1"/>
-        <field name="state">test</field>
-    </record>
-</odoo>
diff --git a/car_rental/demo/payment_provider_demo_post.xml b/car_rental/demo/payment_provider_demo_post.xml
new file mode 100644
index 000000000..6c5f08df3
--- /dev/null
+++ b/car_rental/demo/payment_provider_demo_post.xml
@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<odoo noupdate="1">
+    <function name="button_immediate_install" model="ir.module.module" eval="[ref('base.module_payment_demo')]"/>
+</odoo>
diff --git a/car_rental/demo/product_pricing.xml b/car_rental/demo/product_pricing.xml
index 456bcc785..e8d090482 100644
--- a/car_rental/demo/product_pricing.xml
+++ b/car_rental/demo/product_pricing.xml
@@ -1,102 +1,102 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <odoo noupdate="1">
     <record id="i20_hourly_rental_pricing" model="product.pricing">
-        <field name="product_template_id" model="product.template" eval="obj().search([('x_vehicle_no', 'ilike', 'Hyundai/i20/DG6864464')]).id"/>
+        <field name="product_template_id" model="product.product" eval="obj().env.ref('car_rental.product_product_24').product_tmpl_id.id"/>
         <field name="recurrence_id" ref="sale_renting.recurrence_3_hours"/>
         <field name="price">10.0</field>
     </record>
     <record id="i20_weekly_rental_pricing" model="product.pricing">
-        <field name="product_template_id" model="product.template" eval="obj().search([('x_vehicle_no', 'ilike', 'Hyundai/i20/DG6864464')]).id"/>
+        <field name="product_template_id" model="product.product" eval="obj().env.ref('car_rental.product_product_24').product_tmpl_id.id"/>
         <field name="recurrence_id" ref="sale_renting.recurrence_weekly"/>
         <field name="price">110.0</field>
     </record>
     <record id="audi_hourly_rental_pricing" model="product.pricing">
-        <field name="product_template_id" model="product.template" eval="obj().search([('x_vehicle_no', 'ilike', 'Audi/A5/GJ657863')]).id"/>
+        <field name="product_template_id" model="product.product" eval="obj().env.ref('car_rental.product_product_20').product_tmpl_id.id"/>
         <field name="recurrence_id" ref="sale_renting.recurrence_3_hours"/>
         <field name="price">45.0</field>
     </record>
     <record id="audi_weekly_rental_pricing" model="product.pricing">
-        <field name="product_template_id" model="product.template" eval="obj().search([('x_vehicle_no', 'ilike', 'Audi/A5/GJ657863')]).id"/>
+        <field name="product_template_id" model="product.product" eval="obj().env.ref('car_rental.product_product_20').product_tmpl_id.id"/>
         <field name="recurrence_id" ref="sale_renting.recurrence_weekly"/>
         <field name="price">245.0</field>
     </record>
     <record id="audi_a5_hourly_rental_pricing" model="product.pricing">
-        <field name="product_template_id" model="product.template" eval="obj().search([('x_vehicle_no', 'ilike', 'Audi/A5/KGF62652')]).id"/>
+        <field name="product_template_id" model="product.product" eval="obj().env.ref('car_rental.product_product_21').product_tmpl_id.id"/>
         <field name="recurrence_id" ref="sale_renting.recurrence_3_hours"/>
         <field name="price">40.0</field>
     </record>
     <record id="audi_a5_weekly_rental_pricing" model="product.pricing">
-        <field name="product_template_id" model="product.template" eval="obj().search([('x_vehicle_no', 'ilike', 'Audi/A5/KGF62652')]).id"/>
+        <field name="product_template_id" model="product.product" eval="obj().env.ref('car_rental.product_product_21').product_tmpl_id.id"/>
         <field name="recurrence_id" ref="sale_renting.recurrence_weekly"/>
         <field name="price">376.0</field>
     </record>
     <record id="creta_hourly_rental_pricing" model="product.pricing">
-        <field name="product_template_id" model="product.template" eval="obj().search([('x_vehicle_no', 'ilike', 'Hyundai/Creta/GJ567655')]).id"/>
+        <field name="product_template_id" model="product.product" eval="obj().env.ref('car_rental.product_product_26').product_tmpl_id.id"/>
         <field name="recurrence_id" ref="sale_renting.recurrence_3_hours"/>
         <field name="price">17.0</field>
     </record>
     <record id="creta_weekly_rental_pricing" model="product.pricing">
-        <field name="product_template_id" model="product.template" eval="obj().search([('x_vehicle_no', 'ilike', 'Hyundai/Creta/GJ567655')]).id"/>
+        <field name="product_template_id" model="product.product" eval="obj().env.ref('car_rental.product_product_26').product_tmpl_id.id"/>
         <field name="recurrence_id" ref="sale_renting.recurrence_weekly"/>
         <field name="price">117.0</field>
     </record>
     <record id="mercedes_hourly_rental_pricing" model="product.pricing">
-        <field name="product_template_id" model="product.template" eval="obj().search([('x_vehicle_no', 'ilike', 'Mercedes/Class M/JK46556')]).id"/>
+        <field name="product_template_id" model="product.product" eval="obj().env.ref('car_rental.product_product_22').product_tmpl_id.id"/>
         <field name="recurrence_id" ref="sale_renting.recurrence_3_hours"/>
         <field name="price">17.0</field>
     </record>
     <record id="mercedes_weekly_rental_pricing" model="product.pricing">
-        <field name="product_template_id" model="product.template" eval="obj().search([('x_vehicle_no', 'ilike', 'Mercedes/Class M/JK46556')]).id"/>
+        <field name="product_template_id" model="product.product" eval="obj().env.ref('car_rental.product_product_22').product_tmpl_id.id"/>
         <field name="recurrence_id" ref="sale_renting.recurrence_weekly"/>
         <field name="price">117.0</field>
     </record>
     <record id="fortuner_hourly_rental_pricing" model="product.pricing">
-        <field name="product_template_id" model="product.template" eval="obj().search([('x_vehicle_no', 'ilike', 'Toyota/Fortuner/GJU685657')]).id"/>
+        <field name="product_template_id" model="product.product" eval="obj().env.ref('car_rental.product_product_25').product_tmpl_id.id"/>
         <field name="recurrence_id" ref="sale_renting.recurrence_3_hours"/>
         <field name="price">20.0</field>
     </record>
     <record id="fortuner_weekly_rental_pricing" model="product.pricing">
-        <field name="product_template_id" model="product.template" eval="obj().search([('x_vehicle_no', 'ilike', 'Toyota/Fortuner/GJU685657')]).id"/>
+        <field name="product_template_id" model="product.product" eval="obj().env.ref('car_rental.product_product_25').product_tmpl_id.id"/>
         <field name="recurrence_id" ref="sale_renting.recurrence_weekly"/>
         <field name="price">150.0</field>
     </record>
     <record id="audi_a5hj_hourly_rental_pricing" model="product.pricing">
-        <field name="product_template_id" model="product.template" eval="obj().search([('x_vehicle_no', 'ilike', 'Audi/A5/HJU47634')]).id"/>
+        <field name="product_template_id" model="product.product" eval="obj().env.ref('car_rental.product_product_17').product_tmpl_id.id"/>
         <field name="recurrence_id" ref="sale_renting.recurrence_3_hours"/>
         <field name="price">12.0</field>
     </record>
     <record id="audi_a5hj_weekly_rental_pricing" model="product.pricing">
-        <field name="product_template_id" model="product.template" eval="obj().search([('x_vehicle_no', 'ilike', 'Audi/A5/HJU47634')]).id"/>
+        <field name="product_template_id" model="product.product" eval="obj().env.ref('car_rental.product_product_17').product_tmpl_id.id"/>
         <field name="recurrence_id" ref="sale_renting.recurrence_weekly"/>
         <field name="price">130.0</field>
     </record>
     <record id="agila_hourly_rental_pricing" model="product.pricing">
-        <field name="product_template_id" model="product.template" eval="obj().search([('x_vehicle_no', 'ilike', 'Opel/Agila/KL6464t6')]).id"/>
+        <field name="product_template_id" model="product.product" eval="obj().env.ref('car_rental.product_product_18').product_tmpl_id.id"/>
         <field name="recurrence_id" ref="sale_renting.recurrence_3_hours"/>
         <field name="price">12.0</field>
     </record>
     <record id="agila_weekly_rental_pricing" model="product.pricing">
-        <field name="product_template_id" model="product.template" eval="obj().search([('x_vehicle_no', 'ilike', 'Opel/Agila/KL6464t6')]).id"/>
+        <field name="product_template_id" model="product.product" eval="obj().env.ref('car_rental.product_product_18').product_tmpl_id.id"/>
         <field name="recurrence_id" ref="sale_renting.recurrence_weekly"/>
         <field name="price">130.0</field>
     </record>
     <record id="audia1_hourly_rental_pricing" model="product.pricing">
-        <field name="product_template_id" model="product.template" eval="obj().search([('x_vehicle_no', 'ilike', 'Audi/A1/GJ/987656')]).id"/>
+        <field name="product_template_id" model="product.product" eval="obj().env.ref('car_rental.product_product_19').product_tmpl_id.id"/>
         <field name="recurrence_id" ref="sale_renting.recurrence_3_hours"/>
         <field name="price">14.0</field>
     </record>
     <record id="audia1_weekly_rental_pricing" model="product.pricing">
-        <field name="product_template_id" model="product.template" eval="obj().search([('x_vehicle_no', 'ilike', 'Audi/A1/GJ/987656')]).id"/>
+        <field name="product_template_id" model="product.product" eval="obj().env.ref('car_rental.product_product_19').product_tmpl_id.id"/>
         <field name="recurrence_id" ref="sale_renting.recurrence_weekly"/>
         <field name="price">115.0</field>
     </record>
     <record id="audia3_hourly_rental_pricing" model="product.pricing">
-        <field name="product_template_id" model="product.template" eval="obj().search([('x_vehicle_no', 'ilike', 'Audi/A3/Mh47535H')]).id"/>
+        <field name="product_template_id" model="product.product" eval="obj().env.ref('car_rental.product_product_23').product_tmpl_id.id"/>
         <field name="recurrence_id" ref="sale_renting.recurrence_3_hours"/>
         <field name="price">16.0</field>
     </record>
     <record id="audia3_weekly_rental_pricing" model="product.pricing">
-        <field name="product_template_id" model="product.template" eval="obj().search([('x_vehicle_no', 'ilike', 'Audi/A3/Mh47535H')]).id"/>
+        <field name="product_template_id" model="product.product" eval="obj().env.ref('car_rental.product_product_23').product_tmpl_id.id"/>
         <field name="recurrence_id" ref="sale_renting.recurrence_weekly"/>
         <field name="price">160.0</field>
     </record>
diff --git a/car_rental/demo/product_supplierinfo.xml b/car_rental/demo/product_supplierinfo.xml
index a3b7caefd..01f6698fb 100644
--- a/car_rental/demo/product_supplierinfo.xml
+++ b/car_rental/demo/product_supplierinfo.xml
@@ -16,35 +16,35 @@
     </record>
     <record id="product_supplierinfo_11" model="product.supplierinfo">
         <field name="partner_id" ref="res_partner_13"/>
-        <field name="product_tmpl_id" model="product.template" eval="obj().search([('x_vehicle_no', 'ilike', 'Hyundai/i20/DG6864464')]).id"/>
+        <field name="product_tmpl_id" model="product.product" eval="obj().env.ref('car_rental.product_product_24').product_tmpl_id.id"/>
         <field name="price">3500.0</field>
         <field name="delay" eval="False"/>
         <field name="min_qty">1.0</field>
     </record>
     <record id="product_supplierinfo_2" model="product.supplierinfo">
         <field name="partner_id" ref="res_partner_9"/>
-        <field name="product_tmpl_id" model="product.template" eval="obj().search([('x_vehicle_no', 'ilike', 'Audi/A5/GJ657863')]).id"/>
+        <field name="product_tmpl_id" model="product.product" eval="obj().env.ref('car_rental.product_product_20').product_tmpl_id.id"/>
         <field name="price">35007.0</field>
         <field name="delay" eval="False"/>
         <field name="min_qty">1.0</field>
     </record>
     <record id="product_supplierinfo_3" model="product.supplierinfo">
         <field name="partner_id" ref="res_partner_10"/>
-        <field name="product_tmpl_id" model="product.template" eval="obj().search([('x_vehicle_no', 'ilike', 'Audi/A5/KGF62652')]).id"/>
+        <field name="product_tmpl_id" model="product.product" eval="obj().env.ref('car_rental.product_product_21').product_tmpl_id.id"/>
         <field name="price">28970.0</field>
         <field name="delay" eval="False"/>
         <field name="min_qty">1.0</field>
     </record>
     <record id="product_supplierinfo_4" model="product.supplierinfo">
         <field name="partner_id" ref="res_partner_11"/>
-        <field name="product_tmpl_id" model="product.template" eval="obj().search([('x_vehicle_no', 'ilike', 'Hyundai/Creta/GJ567655')]).id"/>
+        <field name="product_tmpl_id" model="product.product" eval="obj().env.ref('car_rental.product_product_26').product_tmpl_id.id"/>
         <field name="price">15678.0</field>
         <field name="delay" eval="False"/>
         <field name="min_qty">1.0</field>
     </record>
     <record id="product_supplierinfo_5" model="product.supplierinfo">
         <field name="partner_id" ref="res_partner_12"/>
-        <field name="product_tmpl_id" model="product.template" eval="obj().search([('x_vehicle_no', 'ilike', 'Mercedes/Class M/JK46556')]).id"/>
+        <field name="product_tmpl_id" model="product.product" eval="obj().env.ref('car_rental.product_product_22').product_tmpl_id.id"/>
         <field name="price">20757.0</field>
         <field name="delay" eval="False"/>
         <field name="min_qty">1.0</field>
@@ -58,21 +58,21 @@
     </record>
     <record id="product_supplierinfo_7" model="product.supplierinfo">
         <field name="partner_id" ref="res_partner_10"/>
-        <field name="product_tmpl_id" model="product.template" eval="obj().search([('x_vehicle_no', 'ilike', 'Toyota/Fortuner/GJU685657')]).id"/>
+        <field name="product_tmpl_id" model="product.product" eval="obj().env.ref('car_rental.product_product_25').product_tmpl_id.id"/>
         <field name="price">14678.0</field>
         <field name="delay" eval="False"/>
         <field name="min_qty">1.0</field>
     </record>
     <record id="product_supplierinfo_8" model="product.supplierinfo">
         <field name="partner_id" ref="res_partner_12"/>
-        <field name="product_tmpl_id" model="product.template" eval="obj().search([('x_vehicle_no', 'ilike', 'Audi/A5/HJU47634')]).id"/>
+        <field name="product_tmpl_id" model="product.product" eval="obj().env.ref('car_rental.product_product_17').product_tmpl_id.id"/>
         <field name="price">4500.0</field>
         <field name="delay" eval="False"/>
         <field name="min_qty">1.0</field>
     </record>
     <record id="product_supplierinfo_9" model="product.supplierinfo">
         <field name="partner_id" ref="res_partner_13"/>
-        <field name="product_tmpl_id" model="product.template" eval="obj().search([('x_vehicle_no', 'ilike', 'Opel/Agila/KL6464t6')]).id"/>
+        <field name="product_tmpl_id" model="product.product" eval="obj().env.ref('car_rental.product_product_18').product_tmpl_id.id"/>
         <field name="price">4500.0</field>
         <field name="delay" eval="False"/>
         <field name="min_qty">1.0</field>
diff --git a/car_rental/demo/purchase_order_line.xml b/car_rental/demo/purchase_order_line.xml
index 95192b623..a7ef2264b 100644
--- a/car_rental/demo/purchase_order_line.xml
+++ b/car_rental/demo/purchase_order_line.xml
@@ -8,7 +8,7 @@
     </record>
     <record id="purchase_order_line_11" model="purchase.order.line">
         <field name="order_id" ref="purchase_order_11"/>
-        <field name="product_id" model="product.template" eval="obj().search([('x_vehicle_no', 'ilike', 'Hyundai/i20/DG6864464')]).id"/>
+        <field name="product_id" ref="product_product_24"/>
         <field name="price_unit">3500.0</field>
     </record>
     <record id="purchase_order_line_12" model="purchase.order.line" >
@@ -19,22 +19,22 @@
     </record>
     <record id="purchase_order_line_2" model="purchase.order.line">
         <field name="order_id" ref="purchase_order_2"/>
-        <field name="product_id" model="product.template" eval="obj().search([('x_vehicle_no', 'ilike', 'Audi/A5/GJ657863')]).id"/>
+        <field name="product_id" ref="product_product_20"/>
         <field name="price_unit">35007.0</field>
     </record>
     <record id="purchase_order_line_3" model="purchase.order.line">
         <field name="order_id" ref="purchase_order_3"/>
-        <field name="product_id" model="product.template" eval="obj().search([('x_vehicle_no', 'ilike', 'Audi/A5/KGF62652')]).id"/>
+        <field name="product_id" ref="product_product_21"/>
         <field name="price_unit">28970.0</field>
     </record>
     <record id="purchase_order_line_4" model="purchase.order.line">
         <field name="order_id" ref="purchase_order_4"/>
-        <field name="product_id" model="product.template" eval="obj().search([('x_vehicle_no', 'ilike', 'Hyundai/Creta/GJ567655')]).id"/>
+        <field name="product_id" ref="product_product_26"/>
         <field name="price_unit">15678.0</field>
     </record>
     <record id="purchase_order_line_5" model="purchase.order.line">
         <field name="order_id" ref="purchase_order_5"/>
-        <field name="product_id" model="product.template" eval="obj().search([('x_vehicle_no', 'ilike', 'Mercedes/Class M/JK46556')]).id"/>
+        <field name="product_id" ref="product_product_22"/>
         <field name="price_unit">20757.0</field>
     </record>
     <record id="purchase_order_line_6" model="purchase.order.line" >
@@ -45,17 +45,17 @@
     </record>
     <record id="purchase_order_line_7" model="purchase.order.line">
         <field name="order_id" ref="purchase_order_7"/>
-        <field name="product_id" model="product.template" eval="obj().search([('x_vehicle_no', 'ilike', 'Toyota/Fortuner/GJU685657')]).id"/>
+        <field name="product_id" ref="product_product_25"/>
         <field name="price_unit">14678.0</field>
     </record>
     <record id="purchase_order_line_8" model="purchase.order.line">
         <field name="order_id" ref="purchase_order_8"/>
-        <field name="product_id" model="product.template" eval="obj().search([('x_vehicle_no', 'ilike', 'Audi/A5/HJU47634')]).id"/>
+        <field name="product_id" ref="product_product_17"/>
         <field name="price_unit">4500.0</field>
     </record>
     <record id="purchase_order_line_9" model="purchase.order.line">
         <field name="order_id" ref="purchase_order_9"/>
-        <field name="product_id" model="product.template" eval="obj().search([('x_vehicle_no', 'ilike', 'Opel/Agila/KL6464t6')]).id"/>
+        <field name="product_id" ref="product_product_18"/>
         <field name="price_unit">4500.0</field>
     </record>
     <record id="purchase_order_line_10" model="purchase.order.line">
diff --git a/car_rental/demo/sale_order_line.xml b/car_rental/demo/sale_order_line.xml
index be3b4cbd2..6d8cc3b8c 100644
--- a/car_rental/demo/sale_order_line.xml
+++ b/car_rental/demo/sale_order_line.xml
@@ -14,7 +14,7 @@
     </record>
     <record id="sale_order_line_5" model="sale.order.line" context="{'in_rental_app': True}">
         <field name="order_id" ref="sale_order_3"/>
-        <field name="product_id" model="product.template" eval="obj().search([('x_vehicle_no', 'ilike', 'Audi/A5/KGF62652')]).id"/>
+        <field name="product_id" ref="product_product_21"/>
     </record>
     <record id="sale_order_line_6" model="sale.order.line" context="{'in_rental_app': True}">
         <field name="order_id" ref="sale_order_3"/>
@@ -22,7 +22,7 @@
     </record>
     <record id="sale_order_line_7" model="sale.order.line" context="{'in_rental_app': True}">
         <field name="order_id" ref="sale_order_4"/>
-        <field name="product_id" model="product.template" eval="obj().search([('x_vehicle_no', 'ilike', 'Opel/Agila/KL6464t6')]).id"/>
+        <field name="product_id" ref="product_product_18"/>
     </record>
     <record id="sale_order_line_9" model="sale.order.line">
         <field name="order_id" ref="sale_order_6"/>
@@ -30,11 +30,11 @@
     </record>
     <record id="sale_order_line_10" model="sale.order.line" context="{'in_rental_app': True}">
         <field name="order_id" ref="sale_order_7"/>
-        <field name="product_id" model="product.template" eval="obj().search([('x_vehicle_no', 'ilike', 'Hyundai/i20/DG6864464')]).id"/>
+        <field name="product_id" ref="product_product_24"/>
     </record>
     <record id="sale_order_line_11" model="sale.order.line" context="{'in_rental_app': True}">
         <field name="order_id" ref="sale_order_5"/>
-        <field name="product_id" model="product.template" eval="obj().search([('x_vehicle_no', 'ilike', 'Toyota/Fortuner/GJU685657')]).id"/>
+        <field name="product_id" ref="product_product_25"/>
     </record>
     <record id="sale_order_line_12" model="sale.order.line">
         <field name="order_id" ref="sale_order_8"/>
diff --git a/car_rental/demo/website_theme_apply.xml b/car_rental/demo/website_theme_apply.xml
index 6db099dc2..f617cdadb 100644
--- a/car_rental/demo/website_theme_apply.xml
+++ b/car_rental/demo/website_theme_apply.xml
@@ -10,11 +10,6 @@
         <value model="ir.ui.view" eval="{'arch': obj().env.ref('car_rental.homepage').arch}"/>
     </function>
 
-    <function name="write" model="ir.ui.view">
-        <value model="ir.ui.view" eval="obj().env['website'].with_context(website_id=obj().env.ref('website.default_website').id).viewref('website.contactus').id"/>
-        <value model="ir.ui.view" eval="{'arch': obj().env.ref('car_rental.contactus').arch}"/>
-    </function>
-
     <function name="unlink" model="website.menu">
         <value model="website.menu" eval="obj().search([
             ('website_id', '=', ref('website.default_website')),
diff --git a/car_rental/demo/website_view.xml b/car_rental/demo/website_view.xml
index 3be907c92..d3777407b 100644
--- a/car_rental/demo/website_view.xml
+++ b/car_rental/demo/website_view.xml
@@ -176,305 +176,4 @@
             </t>
         </field>
     </record>
-    <record id="contactus" model="ir.ui.view">
-        <field name="name">Contact Us</field>
-        <field name="key">car_rental.contactus</field>
-        <field name="type">qweb</field>
-        <field name="website_id" ref="website.default_website"/>
-        <field name="arch" type="xml">
-            <t name="Contact Us" t-name="website.contactus">
-                <t t-call="website.layout">
-                    <t t-set="logged_partner"
-                        t-value="request.env['website.visitor']._get_visitor_from_request().partner_id"/>
-                    <t t-set="contactus_form_values"
-                        t-value="{'email_to': res_company.email, 'name': request.params.get('name', ''), 'phone': request.params.get('phone', ''), 'email_from': request.params.get('email_from', ''), 'company': request.params.get('company', ''), 'subject': request.params.get('subject', '')}"/>
-                    <span class="hidden" data-for="contactus_form"
-                        t-att-data-values="contactus_form_values"/>
-                    <div id="wrap" class="oe_structure oe_empty">
-                        <section
-                            class="s_title parallax s_parallax_is_fixed bg-black-50 pt24 pb24 o_colored_level"
-                            data-vcss="001" data-snippet="s_title" data-scroll-background-ratio="1"
-                            data-name="Title" style="background-image: none;">
-                            <span class="s_parallax_bg oe_img_bg"
-                                style="background-image: url('/web/image/website.s_banner_default_image'); background-position: 50% 0;"/>
-                            <div class="o_we_bg_filter bg-black-50"/>
-                            <div class="container">
-                                <h1>
-                                    Contact Us
-                                </h1>
-                            </div>
-                        </section>
-                        <section class="s_text_block pt40 pb40 o_colored_level"
-                            data-snippet="s_text_block" data-name="Text"
-                            style="background-image: none;">
-                            <div class="s_allow_columns container">
-                                <div class="row">
-                                    <div class="col-lg-8 mt-4 mt-lg-0 o_colored_level">
-                                        <p> Contact us about anything related to our company or
-                                            services. <br/> We'll do our best to get back to you as
-                                            soon as possible. </p>
-                                        <section class="s_website_form" data-vcss="001"
-                                            data-snippet="s_website_form" data-name="Form">
-                                            <div class="container">
-                                                <form id="contactus_form" action="/website/form/"
-                                                    method="post" enctype="multipart/form-data"
-                                                    class="o_mark_required" data-mark="*"
-                                                    data-model_name="crm.lead"
-                                                    data-success-mode="redirect"
-                                                    data-success-page="/contactus-thank-you"
-                                                    data-pre-fill="true">
-                                                    <div
-                                                        class="s_website_form_rows row s_col_no_bgcolor">
-                                                        <div
-                                                            class="s_website_form_field mb-3 col-12 s_website_form_required"
-                                                            data-type="char" data-name="Field">
-                                                            <div
-                                                                class="row s_col_no_resize s_col_no_bgcolor">
-                                                                <label
-                                                                    class="col-form-label col-sm-auto s_website_form_label"
-                                                                    style="width: 200px"
-                                                                    for="o4jrpyx7skv9">
-                                                                    <span
-                                                                        class="s_website_form_label_content">
-                                                                        Your
-                                                                        Name
-                                                                    </span>
-                                                                    <span
-                                                                        class="s_website_form_mark">
-                                                                        *
-                                                                    </span>
-                                                                </label>
-                                                                <div class="col-sm">
-                                                                    <input type="text"
-                                                                        class="form-control s_website_form_input"
-                                                                        name="contact_name"
-                                                                        required="1"
-                                                                        data-fill-with="name"
-                                                                        id="o4jrpyx7skv9"/>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div
-                                                            class="s_website_form_field mb-3 col-12"
-                                                            data-type="tel" data-name="Field">
-                                                            <div
-                                                                class="row s_col_no_resize s_col_no_bgcolor">
-                                                                <label
-                                                                    class="col-form-label col-sm-auto s_website_form_label"
-                                                                    style="width: 200px"
-                                                                    for="oliopwl9suva">
-                                                                    <span
-                                                                        class="s_website_form_label_content">
-                                                                        Phone
-                                                                        Number
-                                                                    </span>
-                                                                </label>
-                                                                <div class="col-sm">
-                                                                    <input type="tel"
-                                                                        class="form-control s_website_form_input"
-                                                                        name="phone"
-                                                                        data-fill-with="phone"
-                                                                        id="oliopwl9suva"/>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div
-                                                            class="s_website_form_field mb-3 col-12 s_website_form_required"
-                                                            data-type="email" data-name="Field">
-                                                            <div
-                                                                class="row s_col_no_resize s_col_no_bgcolor">
-                                                                <label
-                                                                    class="col-form-label col-sm-auto s_website_form_label "
-                                                                    style="width: 200px"
-                                                                    for="od9cbbp6zjsq">
-                                                                    <span
-                                                                        class="s_website_form_label_content">
-                                                                        Your
-                                                                        Email
-                                                                    </span>
-                                                                    <span
-                                                                        class="s_website_form_mark">
-                                                                        *
-                                                                    </span>
-                                                                </label>
-                                                                <div class="col-sm">
-                                                                    <input type="email"
-                                                                        class="form-control s_website_form_input"
-                                                                        name="email_from"
-                                                                        required="1"
-                                                                        data-fill-with="email"
-                                                                        id="od9cbbp6zjsq"/>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div data-visibility-condition=""
-                                                            data-visibility-between=""
-                                                            class="s_website_form_field mb-3 col-12 s_website_form_custom"
-                                                            data-type="char" data-name="Field">
-                                                            <div
-                                                                class="row s_col_no_resize s_col_no_bgcolor">
-                                                                <label
-                                                                    class="col-form-label col-sm-auto s_website_form_label"
-                                                                    style="width: 200px"
-                                                                    for="o28ga49ti47li">
-                                                                    <span
-                                                                        class="s_website_form_label_content">
-                                                                        Vehicle
-                                                                        Required
-                                                                    </span>
-                                                                </label>
-                                                                <div class="col-sm">
-                                                                    <input type="text"
-                                                                        class="form-control s_website_form_input"
-                                                                        name="Vehicle Required"
-                                                                        id="o28ga49ti47li"
-                                                                        data-fill-with="commercial_company_name"/>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div data-visibility-condition="" data-visibility-between="" class="s_website_form_field mb-3 col-12 s_website_form_custom"
-                                                            data-type="integer" data-name="Field">
-                                                            <div
-                                                                class="row s_col_no_resize s_col_no_bgcolor">
-                                                                <label
-                                                                    class="col-form-label col-sm-auto s_website_form_label"
-                                                                    style="width: 200px"
-                                                                    for="ocqozwlmqrgg">
-                                                                    <span
-                                                                        class="s_website_form_label_content">
-                                                                        No.
-                                                                        of days
-                                                                    </span>
-                                                                </label>
-                                                                <div class="col-sm">
-                                                                    <input type="number"
-                                                                        class="form-control s_website_form_input"
-                                                                        name="No. of days" step="1"
-                                                                        id="ocqozwlmqrgg"
-                                                                        data-fill-with="undefined"/>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div data-visibility-condition=""
-                                                            data-visibility-between=""
-                                                            class="s_website_form_field mb-3 col-12 s_website_form_custom"
-                                                            data-type="many2one" data-name="Field">
-                                                            <div
-                                                                class="row s_col_no_resize s_col_no_bgcolor">
-                                                                <label
-                                                                    class="col-form-label col-sm-auto s_website_form_label"
-                                                                    style="width: 200px"
-                                                                    for="opy82v15gred">
-                                                                    <span class="s_website_form_label_content"> Service </span>
-                                                                </label>
-                                                                <div class="col-sm">
-                                                                    <select class="form-select s_website_form_input"  name="Service" id="opy82v15gred">
-                                                                        <option
-                                                                            value="Airport pick up and drop"
-                                                                            selected="selected">
-                                                                            Airport
-                                                                            pick up and drop
-                                                                        </option>
-                                                                        <option value="Employee pick up and drop"> Employee pick up and drop </option>
-                                                                        <option  value="Monthly rental"> Monthly rental </option>
-                                                                    </select>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div data-visibility-condition=""
-                                                            data-visibility-between=""
-                                                            class="s_website_form_field mb-3 col-12 s_website_form_model_required"
-                                                            data-type="char" data-name="Field">
-                                                            <div  class="row s_col_no_resize s_col_no_bgcolor">
-                                                                <label
-                                                                    class="col-form-label col-sm-auto s_website_form_label"
-                                                                    style="width: 200px"
-                                                                    for="okxn3dd9166">
-                                                                    <span class="s_website_form_label_content">Subject</span>
-                                                                    <span
-                                                                        class="s_website_form_mark">
-                                                                        *
-                                                                    </span>
-                                                                </label>
-                                                                <div class="col-sm">
-                                                                    <input type="text"
-                                                                        class="form-control s_website_form_input"
-                                                                        name="name" required="true"
-                                                                        id="okxn3dd9166"
-                                                                        data-fill-with="undefined"/>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div data-visibility-condition=""
-                                                            data-visibility-between=""
-                                                            class="s_website_form_field mb-3 col-12 s_website_form_required"
-                                                            data-type="text" data-name="Field">
-                                                            <div class="row s_col_no_resize s_col_no_bgcolor">
-                                                                <label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="o1bjoa0di5kz">
-                                                                    <span class="s_website_form_label_content">Additional Information</span>
-                                                                    <span
-                                                                        class="s_website_form_mark">
-                                                                        *
-                                                                    </span>
-                                                                </label>
-                                                                <div class="col-sm">
-                                                                    <textarea
-                                                                        class="form-control s_website_form_input"
-                                                                        name="description"
-                                                                        required="1"
-                                                                        id="o1bjoa0di5kz" rows="3"/>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div
-                                                            class="mb-0 py-2 col-12 s_website_form_submit"
-                                                            data-name="Submit Button">
-                                                            <div style="width: 200px;"
-                                                                class="s_website_form_label"/>
-                                                            <a href="#" role="button"
-                                                                class="btn btn-primary btn-lg s_website_form_send"
-                                                                data-bs-original-title="">
-                                                                Submit
-                                                            </a>
-                                                            <span id="s_website_form_result"/>
-                                                        </div>
-                                                    </div>
-                                                </form>
-                                            </div>
-                                        </section>
-                                    </div>
-                                    <div class="col-lg-4 mt-4 mt-lg-0 o_colored_level">
-                                        <ul class="list-unstyled mb-0 ps-2">
-                                            <li>
-                                                Trip Rental
-                                            </li>
-                                            <li>
-                                                <i class="fa fa-map-marker fa-fw me-2"/>
-                                                <span class="o_force_ltr">
-                                                    3575&amp;nbsp;Buena Vista
-                                                    Avenue
-                                                </span>
-                                            </li>
-                                            <li>
-                                                <i class="fa fa-phone fa-fw me-2"/>
-                                                <span class="o_force_ltr">
-                                                    +1 (650) 555-0111
-                                                </span>
-                                            </li>
-                                            <li>
-                                                <i class="fa fa-1x fa-fw fa-envelope me-2"/>
-                                                <span>
-                                                    info@yourcompany.example.com
-                                                </span>
-                                            </li>
-                                        </ul>
-                                    </div>
-                                </div>
-                            </div>
-                        </section>
-                    </div>
-                </t>
-            </t>
-        </field>
-    </record>
 </odoo>
diff --git a/car_rental/static/src/binary/product_template/11-image_1920.png b/car_rental/static/src/binary/product_template/11-image_1920.png
new file mode 100644
index 000000000..43666e861
Binary files /dev/null and b/car_rental/static/src/binary/product_template/11-image_1920.png differ
diff --git a/car_rental/static/src/binary/product_template/12-image_1920.png b/car_rental/static/src/binary/product_template/12-image_1920.png
new file mode 100644
index 000000000..34a93c32f
Binary files /dev/null and b/car_rental/static/src/binary/product_template/12-image_1920.png differ
diff --git a/car_rental/static/src/binary/product_template/14-image_1920.png b/car_rental/static/src/binary/product_template/14-image_1920.png
new file mode 100644
index 000000000..cc87fffef
Binary files /dev/null and b/car_rental/static/src/binary/product_template/14-image_1920.png differ
diff --git a/car_rental/static/src/binary/product_template/4-image_1920 b/car_rental/static/src/binary/product_template/4-image_1920
new file mode 100644
index 000000000..94d722ce1
Binary files /dev/null and b/car_rental/static/src/binary/product_template/4-image_1920 differ
diff --git a/car_rental/static/src/binary/product_template/6-image_1920.png b/car_rental/static/src/binary/product_template/6-image_1920.png
new file mode 100644
index 000000000..a0be60c1d
Binary files /dev/null and b/car_rental/static/src/binary/product_template/6-image_1920.png differ
diff --git a/car_rental/static/src/binary/product_template/8-image_1920 b/car_rental/static/src/binary/product_template/8-image_1920
deleted file mode 100644
index 284a67654..000000000
Binary files a/car_rental/static/src/binary/product_template/8-image_1920 and /dev/null differ
diff --git a/car_rental/static/src/binary/product_template/8-image_1920.png b/car_rental/static/src/binary/product_template/8-image_1920.png
new file mode 100644
index 000000000..5b300fc37
Binary files /dev/null and b/car_rental/static/src/binary/product_template/8-image_1920.png differ