diff --git a/odex25_ensan/odex_takaful/models/takaful_sponorship_model.py b/odex25_ensan/odex_takaful/models/takaful_sponorship_model.py
index 713f5a920..a73d2a5e2 100644
--- a/odex25_ensan/odex_takaful/models/takaful_sponorship_model.py
+++ b/odex25_ensan/odex_takaful/models/takaful_sponorship_model.py
@@ -69,7 +69,7 @@ class TakafulSponsorship(models.Model):
     sponsor_note = fields.Text(string='Sponsor Note')
     sponsor_or_donor_type = fields.Selection(string='Sponsor / Donor Type',selection=[('registered', 'Registered'),  ('new_sponsor', 'New Sponsor'), ('unknown', 'Unknown')], required=True, default='registered')
     # ('not_registered', 'Not Registered'),
-    sponsor_donor_type = fields.Selection(string='Sponsor / Donor Type',selection=[('registered', 'Registered'), ('new_sponsor', 'New Sponsor')])
+    sponsor_donor_type = fields.Selection(string='Sponsor / Donor Type',selection=[('registered', 'Registered'), ('new_sponsor', 'New Sponsor')], default='registered')
     sponsor_name = fields.Char(string="Sponsor Name")
     sponsor_phone = fields.Char(string="Sponsor Phone", compute='_compute_sponsor_phone', store=True, readonly=False)
     sponsor_title = fields.Many2one('res.partner.title',string='Sponsor Title')
diff --git a/odex25_ensan/odex_takaful/views/assets.xml b/odex25_ensan/odex_takaful/views/assets.xml
index 26afaa7ae..9937e7660 100644
--- a/odex25_ensan/odex_takaful/views/assets.xml
+++ b/odex25_ensan/odex_takaful/views/assets.xml
@@ -127,6 +127,12 @@
                         font-size: 16px;
                     }
                     
+                    .mechanism_option span {
+                        min-width: 90px;
+                        display: inline-block;
+                        text-align: center;
+                    }
+                    
                     .mechanism_option:hover {
                         border-color: #ffc107;
                         background: #fffbf0;
@@ -175,9 +181,24 @@
                                 });
                             },
                             
