diff --git a/dental/__manifest__.py b/dental/__manifest__.py
index 8799610e79..aae01407ae 100644
--- a/dental/__manifest__.py
+++ b/dental/__manifest__.py
@@ -3,19 +3,22 @@
     'version': '17.0',
     'summary': 'Manage Dental Patients , Appointments and Medical Record',
     'author': 'Your Name',
-    'depends': ['base'],
+    'depends': ['base', 'mail', 'account'],
     'license': 'LGPL-3',
     'data': [
-        'security/ir.model.access.csv',
-        'views/dental_patient_views.xml',
+        'security/ir.model.access.csv',            
         'views/dental_medical_aids_view.xml',
+        'views/dental_patient_views.xml',
         'views/dental_medical_symptoms_view.xml',
         'views/dental_medication_views.xml',
         'views/dental_chronic_conditions_views.xml',
         'views/dental_allergies_view.xml',
         'views/dental_habits_view.xml',
-        'views/dental_configuration_views.xml',
-        'views/dental_patient_menus.xml',
+        'views/dental_configuration_views.xml',        
+        'views/dental_medical_history_view.xml',
+        'views/dental_patient_menus.xml'
+
+        
     ],
     'installable': True,
     'application': True,
diff --git a/dental/models/__init__.py b/dental/models/__init__.py
index f028651c2e..dc4013f18f 100644
--- a/dental/models/__init__.py
+++ b/dental/models/__init__.py
@@ -6,3 +6,4 @@
 from . import dental_allergies
 from . import dental_habits
 from . import dental_configuration
+from . import dental_medical_history
\ No newline at end of file
diff --git a/dental/models/dental_allergies.py b/dental/models/dental_allergies.py
index 64889c12a2..de83c95b7f 100644
--- a/dental/models/dental_allergies.py
+++ b/dental/models/dental_allergies.py
@@ -1,9 +1,10 @@
-from odoo import api, models, fields
+from odoo import models, fields
 
 
 class DentalAllergies(models.Model):
 
     _name = "dental.allergies"
     _description = "Dental Allergies"
+    _inherit = ['mail.thread', 'mail.activity.mixin']
 
     name = fields.Char(string='Name')
diff --git a/dental/models/dental_chronic_conditions.py b/dental/models/dental_chronic_conditions.py
index d542062dab..797ad1fb55 100644
--- a/dental/models/dental_chronic_conditions.py
+++ b/dental/models/dental_chronic_conditions.py
@@ -1,10 +1,11 @@
-from odoo import api, models, fields
+from odoo import models, fields
 
 
 class DentalChronicConditions(models.Model):
 
     _name = "dental.chronic.conditions"
     _description = "Dental Chronic Conditions"
+    _inherit = ['mail.thread', 'mail.activity.mixin']
 
     name = fields.Char(string='Name')
     sequence = fields.Integer('Sequence')
diff --git a/dental/models/dental_configuration.py b/dental/models/dental_configuration.py
index 5ec1bbf0a2..665ac28418 100644
--- a/dental/models/dental_configuration.py
+++ b/dental/models/dental_configuration.py
@@ -1,9 +1,10 @@
-from odoo import api, models, fields
+from odoo import models, fields
 
 
 class DentalConfiguration(models.Model):
 
     _name = "dental.configuration"
     _description = "Dental Configuration"
+    _inherit = ['mail.thread', 'mail.activity.mixin']
 
     name = fields.Char(string='Name')
diff --git a/dental/models/dental_habits.py b/dental/models/dental_habits.py
index ce44fcb94e..8807bc1766 100644
--- a/dental/models/dental_habits.py
+++ b/dental/models/dental_habits.py
@@ -1,9 +1,10 @@
-from odoo import api, models, fields
+from odoo import models, fields
 
 
 class DentalHabits(models.Model):
 
     _name = "dental.habits"
     _description = "Dental Habits"
+    _inherit = ['mail.thread', 'mail.activity.mixin']
 
     name = fields.Char(string='Name')
diff --git a/dental/models/dental_medical_aids.py b/dental/models/dental_medical_aids.py
index 018d4efff4..d278b8c47d 100644
--- a/dental/models/dental_medical_aids.py
+++ b/dental/models/dental_medical_aids.py
@@ -1,10 +1,11 @@
-from odoo import api, models, fields
+from odoo import models, fields
 
 
 class DentalMedicalAids(models.Model):
 
     _name = "dental.medical.aids"
     _description = "Medical Aids"
