diff --git a/mobile_service_shop/models/mobile_brand.py b/mobile_service_shop/models/mobile_brand.py
index 085e5d829..00e30806e 100644
--- a/mobile_service_shop/models/mobile_brand.py
+++ b/mobile_service_shop/models/mobile_brand.py
@@ -26,7 +26,6 @@ class MobileBrand(models.Model):
     """This model represents the Mobile Brand"""
     _name = 'mobile.brand'
     _description = 'Mobile Brand'
-    _inherit = ['mail.thread', 'mail.activity.mixin']
     _rec_name = 'brand_name'
 
     brand_name = fields.Char(string="Mobile Brand", required=True,
diff --git a/mobile_service_shop/models/mobile_complaint.py b/mobile_service_shop/models/mobile_complaint.py
index f4c68521d..ebf9c6297 100644
--- a/mobile_service_shop/models/mobile_complaint.py
+++ b/mobile_service_shop/models/mobile_complaint.py
@@ -26,7 +26,6 @@ class MobileComplaint(models.Model):
     """This model represents for the mobile Complaint type managing"""
     _name = 'mobile.complaint'
     _description = 'Mobile Complaint'
-    _inherit = ['mail.thread', 'mail.activity.mixin']
     _rec_name = 'complaint_type'
 
     complaint_type = fields.Char(string="Complaint Type", required=True,
diff --git a/mobile_service_shop/models/mobile_complaint_description.py b/mobile_service_shop/models/mobile_complaint_description.py
index 6ec03d43a..d8b4a65c6 100644
--- a/mobile_service_shop/models/mobile_complaint_description.py
+++ b/mobile_service_shop/models/mobile_complaint_description.py
@@ -31,7 +31,7 @@ class MobileComplaintDescription(models.Model):
 
     complaint_type_template = fields.Many2one('mobile.complaint',
                                               string="Complaint Type",
-                                              required=True,
+                                              required=True, copy=False,
                                               help="Complaint type template.")
     description = fields.Text(string="Description",
                               help="Complaint description.")
diff --git a/mobile_service_shop/models/product_template.py b/mobile_service_shop/models/product_template.py
index 6a87716eb..a97166ac8 100644
--- a/mobile_service_shop/models/product_template.py
+++ b/mobile_service_shop/models/product_template.py
@@ -19,7 +19,7 @@
 #    If not, see <http://www.gnu.org/licenses/>.
 #
 #############################################################################
-from odoo import fields, models
+from odoo import api, fields, models
 
 
 class ProductTemplate(models.Model):
@@ -31,9 +31,19 @@ class ProductTemplate(models.Model):
         help="Specify if the product is a mobile part or not.")
     brand_name = fields.Many2one('mobile.brand', string="Brand",
                                  help="Select a mobile brand for the part.")
+    allowed_model_ids = fields.Many2many('brand.model', compute='_compute_allowed_model_ids')
     model_name = fields.Many2one('brand.model', string="Model Name",
-                                 domain="[('mobile_brand_name','=',brand_name)]",
                                  help="Select a model for the part.")
     model_colour = fields.Char(string="Colour", help="Colour for the part.")
     extra_descriptions = fields.Text(string="Note", help="Extra description "
                                                          "for the part.")
+
+    @api.depends('brand_name')
+    def _compute_allowed_model_ids(self):
+        for rec in self:
+            if rec.brand_name:
+                rec.allowed_model_ids = self.env['brand.model'].search([
+                    ('mobile_brand_name', '=', rec.brand_name.id)
+                ]).ids
+            else:
+                rec.allowed_model_ids = self.env['brand.model'].search([]).ids
diff --git a/mobile_service_shop/models/terms_condition.py b/mobile_service_shop/models/terms_condition.py
index b4450a3a3..c7569c9ea 100644
--- a/mobile_service_shop/models/terms_condition.py
+++ b/mobile_service_shop/models/terms_condition.py
@@ -26,7 +26,6 @@ class TermsConditions(models.Model):
     """Used to add the Mobile Service Terms and Conditions"""
     _name = 'terms.conditions'
     _description = 'Terms and Conditions'
-    _inherit = ['mail.thread', 'mail.activity.mixin']
     _rec_name = 'terms_id'
 
     terms_id = fields.Char(String="Terms and condition",
diff --git a/mobile_service_shop/static/description/index.html b/mobile_service_shop/static/description/index.html
index bb20584d3..c265633b5 100644
--- a/mobile_service_shop/static/description/index.html
+++ b/mobile_service_shop/static/description/index.html
@@ -132,7 +132,7 @@
               font-size: 46px;
               font-weight: 700;
               line-height: normal;
-            ">Mobile Service Management</span>
+            ">Mobile Service Management
                             </h1>
                         </div>
                         <div class="col-lg-12 d-flex justify-content-center align-items-center"
@@ -1313,6 +1313,7 @@
                             </a>
                         </div>
                     </div>
+                </section>
             </div>
             <!-- licence -->
             <div class="tab-pane fade" id="profile" role="tabpanel"
@@ -1323,7 +1324,6 @@
             </div>
             <!--  -->
         </div>
-        </section>
         <!--  -->
     </div>
 </div>
diff --git a/mobile_service_shop/views/mobile_brand_views.xml b/mobile_service_shop/views/mobile_brand_views.xml
index 9d1977754..10ece9f82 100644
--- a/mobile_service_shop/views/mobile_brand_views.xml
+++ b/mobile_service_shop/views/mobile_brand_views.xml
@@ -1,28 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <!--        Mobile.brand model form view-->
-    <record id="mobile_brand_view_form" model="ir.ui.view">
-        <field name="name">mobile.brand.view.form</field>
-        <field name="model">mobile.brand</field>
-        <field name="arch" type="xml">
-            <form string="Brand">
-                <sheet>
-                    <group>
-                        <group>
-                            <field name="brand_name"/>
-                        </group>
-                    </group>
-                </sheet>
-                <chatter/>
-            </form>
-        </field>
-    </record>
     <!--Mobile.brand model tree view-->
     <record id="mobile_brand_view_tree" model="ir.ui.view">
         <field name="name">mobile.brand.view.tree</field>
         <field name="model">mobile.brand</field>
         <field name="arch" type="xml">
-            <list>
+            <list editable="bottom">
                 <field name="brand_name"/>
             </list>
         </field>
@@ -31,7 +14,7 @@
     <record id="mobile_brand_action" model="ir.actions.act_window">
         <field name="name">Mobile Brand</field>
         <field name="res_model">mobile.brand</field>
-        <field name="view_mode">list,form</field>
+        <field name="view_mode">list</field>
         <field name="view_id" ref="mobile_brand_view_tree"/>
         <field name="help" type="html">
             <p class="oe_view_nocontent_create">
diff --git a/mobile_service_shop/views/mobile_complaint_views.xml b/mobile_service_shop/views/mobile_complaint_views.xml
index 95f485c1f..063ab9833 100644
--- a/mobile_service_shop/views/mobile_complaint_views.xml
+++ b/mobile_service_shop/views/mobile_complaint_views.xml
@@ -1,28 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <!--        Mobile complaint model form view-->
-    <record id="mobile_complaint_view_form" model="ir.ui.view">
-        <field name="name">mobile.complaint.view.form</field>
-        <field name="model">mobile.complaint</field>
-        <field name="arch" type="xml">
-            <form string="Complaint Type">
-                <sheet>
-                    <group>
-                        <group>
-                            <field name="complaint_type"/>
-                        </group>
-                    </group>
-                </sheet>
-                <chatter/>
-            </form>
-        </field>
-    </record>
     <!--        Mobile complaint model tree view-->
     <record id="mobile_complaint_view_tree" model="ir.ui.view">
         <field name="name">mobile.complaint.view.tree</field>
         <field name="model">mobile.complaint</field>
         <field name="arch" type="xml">
-            <list>
+            <list editable="bottom">
                 <field name="complaint_type"/>
             </list>
         </field>
@@ -31,7 +14,7 @@
     <record id="mobile_complaint_action" model="ir.actions.act_window">
         <field name="name">Complaint Types</field>
         <field name="res_model">mobile.complaint</field>
-        <field name="view_mode">list,form</field>
+        <field name="view_mode">list</field>
         <field name="view_id" ref="mobile_complaint_view_tree"/>
         <field name="help" type="html">
             <p class="oe_view_nocontent_create">
diff --git a/mobile_service_shop/views/mobile_service_views.xml b/mobile_service_shop/views/mobile_service_views.xml
index 60fa3f053..cb7a15587 100644
--- a/mobile_service_shop/views/mobile_service_views.xml
+++ b/mobile_service_shop/views/mobile_service_views.xml
@@ -264,7 +264,7 @@
     </record>
     <!--Mobile service model menus-->
     <menuitem id="mobile_service_shop_menu_root" web_icon="mobile_service_shop,static/description/icon.png"
-              name="Mobile Service" sequence="20"/>
+              name="Mobile Service" sequence="20" groups="mobile_service_shop.mobile_service_group_executer"/>
     <menuitem id="mobile_service_shop_menu" parent="mobile_service_shop_menu_root" sequence="20"/>
     <menuitem action="mobile_service_action_request" id="mobile_service_menu_request"
               parent="mobile_service_shop_menu_root"
diff --git a/mobile_service_shop/views/product_product_views.xml b/mobile_service_shop/views/product_product_views.xml
index 70709bdb6..1c94ca470 100644
--- a/mobile_service_shop/views/product_product_views.xml
+++ b/mobile_service_shop/views/product_product_views.xml
@@ -40,7 +40,7 @@
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">product.product</field>
         <field name="view_mode">kanban,list,form</field>
-        <field name="context">{"search_default_consumable":1, 'default_type': 'consu'}</field>
+        <field name="context">{"search_default_consumable":1, 'default_type': 'consu', 'default_is_a_parts': 1}</field>
         <field name="domain">[('is_a_parts', '=', True)]</field>
         <field name="help" type="html">
             <p class="oe_view_nocontent_create">
diff --git a/mobile_service_shop/views/product_template_views.xml b/mobile_service_shop/views/product_template_views.xml
index 14ce21dbb..732fa8885 100644
--- a/mobile_service_shop/views/product_template_views.xml
+++ b/mobile_service_shop/views/product_template_views.xml
@@ -15,7 +15,8 @@
                     <group>
                         <group>
                             <field name="brand_name" required="is_a_parts == True"/>
-                            <field name="model_name" required="is_a_parts == True"/>
+                            <field name="model_name" domain="[('id', 'in', allowed_model_ids)]" required="is_a_parts == True"/>
+                            <field name="allowed_model_ids" invisible="1"/>
                         </group>
                         <group>
                             <field name="model_colour"/>
diff --git a/mobile_service_shop/views/terms_and_condition_views.xml b/mobile_service_shop/views/terms_and_condition_views.xml
index 9b94f7219..7e345577a 100644
--- a/mobile_service_shop/views/terms_and_condition_views.xml
+++ b/mobile_service_shop/views/terms_and_condition_views.xml
@@ -1,26 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <!--Model terms and conditions form view-->
-    <record id="terms_conditions_view_form" model="ir.ui.view">
-        <field name="name">terms.conditions.view.form</field>
-        <field name="model">terms.conditions</field>
-        <field name="arch" type="xml">
-            <form string="Complaint Type">
-                <sheet>
-                    <group>
-                        <field name="terms_conditions"/>
-                    </group>
-                </sheet>
-                <chatter/>
-            </form>
-        </field>
-    </record>
     <!--Model terms and conditions tree view-->
     <record id="terms_conditions_view_tree" model="ir.ui.view">
         <field name="name">terms.conditions.view.tree</field>
         <field name="model">terms.conditions</field>
         <field name="arch" type="xml">
-            <list>
+            <list editable="bottom">
                 <field name="terms_conditions"/>
             </list>
         </field>
@@ -29,7 +14,7 @@
     <record id="terms_and_conditions_action" model="ir.actions.act_window">
         <field name="name">Terms and Conditions</field>
         <field name="res_model">terms.conditions</field>
-        <field name="view_mode">list,form</field>
+        <field name="view_mode">list</field>
         <field name="view_id" ref="terms_conditions_view_tree"/>
         <field name="help" type="html">
             <p class="oe_view_nocontent_create">