+                            _update: function () {
+                                var result = this._super.apply(this, arguments);
+                                if (this.mode === 'edit' && this.modelName === 'takaful.sponsorship') {
+                                    var self = this;
+                                    setTimeout(function() {
+                                        self._setupSimpleUI();
+                                    }, 50);
+                                }
+                                return result;
+                            },
+                            
                             _setupSimpleUI: function () {
                                 var self = this;
                                 
+                                // Remove old event handlers to prevent duplicates
+                                this.$('.record_option').off('click');
+                                this.$('.mechanism_option').off('click');
+                                
                                 // Record Type Options - Odoo 14 Compatible Method
                                 this.$('.record_option').on('click', function () {
                                     var $option = $(this);
diff --git a/odex25_ensan/odex_takaful/views/takaful_sponorship_view.xml b/odex25_ensan/odex_takaful/views/takaful_sponorship_view.xml
index 6177cf884..82a51a2b4 100644
--- a/odex25_ensan/odex_takaful/views/takaful_sponorship_view.xml
+++ b/odex25_ensan/odex_takaful/views/takaful_sponorship_view.xml
@@ -148,41 +148,62 @@
                             <label string="Sponsor / Donor Type" for="sponsor_or_donor_type"/>
                             <div class="o_row">
                                 <field name="sponsor_or_donor_type"
-                                       attrs="{'invisible': [('record_type','!=','donation')],'readonly': [('state','!=','draft')]}"/>
+                                       attrs="{'invisible': [('record_type','!=','donation')], 'required': [('record_type','=','donation')], 'readonly': [('state','!=','draft')]}"/>
                                 <field name="sponsor_donor_type"
-                                       attrs="{'invisible': [('record_type','!=','sponsorship')], 'readonly': [('state','!=','draft')]}"/>
+                                       attrs="{'invisible': [('record_type','!=','sponsorship')], 'required': [('record_type','=','sponsorship')], 'readonly': [('state','!=','draft')]}"/>
+                            </div>
+                            
+                            <label string="Sponsor Name" for="sponsor_id"/>
+                            <div class="o_row">
+                                <field name="sponsor_id" nolabel="1"
+                                       context="{'form_view_ref': 'odex_takaful.view_takaful_sponsor_form'}"
+                                       attrs="{
+                                           'required': ['|',
+                                               '&amp;', ('record_type','=','donation'), ('sponsor_or_donor_type','=','registered'),
+                                               '&amp;', ('record_type','=','sponsorship'), ('sponsor_donor_type','=','registered')
+                                           ],
+                                           'readonly': ['|',
+                                               ('state','!=','draft'),
+                                               '|',
+                                               '&amp;', ('record_type','=','donation'), ('sponsor_or_donor_type','=','new_sponsor'),
+                                               '&amp;', ('record_type','=','sponsorship'), ('sponsor_donor_type','=','new_sponsor')
+                                           ]
+                                       }"
+                                       force_save="1" 
+                                       options="{'no_create': True, 'no_create_edit': True}"/>
+                                
                                 <button name="create_new_sponsor" type="object"
                                         string="إنشاء مشترك" 
                                         class="btn-primary oe_highlight"
                                         icon="fa-plus"
                                         attrs="{
-                                            'invisible': [
-                                                '|','|',('sponsor_id','!=',False),
-                                                '&amp;', ('record_type', '!=', 'donation'), ('sponsor_donor_type', '!=', 'new_sponsor'),
-                                                '&amp;', ('record_type', '!=', 'sponsorship'), ('sponsor_or_donor_type', '!=', 'new_sponsor')
+                                            'invisible': ['|', '|',
+                                                ('sponsor_id','!=',False),
+                                                '&amp;', ('record_type', '=', 'donation'), ('sponsor_or_donor_type', '!=', 'new_sponsor'),
+                                                '&amp;', ('record_type', '=', 'sponsorship'), ('sponsor_donor_type', '!=', 'new_sponsor')
                                             ]
                                         }"/>
                             </div>
                             
-                            <field name="sponsor_id" string="Sponsor Name"
-                                   context="{'form_view_ref': 'odex_takaful.view_takaful_sponsor_form'}"
-                                   attrs="{'invisible': [('sponsor_id','=',False), ('sponsor_or_donor_type','!=','registered')],
-                                        'required':[('sponsor_or_donor_type','=','registered')],
-                                        'readonly':[('state','!=','draft')]}"
-                                   force_save="1" options="{'no_create': True, 'no_create_edit': True}"
-                                   help="Select registered sponsor from the list"/>
-                            
-                            <field name="preferred_communication"
-                                   attrs="{'invisible': [('sponsor_id','=',False), ('sponsor_or_donor_type','!=','registered')]}"
-                                   force_save="1" options="{'no_create': True, 'no_create_edit': True}"/>
-                            
                             <field name="sponsor_phone" string="رقم الجوال" widget="phone"
-                                   attrs="{'invisible': [('sponsor_or_donor_type','=', False)], 'readonly': [('sponsor_or_donor_type', '!=', 'unknown')]}"
-                                   placeholder="05xxxxxxxx" help="Saudi mobile number format"/>
+                                   attrs="{
+                                       'readonly': ['|',
+                                           '&amp;', ('record_type','=','donation'), ('sponsor_or_donor_type','!=','unknown'),
+                                           '&amp;', ('record_type','=','sponsorship'), ('sponsor_donor_type','!=','unknown')
+                                       ]
+                                   }"
+                                   placeholder="05xxxxxxxx"/>
                             
-                            <field name="preferred_communication"
-                                   attrs="{'invisible': ['|', ('sponsor_or_donor_type','!=','new_sponsor'), ('record_type','!=','donation')], 'required': [('sponsor_or_donor_type','=','new_sponsor')]}"
-                                   force_save="1" options="{'no_create': True, 'no_create_edit': True}"/>
+                            <field name="preferred_communication" string="طريقة التواصل المفضلة"
+                                   attrs="{
+                                       'invisible': ['|',
+                                           '&amp;', ('record_type','=','donation'), ('sponsor_or_donor_type','=','unknown'),
+                                           '&amp;', ('record_type','=','sponsorship'), ('sponsor_donor_type','=','unknown')
+                                       ],
+                                       'readonly': [True]
+                                   }"
+                                   force_save="1" 
+                                   options="{'no_create': True, 'no_create_edit': True}"/>
                         </group>
                         
                         <group name="group_right" string="Basic Information">