+    _inherit = ['mail.thread', 'mail.activity.mixin']
 
     name = fields.Char(string='Name')
     contact_id = fields.Many2one('res.partner', string='Contact')
diff --git a/dental/models/dental_medical_history.py b/dental/models/dental_medical_history.py
new file mode 100644
index 0000000000..0186cbca4d
--- /dev/null
+++ b/dental/models/dental_medical_history.py
@@ -0,0 +1,98 @@
+from odoo import models, fields, api
+from datetime import date
+
+
+class DentalMedicalHistory(models.Model):
+    _name = 'dental.medical.history'
+    _description = 'Dental Mdeical History'
+    _inherit = ['mail.thread', 'mail.activity.mixin']
+
+
+    name = fields.Char(string="Consultation Name", compute="_compute_name")
+    date = fields.Date(
+        string="Date", default=fields.Date.context_today, required=True)
+    patient_id = fields.Many2one(
+        'dental.patient', string="Patient", required=True)
+    main_complaint = fields.Text(string="Main Complaint")
+    history = fields.Text(string="History")
+    tags = fields.Char(string="Tags")
+    company_id = fields.Many2one('res.company', string='Company')
+    did_not_attend = fields.Boolean(required=True)
+
+    xray_file_1 = fields.Binary(string="X-ray File 1")
+    xray_file_2 = fields.Binary(string="X-ray File 2")
+    clear_aligner_file_1 = fields.Binary(string="Clear Aligner File 1")
+    clear_aligner_file_2 = fields.Binary(string="Clear Aligner File 2")
+
+
+    habits = fields.Text(string="Habits")
+    extra_oral_observation = fields.Text(string="Extra-Oral Observation")
+
+    teeth_chart = fields.Char(string="Teeth Chart")
+
+
+    treatment_notes = fields.Text(string="Treatment Notes")
+
+    consultation_type = fields.Selection([
+        ('full_consultation', 'Full Consultation with Bitewings and Scan'),
+        ('basic_consultation', 'Basic Consultation'),
+        ('no_consultation', 'No Consultation')
+    ], string="Consultation Type")
+
+    call_out = fields.Boolean(string="Call Out")
+    scale_and_polish = fields.Boolean(string="Scale and Polish")
+    fluoride = fields.Boolean(string="Fluoride")
+
+    filling_description = fields.Text(string="Filling Description")
+
+    aligner_delivery = fields.Boolean(
+        string="Aligner Delivery and Attachment Placed")
+    whitening = fields.Boolean(string="Whitening")
+
+    fissure_sealant_qty = fields.Float(
+        string="Fissure Sealant Quantity", digits=(6, 2))
+
+    attachments_removed = fields.Boolean(string="Attachments Removed")
+    aligner_followup_scan = fields.Boolean(string="Aligner Follow-up Scan")
+
+    other_notes = fields.Text(string="Other Notes")
+
+    notes = fields.Text(string="Additional Notes")
+
+    @api.depends("patient_id")
+    def _compute_name(self):
+        for record in self:
+            record.name = f"{record.patient_id.name}-{date.today()}"
+
+    tooth_18_staining = fields.Boolean(string="18 Staining")
+    tooth_17_staining = fields.Boolean(string="17 Staining")
+    tooth_16_staining = fields.Boolean(string="16 Staining")
+    tooth_15_staining = fields.Boolean(string="15 Staining")
+    tooth_14_staining = fields.Boolean(string="14 Staining")
+    tooth_13_staining = fields.Boolean(string="13 Staining")
+    tooth_12_staining = fields.Boolean(string="12 Staining")
+    tooth_11_staining = fields.Boolean(string="11 Staining")
+    tooth_28_staining = fields.Boolean(string="28 Staining")
+    tooth_27_staining = fields.Boolean(string="27 Staining")
+    tooth_26_staining = fields.Boolean(string="26 Staining")
+    tooth_25_staining = fields.Boolean(string="25 Staining")
+    tooth_24_staining = fields.Boolean(string="24 Staining")
+    tooth_23_staining = fields.Boolean(string="23 Staining")
+    tooth_22_staining = fields.Boolean(string="22 Staining")
+    tooth_21_staining = fields.Boolean(string="21 Staining")
+    tooth_38_staining = fields.Boolean(string="38 Staining")
+    tooth_37_staining = fields.Boolean(string="37 Staining")
+    tooth_36_staining = fields.Boolean(string="36 Staining")
+    tooth_35_staining = fields.Boolean(string="35 Staining")
+    tooth_34_staining = fields.Boolean(string="34 Staining")
+    tooth_33_staining = fields.Boolean(string="33 Staining")
+    tooth_32_staining = fields.Boolean(string="32 Staining")
+    tooth_31_staining = fields.Boolean(string="31 Staining")
+    tooth_41_staining = fields.Boolean(string="41 Staining")
+    tooth_42_staining = fields.Boolean(string="42 Staining")
+    tooth_43_staining = fields.Boolean(string="43 Staining")
+    tooth_44_staining = fields.Boolean(string="44 Staining")
+    tooth_45_staining = fields.Boolean(string="45 Staining")
+    tooth_46_staining = fields.Boolean(string="46 Staining")
+    tooth_47_staining = fields.Boolean(string="47 Staining")
+    tooth_48_staining = fields.Boolean(string="48 Staining")
\ No newline at end of file
diff --git a/dental/models/dental_medical_symptoms.py b/dental/models/dental_medical_symptoms.py
index 5ba4c6da90..e1c9a7bd70 100644
--- a/dental/models/dental_medical_symptoms.py
+++ b/dental/models/dental_medical_symptoms.py
@@ -1,9 +1,10 @@
-from odoo import api, models, fields
+from odoo import models, fields
 
 
 class DentalMedicalSymptoms(models.Model):
 
     _name = "dental.medical.symptoms"
     _description = "Dental Medical Symptoms"
+    _inherit = ['mail.thread', 'mail.activity.mixin']
 
     name = fields.Char(string='Name')
diff --git a/dental/models/dental_medication.py b/dental/models/dental_medication.py
index ba2992d05d..d447738b60 100644
--- a/dental/models/dental_medication.py
+++ b/dental/models/dental_medication.py
@@ -1,10 +1,11 @@
-from odoo import api, models, fields
+from odoo import models, fields
 
 
 class DentalMedication(models.Model):
 
     _name = "dental.medication"
     _description = "Dental Medication"
+    _inherit = ['mail.thread', 'mail.activity.mixin']
 
     name = fields.Char(string='Name')
     sequence = fields.Integer('Sequence')
diff --git a/dental/models/dental_patient.py b/dental/models/dental_patient.py
index 5ad5dd8d81..cb7d69b196 100644
--- a/dental/models/dental_patient.py
+++ b/dental/models/dental_patient.py
@@ -1,24 +1,27 @@
-from odoo import api, models, fields
+from odoo import models, fields , Command
 
 
 class DentalPatient(models.Model):
 
     _name = "dental.patient"
     _description = "Dental Patient"
+    _inherit = ['mail.thread', 'mail.activity.mixin']
 
-    name = fields.Char(string="Name")
+    name = fields.Char(string="Name", required=True)
+    image = fields.Image('Image')
     gp_id = fields.Many2one('res.partner', string="GP's Name")
     gp_phone = fields.Char(related='gp_id.phone',
                            string="GP's Phone", readonly=True)
-    chronic_conditions = fields.Many2many(
-        'dental.chronic.condition', string="Chronic Conditions")
-    medication = fields.Many2many('dental.medication', string="Medication")
-    hospitalized_this_year = fields.Boolean(string="Hospitalised this Year")
-    allergies = fields.Char(string="Allergies")
+    chronic_conditions_ids = fields.Many2many(
+        'dental.chronic.conditions', string="Chronic Conditions")
+    medication_ids = fields.Many2many('dental.medication', string="Medication")
+    hospitalized_this_year = fields.Text(string="Hospitalised this Year")
+    allergies_ids = fields.Many2many('dental.allergies', string="Allergies")
     notes = fields.Text(string='Notes')
-    habits_substance_abuse = fields.Char(string="Habits/Substance Abuse")
+    habits_substance_abuse_ids = fields.Many2many('dental.habits', string="Habits/Substance Abuse")
     under_specialist_care = fields.Char(string="Under Specialist Care")
     psychiatric_history = fields.Char(string="Psychiatric History")
+
     female = fields.Boolean(string="Female")
     is_pregnant = fields.Boolean(string="Are you pregnant?", default=False)
     is_nursing = fields.Boolean(string="Are you nursing?", default=False)
@@ -27,8 +30,65 @@ class DentalPatient(models.Model):
         ('birth_control', 'Birth control'),
         ('neither', 'Neither')
     ], string="Are you on...?", default='neither')
-    medical_aid = fields.Many2one('dental.medical.aids', string="Medical Aid")
+
+    medical_aid_id = fields.Many2one(
+        'dental.medical.aids', string="Medical Aid")
     medical_aid_plan = fields.Char(string='Medical Aid Plan')
     medical_aid_number = fields.Integer(string='Medical Aid Number')
     main_member_code = fields.Integer(string='Medical Member Code')
     dependent_code = fields.Integer(string='Dependent Code')
+
+    emergency_contact_id = fields.Many2one(
+        'res.partner', string="Emergency Contact")
+    mobile = fields.Char(related='emergency_contact_id.phone', string='Mobile')
+
+    company_school_id = fields.Many2one('res.partner', string="Company or School")
+    occupation_grade = fields.Char(string="Occupation or Grade")
+    identity_number = fields.Char(string="Identity Number")
+    date_of_birth = fields.Date(string="Date of Birth")
+    gender = fields.Selection([
+        ('female', 'Female'),
+        ('male', 'Male'),
+        ('neither', 'Neither')
+    ], string="Gender")
+    marital_status = fields.Selection([
+        ('single', 'Single'),
+        ('married', 'Married'),
+        ('divorced', 'Divorced'),
+        ('widowed', 'Widowed')
+    ], string="Marital Status")
+
+    consent_signature = fields.Binary(string="Consent Signature")
+    consent_date = fields.Date(string="Consent Date")
+
+
+    guarantor_id = fields.Many2one(
+        'res.partner', string="Guarantor")
+    guarantor_mobile = fields.Char(
+        related='guarantor_id.mobile', string="Guarantor Mobile Phone", readonly=True)
+    guarantor_phone = fields.Char(related='guarantor_id.phone', string="Phone")
+    guarantor_email = fields.Char(related='guarantor_id.email', string="Email")
+
+    tags = fields.Char(string="Tags")
+    company_id = fields.Many2one(
+        'res.company', string="Company", default=lambda self: self.env.company)
+
+
+    history_ids = fields.One2many('dental.medical.history', 'patient_id')
+    state = fields.Selection(string='Status', default='new',
+                             selection=[('new', 'New'), ('to do today', 'To Do Today'), ('done', 'Done'), ('to invoice', 'To Invoice')])
+    
+    def book_an_appointment(self):
+        move_values = {
+            "partner_id": self.guarantor_id.id,
+            "move_type": "out_invoice",
+            'invoice_date': fields.Date.today(),
+            "invoice_line_ids": [
+                Command.create({
+                    "name": "consultant fee",
+                    "quantity": 1,
+                    "price_unit": 500
+                })
+            ],
+        }
+        self.env['account.move'].sudo().create(move_values)
diff --git a/dental/security/ir.model.access.csv b/dental/security/ir.model.access.csv
index d34a07464e..77a63bac11 100644
--- a/dental/security/ir.model.access.csv
+++ b/dental/security/ir.model.access.csv
@@ -7,6 +7,7 @@ access_dental_configuration,access_dental_configuration,model_dental_configurati
 access_dental_chronic_conditions,access_dental_chronic_conditions,model_dental_chronic_conditions,base.group_user,1,1,1,1
 access_dental_allergies,access_dental_allergies,model_dental_allergies,base.group_user,1,1,1,1
 access_dental_habits,access_dental_habits,model_dental_habits,base.group_user,1,1,1,1
+dental.access_dental_medical_history,access_dental_medical_history,dental.model_dental_medical_history,base.group_user,1,1,1,1
 
 
 
diff --git a/dental/static/tooth.png b/dental/static/tooth.png
new file mode 100644
index 0000000000..5d6ab6fb3a
Binary files /dev/null and b/dental/static/tooth.png differ
diff --git a/dental/views/dental_allergies_view.xml b/dental/views/dental_allergies_view.xml
index 5d25032f8e..fffa6825eb 100644
--- a/dental/views/dental_allergies_view.xml
+++ b/dental/views/dental_allergies_view.xml
@@ -27,6 +27,11 @@
                         </group>
                     </group>
                 </sheet>
+                <div class="oe_chatter">
+                    <field name="message_follower_ids"/>
+                    <field name="message_ids"/>
+                    <field name="activity_ids"/>
+                </div>
             </form>
         </field>
     </record>
diff --git a/dental/views/dental_chronic_conditions_views.xml b/dental/views/dental_chronic_conditions_views.xml
index 0cba8e1d8e..5c21a668ee 100644
--- a/dental/views/dental_chronic_conditions_views.xml
+++ b/dental/views/dental_chronic_conditions_views.xml
@@ -32,6 +32,11 @@
                         <field name="parent_id" />
                     </div>
                 </sheet>
+                <div class="oe_chatter">
+                    <field name="message_follower_ids"/>
+                    <field name="message_ids"/>
+                    <field name="activity_ids"/>
+                </div>
             </form>
         </field>
     </record>
diff --git a/dental/views/dental_configuration_views.xml b/dental/views/dental_configuration_views.xml
index ba1268d3d4..f30f953302 100644
--- a/dental/views/dental_configuration_views.xml
+++ b/dental/views/dental_configuration_views.xml
@@ -27,6 +27,11 @@
                         </group>
                     </group>
                 </sheet>
+                <div class="oe_chatter">
+                    <field name="message_follower_ids"/>
+                    <field name="message_ids"/>
+                    <field name="activity_ids"/>
+                </div>
             </form>
         </field>
     </record>
diff --git a/dental/views/dental_habits_view.xml b/dental/views/dental_habits_view.xml
index 4611eecda8..c394fb85d9 100644
--- a/dental/views/dental_habits_view.xml
+++ b/dental/views/dental_habits_view.xml
@@ -28,6 +28,11 @@
                         </group>
                     </group>
                 </sheet>
+                <div class="oe_chatter">
+                    <field name="message_follower_ids"/>
+                    <field name="message_ids"/>
+                    <field name="activity_ids"/>
+                </div>
             </form>
         </field>
     </record>
diff --git a/dental/views/dental_medical_aids_view.xml b/dental/views/dental_medical_aids_view.xml
index 5360d26492..e8dcd78922 100644
--- a/dental/views/dental_medical_aids_view.xml
+++ b/dental/views/dental_medical_aids_view.xml
@@ -45,6 +45,11 @@
                         <field name="notes" placeholder="Type down your notes here" />
                     </div>
                 </sheet>
+                <div class="oe_chatter">
+                    <field name="message_follower_ids"/>
+                    <field name="message_ids"/>
+                    <field name="activity_ids"/>
+                </div>
             </form>
         </field>
     </record>
diff --git a/dental/views/dental_medical_history_view.xml b/dental/views/dental_medical_history_view.xml
new file mode 100644
index 0000000000..4e3276f797
--- /dev/null
+++ b/dental/views/dental_medical_history_view.xml
@@ -0,0 +1,138 @@
+<odoo>
+    <record id="view_dental_history_form" model="ir.ui.view">
+        <field name="name">Dental Consultation Form</field>
+        <field name="model">dental.medical.history</field>
+        <field name="arch" type="xml">
+            <form string="Dental Consultation">                
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="name" />
+                            <field name="patient_id" required="1" />
+                            <field name="date" default="context_today()" />
+                            <field name="did_not_attend" widget="checkbox" />
+                        </group>
+                        <group>
+                            <field name="tags"/>
+                            <field name="company_id" />
+                        </group>
+                        <group string="TEETH HISTORY">
+                            <field name="main_complaint" />
+                            <field name="xray_file_1" widget="image" />
+                            <field name="habits" />
+                            <field name="clear_aligner_file_1" />
+                        </group>
+                        <group string="TEETH HISTORY">
+                            <field name="history" />
+                            <field name="xray_file_2" widget="image" />
+                            <field name="extra_oral_observation" />
+                            <field name="clear_aligner_file_2" />
+                        </group>
+                        <group string="TOOTH CHART">
+                            <group string="UPPER">
+                                <div>
+                                    <h6 style="height:28px;">18</h6>
+                                    <h6 style="height:28px;">17</h6>
+                                    <h6 style="height:28px;">16</h6>
+                                    <h6 style="height:28px;">15</h6>
+                                    <h6 style="height:28px;">14</h6>
+                                    <h6 style="height:28px;">13</h6>
+                                    <h6 style="height:28px;">12</h6>
+                                    <h6 style="height:28px;">11</h6>
+                                    <h6 style="height:28px;">28</h6>
+                                    <h6 style="height:28px;">27</h6>
+                                    <h6 style="height:28px;">26</h6>
+                                    <h6 style="height:28px;">25</h6>
+                                    <h6 style="height:28px;">24</h6>
+                                    <h6 style="height:28px;">23</h6>
+                                    <h6 style="height:28px;">22</h6>
+                                    <h6 style="height:28px;">21</h6>
+                                </div>
+                            </group>
+                            <group string="UPPER">
+                                <field name="tooth_18_staining"/>
+                                <field name="tooth_17_staining"/>
+                                <field name="tooth_16_staining"/>
+                                <field name="tooth_15_staining"/>
+                                <field name="tooth_14_staining"/>
+                                <field name="tooth_13_staining"/>
+                                <field name="tooth_12_staining"/>
+                                <field name="tooth_11_staining"/>
+                                <field name="tooth_28_staining"/>
+                                <field name="tooth_27_staining"/>
+                                <field name="tooth_26_staining"/>
+                                <field name="tooth_25_staining"/>
+                                <field name="tooth_24_staining"/>
+                                <field name="tooth_23_staining"/>
+                                <field name="tooth_22_staining"/>
+                                <field name="tooth_21_staining"/>
+                            </group>
+                            <group string="LOWER">
+                                <div style="">
+                                    <h6 style="height:28px;">38</h6>
+                                    <h6 style="height:28px;">37</h6>
+                                    <h6 style="height:28px;">36</h6>
+                                    <h6 style="height:28px;">35</h6>
+                                    <h6 style="height:28px;">34</h6>
+                                    <h6 style="height:28px;">33</h6>
+                                    <h6 style="height:28px;">32</h6>
+                                    <h6 style="height:28px;">31</h6>
+                                    <h6 style="height:28px;">41</h6>
+                                    <h6 style="height:28px;">42</h6>
+                                    <h6 style="height:28px;">43</h6>
+                                    <h6 style="height:28px;">44</h6>
+                                    <h6 style="height:28px;">45</h6>
+                                    <h6 style="height:28px;">46</h6>
+                                    <h6 style="height:28px;">47</h6>
+                                    <h6 style="height:28px;">48</h6>
+                                </div>
+                            </group>
+                            <group string="LOWER">
+                                <field name="tooth_38_staining"/>
+                                <field name="tooth_37_staining"/>
+                                <field name="tooth_36_staining"/>
+                                <field name="tooth_35_staining"/>
+                                <field name="tooth_34_staining"/>
+                                <field name="tooth_33_staining"/>
+                                <field name="tooth_32_staining"/>
+                                <field name="tooth_31_staining"/>
+                                <field name="tooth_41_staining"/>
+                                <field name="tooth_42_staining"/>
+                                <field name="tooth_43_staining"/>
+                                <field name="tooth_44_staining"/>
+                                <field name="tooth_45_staining"/>
+                                <field name="tooth_46_staining"/>
+                                <field name="tooth_47_staining"/>
+                                <field name="tooth_48_staining"/>
+                            </group>
+                        </group>
+                    </group>
+                    <group string="TREATMENT NOTES">
+                        <field name="treatment_notes" widget="text" />
+                    </group>
+                    <group string="BILLING">
+                        <field name="consultation_type" widget="selection" />
+                        <field name="call_out" widget="boolean" />
+                        <field name="scale_and_polish" widget="boolean" />
+                        <field name="fluoride" widget="boolean" />
+                        <field name="filling_description" widget="text" />
+                        <field name="aligner_delivery" widget="boolean" />
+                        <field name="whitening" widget="boolean" />
+                        <field name="fissure_sealant_qty" widget="float" />
+                        <field name="attachments_removed" widget="boolean" />
+                        <field name="aligner_followup_scan" widget="boolean" />
+                        <field name="other_notes" widget="text" />
+                    </group>
+                    <div>
+                        <field name="notes" placeholder="Type down your notes here"/>
+                    </div>
+                </sheet>
+                <div class="oe_chatter">
+                    <field name="message_follower_ids"/>
+                    <field name="message_ids"/>
+                    <field name="activity_ids"/>
+                </div>
+            </form>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/dental/views/dental_medical_symptoms_view.xml b/dental/views/dental_medical_symptoms_view.xml
index c34d2fc7a7..3b1fcf8847 100644
--- a/dental/views/dental_medical_symptoms_view.xml
+++ b/dental/views/dental_medical_symptoms_view.xml
@@ -28,6 +28,11 @@
                         </group>
                     </group>
                 </sheet>
+                <div class="oe_chatter">
+                    <field name="message_follower_ids"/>
+                    <field name="message_ids"/>
+                    <field name="activity_ids"/>
+                </div>
             </form>
         </field>
     </record>
diff --git a/dental/views/dental_medication_views.xml b/dental/views/dental_medication_views.xml
index 3df5d0dc42..cec9cbaff1 100644
--- a/dental/views/dental_medication_views.xml
+++ b/dental/views/dental_medication_views.xml
@@ -29,6 +29,11 @@
                         </group>
                     </group>
                 </sheet>
+                <div class="oe_chatter">
+                    <field name="message_follower_ids"/>
+                    <field name="message_ids"/>
+                    <field name="activity_ids"/>
+                </div>
             </form>
         </field>
     </record>
diff --git a/dental/views/dental_patient_menus.xml b/dental/views/dental_patient_menus.xml
index 780c5ed9b2..e1c8df72da 100644
--- a/dental/views/dental_patient_menus.xml
+++ b/dental/views/dental_patient_menus.xml
@@ -4,7 +4,7 @@
         <menuitem id="dental_patient_menu" name="Patients" action="dental_patient_action" />
         <menuitem id="dental_medical_acid_menu" name="Medical Acids"
             action="dental_medical_aids_action" />
-        <menuitem id="dental_medication_menu" name="Medication" action="dental_medication_action" />
+        <menuitem id="dental_medication_menu" name="Medication" action="dental_medication_action" />       
 
         <menuitem id="dental_medical_symptoms_menu" name="Medical Symptoms">
             <menuitem id="dental_chronics_conditions_menus" name="Chronic Conditions"
diff --git a/dental/views/dental_patient_views.xml b/dental/views/dental_patient_views.xml
index 5f1f957964..c0d701248b 100644
--- a/dental/views/dental_patient_views.xml
+++ b/dental/views/dental_patient_views.xml
@@ -1,5 +1,4 @@
 <odoo>
-    <!-- Action  -->
     <record id="dental_patient_action" model="ir.actions.act_window">
         <field name="name">Patient</field>
         <field name="res_model">dental.patient</field>
@@ -17,6 +16,11 @@
         <field name="arch" type="xml">
             <tree string="Channel">
                 <field name="name" />
+                <field name="identity_number" />
+                <field name="medical_aid_id" />
+                <field name="date_of_birth" />
+                <field name="gender" />
+                <field name="marital_status" />
             </tree>
         </field>
     </record>
@@ -26,25 +30,46 @@
         <field name="model">dental.patient</field>
         <field name="arch" type="xml">
             <form string="Dental Patient">
+                <header>
+                    <button name="book_an_appointment" type="object" string="Book Appointment" class="btn btn-primary"/>
+                    <field name="state" widget="statusbar"
+                        statusbar_visible="new,to do today,done,to invoice" />
+                </header>
                 <sheet>
+                    <field name='image' class='oe_avatar' widget='image' />
+                    <div>
+                        <h1 class="oe_title">
+                            <field name="name" />
+                        </h1>
+                    </div>
+                    
+                    <field name="history_ids">
+                    <tree>
+                        <field name='date' />
+                        <field name='patient_id' />
+                        <field name='tags' />
+                        <field name='filling_description' />
+                    </tree>
+                   </field>                    
                     <notebook>
-                        <page string="Medical History">
+                        <page string="Medical">
                             <group>
                                 <group>
                                     <field name="gp_id" />
                                     <field name="gp_phone" readonly="1" />
-                                    <field name="chronic_conditions" widget="many2many_tags" />
+                                    <field name="chronic_conditions_ids" widget="many2many_tags" />
                                     <field name="hospitalized_this_year" />
-                                    <field name="medication" widget="many2many_tags" />
+                                    <field name="medication_ids" widget="many2many_tags" />
+                                    <field name="state" />
                                 </group>
                                 <group>
-                                    <field name="allergies" />
-                                    <field name="habits_substance_abuse" />
+                                    <field name="allergies_ids" widget="many2many_tags" />
+                                    <field name="habits_substance_abuse_ids" widget="many2many_tags" />
                                     <field name="under_specialist_care" />
                                     <field name="psychiatric_history" />
                                 </group>
                             </group>
-                            <group string="Female Specific Information">
+                            <group string="Female">
                                 <group>
                                     <field name="is_pregnant" />
                                     <field name="is_nursing" />
@@ -58,7 +83,7 @@
                         <page string="Medical Aid">
                             <group>
                                 <group>
-                                    <field name="medical_aid" />
+                                    <field name="medical_aid_id" />
                                     <field name="medical_aid_plan" />
                                     <field name="medical_aid_number" />
                                 </group>
@@ -68,19 +93,91 @@
                                 </group>
                             </group>
                         </page>
+                        <page string="History">
+                            <group>
+                                <field name="history_ids">
+                                    <tree>
+                                        <field name='date' />
+                                        <field name='patient_id' />
+                                        <field name='tags' />
+                                        <field name='filling_description' />
+                                    </tree>
+                                </field>
+                            </group>
+                        </page>
+                        <page string="Patient Details">
+                            <group>
+                                <group string="Next of Kin">
+                                    <field name="emergency_contact_id" />
+                                    <field name="mobile" widget='phone'/>
+                                </group>
+
+                                <group string="Patient Details">
+                                    <field name="company_school_id" />
+                                    <field name="occupation_grade" />
+                                    <field name="identity_number" />
+                                    <field name="date_of_birth" />
+                                    <field name="gender" />
+                                    <field name="marital_status" />
+                                </group>
+                            </group>
+
+                            <group string="Consent Form">
+                                <field name="consent_signature" widget="signature" />
+                                <field name="consent_date" />
+                            </group>
+                            <div>
+                                <field name="notes" placeholder="Type down your notes here" />
+                            </div>
+                        </page>
+                        <page string="Gurantor Details">
+                            <group>
+                                <group string="Guarantor">
+                                    <field name="guarantor_id" />
+                                    <field name="guarantor_mobile" />
+                                    <field name="guarantor_phone" />
+                                    <field name="guarantor_email" />
+                                </group>
+                                <group string="Office Use">
+                                    <field name="tags" />
+                                    <field name="company_id" readonly="1" />
+                                </group>
+                            </group>
+                            <div>
+                                <field name="notes" placeholder="Type down your notes here" />
+                            </div>
+                        </page>
                     </notebook>
                 </sheet>
+                <div class="oe_chatter">
+                    <field name="message_follower_ids"/>
+                    <field name="message_ids"/>
+                    <field name="activity_ids"/>
+                </div>
             </form>
         </field>
     </record>
 
-    <record id="dental_patient_kanban" model="ir.ui.view">
+    <record id="dental_patient_kanban_view" model="ir.ui.view">
         <field name="name">dental.patient.kanban</field>
         <field name="model">dental.patient</field>
         <field name="arch" type="xml">
-            <kanban>
+            <kanban default_group_by="state">
+                <field name="state" />
                 <templates>
                     <t t-name="kanban-box">
+                        <div class="oe_kanban_global_click">
+                            <div class="oe_kanban_details">
+                                <strong class="o_kanban_record_title">
+                                    <field name="name" />
+                                </strong>
+                                <div class="o_kanban_image">
+                                    <img
+                                        t-attf-src="#{kanban_image('dental.patient', 'image', record.id.raw_value)}"
+                                        role="img" t-att-alt="record.id.value" />
+                                </div>
+                            </div>
+                        </div>
                     </t>
                 </templates>
             </kanban>