diff --git a/addons_extensions/menu_control_center/controllers/main.py b/addons_extensions/menu_control_center/controllers/main.py
index 59c4af101..7668b84ac 100644
--- a/addons_extensions/menu_control_center/controllers/main.py
+++ b/addons_extensions/menu_control_center/controllers/main.py
@@ -3,7 +3,7 @@ from odoo.http import request
 from odoo.addons.web.controllers.home import Home
 
 
-class CustomMasterLogin(Home):
+class CustomMasterLogin(Home):
 
     @http.route()
     def web_login(self, *args, **kw):
@@ -17,19 +17,19 @@ class CustomMasterLogin(Home):
             request.env['ir.ui.menu'].sudo().clear_caches()
             request.env['ir.ui.menu'].sudo()._visible_menu_ids()
 
-        if request.session.uid and master_selected:
-            user = request.env.user
-            master = request.env['master.control'].sudo().search(
-                [('code', '=', master_selected)], limit=1
-            )
-
-            if master.exists() and master.access_group_ids:
-                if not (user.groups_id & master.access_group_ids):
-                    request.session.logout(keep_db=True)
-
-                    # Create a response with JavaScript alert
-                    html = f"""
-                                        <html>
+        if request.session.uid and master_selected:
+            user = request.env.user
+            master = request.env['master.control'].sudo().search(
+                [('code', '=', master_selected)], limit=1
+            )
+
+            if master.exists() and master.user_ids:
+                if user not in master.user_ids:
+                    request.session.logout(keep_db=True)
+
+                    # Create a response with JavaScript alert
+                    html = f"""
+                                        <html>
                                         <body>
                                         <script>
                                             alert("{_("You don't have access to login to '%s'. Please contact the administrator.") % master.display_name}");
diff --git a/addons_extensions/menu_control_center/data/data.xml b/addons_extensions/menu_control_center/data/data.xml
index 6f3dfde02..257b235d2 100644
--- a/addons_extensions/menu_control_center/data/data.xml
+++ b/addons_extensions/menu_control_center/data/data.xml
@@ -1,28 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<odoo>
-    <data noupdate="1">
-        <record id="hr_unit_menu_control" model="menu.control.units">
-            <field name="unit_name">Human Resources</field>
-        </record>
-
-        <record id="admin_unit_menu_control" model="menu.control.units">
-            <field name="unit_name">Administration</field>
-        </record>
-
-        <record id="developer_unit_menu_control" model="menu.control.units">
-            <field name="unit_name">Development</field>
-        </record>
-
-        <record id="testing_unit_menu_control" model="menu.control.units">
-            <field name="unit_name">Quality Assurance</field>
-        </record>
-        <record id="it_support_menu_control" model="menu.control.units">
-            <field name="unit_name">IT Support</field>
-        </record>
-
-        <record id="finance_unit_menu_control" model="menu.control.units">
-            <field name="unit_name">FINANCE</field>
-        </record>
-
-    </data>
-</odoo>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data noupdate="1"/>
+</odoo>
diff --git a/addons_extensions/menu_control_center/models/groups.py b/addons_extensions/menu_control_center/models/groups.py
deleted file mode 100644
index 0e9b3ff30..000000000
--- a/addons_extensions/menu_control_center/models/groups.py
+++ /dev/null
@@ -1,73 +0,0 @@
-from odoo import api, fields, models
-from odoo.http import request
-
-
-class ResGroups(models.Model):
-    _inherit = 'res.groups'
-
-    is_visible_for_master = fields.Boolean(
-        compute='_compute_is_visible_for_master',
-        search='_search_is_visible_for_master'
-    )
-
-    @api.depends_context('active_master')
-    def _compute_is_visible_for_master(self):
-        master_code = request.session.active_master
-        if not master_code:
-            self.update({'is_visible_for_master': True})
-            return
-
-        master_control = self.env['master.control'].sudo().search([
-            ('code', '=', master_code)
-        ], limit=1)
-
-        if not master_control:
-            self.update({'is_visible_for_master': True})
-            return
-
-        # If NO access_group_ids -> show ALL groups
-        if not master_control.access_group_ids:
-            self.update({'is_visible_for_master': True})
-            return
-
-        visible_group_ids = master_control.access_group_ids.filtered(
-            lambda line: line.show_group
-        ).mapped('group_id').ids
-
-        # If there are no 'show_group = True' -> show ALL groups
-        if not visible_group_ids:
-            self.update({'is_visible_for_master': True})
-            return
-
-        for group in self:
-            group.is_visible_for_master = group.id in visible_group_ids
-
-
-    def _search_is_visible_for_master(self, operator, value):
-        if operator != '=' or not value:
-            return []
-
-        master_code = request.session.active_master
-        if not master_code:
-            return []
-
-        master_control = self.env['master.control'].sudo().search([
-            ('code', '=', master_code)
-        ], limit=1)
-
-        if not master_control:
-            return []
-
-        # If NO access_group_ids → show ALL groups → no domain filter
-        if not master_control.access_group_ids:
-            return []
-
-        visible_group_ids = master_control.access_group_ids.filtered(
-            lambda line: line.show_group
-        ).mapped('group_id').ids
-
-        # If none of the lines have show_group=True → show ALL
-        if not visible_group_ids:
-            return []
-
-        return [('id', 'in', visible_group_ids)]
diff --git a/addons_extensions/menu_control_center/models/masters.py b/addons_extensions/menu_control_center/models/masters.py
index bd553e408..733ff7ca1 100644
--- a/addons_extensions/menu_control_center/models/masters.py
+++ b/addons_extensions/menu_control_center/models/masters.py
@@ -1,103 +1,247 @@
-from odoo import models, fields, _, api
-
-class MasterControl(models.Model):
-    _name = 'master.control'
-    _description = 'Master Control'
-
-    sequence = fields.Integer()
-    name = fields.Char(string='Master Name', required=True)
-    code = fields.Char(string='Code', required=True)
-    access_group_ids = fields.Many2many('res.groups',string='Roles')
-
-    @api.depends('name', 'code')
-    def _compute_display_name(self):
-        for record in self:
-            if record.name:
-                record.display_name = record.name + (f' ({record.code})' if record.code else '')
-            else:
-                record.display_name = False
-
-    # def action_generate_groups(self):
-    #     """Generate category → groups list"""
-    #     for rec in self:
-    #
-    #         # Clear old groups
-    #         rec.access_group_ids.unlink()
-    #
-    #         groups = self.env['res.groups'].sudo().search([],order='category_id')
-    #         show_group = True if rec.default_show else False
-    #         print(show_group)
-    #         for grp in groups:
-    #             self.env['group.access.line'].create({
-    #                 'master_control_id': rec.id,
-    #                 'group_id': grp.id,
-    #                 'show_group': show_group,
-    #             })
-    #
-    #     return {
-    #         'type': 'ir.actions.client',
-    #         'tag': 'display_notification',
-    #         'params': {
-    #             'title': _('Success'),
-    #             'message': _('Groups generated successfully!'),
-    #             'type': 'success',
-    #         }
-    #     }
-    #
-    # # -----------------------------------------
-    # # UPDATE GROUPS (Detect new groups)
-    # # -----------------------------------------
-    # def action_update_groups(self):
-    #     import pdb
-    #     pdb.set_trace()
-    #     for rec in self:
-    #         created_count = 0
-    #
-    #         existing_ids = set(rec.access_group_ids.mapped('group_id.id'))
-    #
-    #         categories = self.env['ir.module.category'].search([])
-    #
-    #         for category in categories:
-    #             groups = self.env['res.groups'].search([
-    #                 ('category_id', '=', category.id)
-    #             ])
-    #
-    #             for grp in groups:
-    #                 # create only missing group
-    #                 if grp.id not in existing_ids:
-    #                     rec.access_group_ids.create({
-    #                         'master_control_id': rec.id,
-    #                         'category_id': category.id,
-    #                         'group_id': grp.id,
-    #                         'show_group': True if rec.default_show else False,
-    #                     })
-    #                     created_count += 1
-    #                     existing_ids.add(grp.id)
-    #
-    #     if created_count:
-    #         message = f"Added {created_count} new groups."
-    #         msg_type = "success"
-    #     else:
-    #         message = "No new groups found."
-    #         msg_type = "info"
-    #
-    #     return {
-    #         'type': 'ir.actions.client',
-    #         'tag': 'display_notification',
-    #         'params': {
-    #             'title': _('Group Update'),
-    #             'message': _(message),
-    #             'type': msg_type,
-    #         }
-    #     }
-
-#
-# class GroupsAccessLine(models.Model):
-#     _name = 'group.access.line'
-#     _description = 'Group Access Line'
-#     _rec_name = 'group_id'
-#
-#     category_id = fields.Many2one('ir.module.category', related='group_id.category_id')
-#     group_id = fields.Many2one('res.groups', string="Role")
-#     show_group = fields.Boolean(string="Show", default=True)
-#     master_control_id = fields.Many2one('master.control')
\ No newline at end of file
+from odoo import api, fields, models, _
+
+
+class MasterControl(models.Model):
+    _name = 'master.control'
+    _description = 'Master Control'
+    _order = 'sequence, name, id'
+
+    sequence = fields.Integer()
+    name = fields.Char(string='Master Name', required=True)
+    code = fields.Char(string='Code', required=True)
+    user_ids = fields.Many2many(
+        'res.users',
+        'master_control_res_users_rel',
+        'master_control_id',
+        'user_id',
+        string='Users',
+    )
+    menu_line_ids = fields.One2many(
+        'master.control.menu.line',
+        'master_control_id',
+        string='Menus',
+        domain=[('menu_id.parent_id', '=', False)],
+    )
+    submenu_line_ids = fields.One2many(
+        'master.control.menu.line',
+        'master_control_id',
+        string='Sub Menus',
+        domain=[('menu_id.parent_id', '!=', False)],
+    )
+    allowed_menu_ids = fields.Many2many(
+        'ir.ui.menu',
+        compute='_compute_allowed_menu_ids',
+        string='Allowed Menus',
+    )
+
+    _sql_constraints = [
+        ('master_control_code_unique', 'unique(code)', 'Master code must be unique.'),
+    ]
+
+    @api.depends('name', 'code')
+    def _compute_display_name(self):
+        for record in self:
+            if record.name:
+                record.display_name = record.name + (f' ({record.code})' if record.code else '')
+            else:
+                record.display_name = False
+
+    @api.depends('menu_line_ids.show_menu', 'menu_line_ids.menu_id', 'submenu_line_ids.show_menu', 'submenu_line_ids.menu_id')
+    def _compute_allowed_menu_ids(self):
+        for record in self:
+            all_lines = record.menu_line_ids | record.submenu_line_ids
+            visible_menu_ids = record._expand_menu_ids(all_lines.filtered('show_menu').mapped('menu_id').ids)
+            hidden_menu_ids = record._expand_menu_ids(all_lines.filtered(lambda line: not line.show_menu).mapped('menu_id').ids)
+            menus = self.env['ir.ui.menu'].browse(list(visible_menu_ids - hidden_menu_ids))
+            ancestors = self.env['ir.ui.menu']
+            for menu in menus:
+                parent = menu.parent_id
+                while parent:
+                    ancestors |= parent
+                    parent = parent.parent_id
+            record.allowed_menu_ids = menus | ancestors
+
+    def _expand_menu_ids(self, menu_ids):
+        if not menu_ids:
+            return set()
+        return set(
+            self.env['ir.ui.menu']
+            .sudo()
+            .with_context({'ir.ui.menu.full_list': True})
+            .search([('id', 'child_of', list(menu_ids))]).ids
+        )
+
+    def _get_all_menus_sql(self):
+        self.env.cr.execute("""
+            WITH RECURSIVE menu_tree AS (
+                SELECT id, parent_id
+                FROM ir_ui_menu
+                WHERE parent_id IS NULL
+                  AND active = true
+
+                UNION ALL
+
+                SELECT menu.id, menu.parent_id
+                FROM ir_ui_menu menu
+                JOIN menu_tree tree ON tree.id = menu.parent_id
+                WHERE menu.active = true
+            )
+            SELECT id, parent_id
+            FROM menu_tree
+            ORDER BY parent_id NULLS FIRST, id
+        """)
+        return self.env.cr.dictfetchall()
+
+    def _sync_menu_lines(self, create_missing_only=False):
+        line_model = self.env['master.control.menu.line']
+        notification_count = 0
+        for record in self:
+            menus = record._get_all_menus_sql()
+            children_map = {}
+            for menu in menus:
+                children_map.setdefault(menu['parent_id'], []).append(menu)
+
+            existing_lines = {
+                line.menu_id.id: line
+                for line in record.menu_line_ids | record.submenu_line_ids
+            }
+
+            if not create_missing_only:
+                (record.menu_line_ids | record.submenu_line_ids).unlink()
+                existing_lines = {}
+
+            for main_menu in children_map.get(None, []):
+                parent_line = existing_lines.get(main_menu['id'])
+                if not parent_line:
+                    parent_line = line_model.create({
+                        'master_control_id': record.id,
+                        'menu_id': main_menu['id'],
+                        'show_menu': True,
+                    })
+                    existing_lines[main_menu['id']] = parent_line
+                    notification_count += 1
+
+                stack = list(children_map.get(main_menu['id'], []))
+                while stack:
+                    submenu = stack.pop()
+                    if submenu['id'] not in existing_lines:
+                        line_model.create({
+                            'master_control_id': record.id,
+                            'menu_id': submenu['id'],
+                            'show_menu': True,
+                            'parent_line_id': parent_line.id,
+                        })
+                        existing_lines[submenu['id']] = True
+                        notification_count += 1
+                    stack.extend(children_map.get(submenu['id'], []))
+        return notification_count
+
+    def action_generate_menus(self):
+        self._sync_menu_lines(create_missing_only=False)
+        return {
+            'type': 'ir.actions.client',
+            'tag': 'display_notification',
+            'params': {
+                'title': _('Success'),
+                'message': _('Menus generated successfully.'),
+                'type': 'success',
+                'sticky': False,
+            },
+        }
+
+    def action_update_menus(self):
+        created_count = self._sync_menu_lines(create_missing_only=True)
+        return {
+            'type': 'ir.actions.client',
+            'tag': 'display_notification',
+            'params': {
+                'title': _('Success') if created_count else _('Info'),
+                'message': _('Added %s new menu(s).') % created_count if created_count else _('No new menus found to add.'),
+                'type': 'success' if created_count else 'info',
+                'sticky': False,
+            },
+        }
+
+    @api.model_create_multi
+    def create(self, vals_list):
+        records = super().create(vals_list)
+        self.env['ir.ui.menu'].sudo().clear_caches()
+        return records
+
+    def write(self, vals):
+        result = super().write(vals)
+        self.env['ir.ui.menu'].sudo().clear_caches()
+        return result
+
+
+class MasterControlMenuLine(models.Model):
+    _name = 'master.control.menu.line'
+    _description = 'Master Control Menu Line'
+    _rec_name = 'menu_id'
+    _order = 'menu_id'
+
+    master_control_id = fields.Many2one('master.control', required=True, ondelete='cascade')
+    menu_id = fields.Many2one('ir.ui.menu', string='Menu', required=True)
+    show_menu = fields.Boolean(string='Show Menu', default=True)
+    parent_menu_id = fields.Many2one('ir.ui.menu', related='menu_id.parent_id', string='Parent Menu', store=True)
+    parent_line_id = fields.Many2one('master.control.menu.line', string='Parent Line')
+
+    _sql_constraints = [
+        ('master_control_menu_unique', 'unique(master_control_id, menu_id)', 'Menu already exists for this master control.'),
+    ]
+
+    def open_submenus_popup_view(self):
+        self.ensure_one()
+        return {
+            'name': _('Sub Menus'),
+            'type': 'ir.actions.act_window',
+            'res_model': 'master.control.menu.line',
+            'view_mode': 'list',
+            'views': [
+                (self.env.ref('menu_control_center.view_master_submenu_line_list').id, 'list'),
+            ],
+            'target': 'new',
+            'domain': [('parent_line_id', '=', self.id)],
+        }
+
+    @api.model_create_multi
+    def create(self, vals_list):
+        records = super().create(vals_list)
+        self.env['ir.ui.menu'].sudo().clear_caches()
+        return records
+
+    def write(self, vals):
+        result = super().write(vals)
+        self.env['ir.ui.menu'].sudo().clear_caches()
+        return result
+
+    def unlink(self):
+        result = super().unlink()
+        self.env['ir.ui.menu'].sudo().clear_caches()
+        return result
+
+
+class ResUsers(models.Model):
+    _inherit = 'res.users'
+
+    master_control_ids = fields.Many2many(
+        'master.control',
+        'master_control_res_users_rel',
+        'user_id',
+        'master_control_id',
+        string='Master Controls',
+        help='Masters this user is allowed to access. Updating this field also updates the Users field on the master.',
+    )
+
+    @api.model_create_multi
+    def create(self, vals_list):
+        records = super().create(vals_list)
+        if any('master_control_ids' in vals for vals in vals_list):
+            self.env['ir.ui.menu'].sudo().clear_caches()
+        return records
+
+    def write(self, vals):
+        result = super().write(vals)
+        if 'master_control_ids' in vals:
+            self.env['ir.ui.menu'].sudo().clear_caches()
+        return result
diff --git a/addons_extensions/menu_control_center/models/menu.py b/addons_extensions/menu_control_center/models/menu.py
index eaaba4685..57641f66b 100644
--- a/addons_extensions/menu_control_center/models/menu.py
+++ b/addons_extensions/menu_control_center/models/menu.py
@@ -1,132 +1,154 @@
-from passlib.apps import master_context
-
-from odoo import models, fields, api, tools, _
-from collections import defaultdict
-from odoo.http import request
-
-class IrUiMenu(models.Model):
-    _inherit = 'ir.ui.menu'
-
-    @api.model
-    @tools.ormcache('frozenset(self.env.user.groups_id.ids)', 'debug')
-    def _visible_menu_ids(self, debug=False):
-        """Return the IDs of menu items visible to the current user based on permissions and active master."""
-        # Clear existing cache to ensure fresh menu visibility calculation
-        self.env['ir.ui.menu'].sudo().clear_caches()
-
-        # Retrieve all menus with required fields
-        context = {'ir.ui.menu.full_list': True}
-        menus = self.with_context(context).search_fetch([], ['action', 'parent_id']).sudo()
-
-        # Get active master and control configuration
-        active_master = request.session.get('active_master')
-        master_control = False
-        control_unit = False
-
-        if active_master:
-            master_control = self.env['master.control'].sudo().search(
-                [('code', '=', active_master)], limit=1
-            )
-            if master_control:
-                control_unit = self.env['menu.access.control'].sudo().search([
-                    ('user_ids', 'ilike', self.env.user.id),
-                    ('master_control', '=', master_control.id)
-                ])
-
-        # Get user groups and exclude technical group in non-debug mode
-        group_ids = set(self.env.user._get_group_ids())
-        if not debug:
-            group_ids -= {
-                self.env['ir.model.data']._xmlid_to_res_id(
-                    'base.group_no_one', raise_if_not_found=False
-                )
-            }
-
-        # Filter menus by group permissions
-        menus = menus.filtered(
-            lambda menu: not (menu.groups_id and group_ids.isdisjoint(menu.groups_id._ids))
-        )
-
-        # Determine menus to hide based on access control
-        hide_menus_list = self._get_hidden_menu_ids(control_unit, master_control, debug)
-        menus = menus.filtered(lambda menu: menu.id not in hide_menus_list)
-
-        # Process menus with actions
-        visible = self._process_action_menus(menus)
-
-        return set(visible.ids)
-
-    def _get_hidden_menu_ids(self, control_unit, master_control, debug):
-        """Helper method to determine menu IDs that should be hidden from the user."""
-        if debug and control_unit:
-            # In debug mode with control unit, use its specific menu restrictions
-            parent_menus = control_unit.access_menu_line_ids.filtered(
-                lambda menu: not menu.is_main_menu
-            ).menu_id.ids
-            sub_menus = control_unit.access_sub_menu_line_ids.filtered(
-                lambda menu: not menu.is_main_menu
-            ).menu_id.ids
-        elif not debug:
-            # In non-debug mode, determine menus to hide based on control configuration
-            domain = [('user_ids', 'ilike', self.env.user.id)]
-            if master_control:
-                domain.append(('master_control', '=', master_control.id))
-
-            access_controls = self.env['menu.access.control'].sudo().search(domain)
-            parent_menus = access_controls.access_menu_line_ids.filtered(
-                lambda menu: not menu.is_main_menu
-            ).menu_id.ids
-            sub_menus = access_controls.access_sub_menu_line_ids.filtered(
-                lambda menu: not menu.is_main_menu
-            ).menu_id.ids
-        else:
-            # Default case: no menus to hide
-            return []
-
-        return list(set(parent_menus + sub_menus))
-
-    def _process_action_menus(self, menus):
-        """Process menus with actions and determine visibility based on model access."""
-        # Separate menus with actions from folder menus
-        actions_by_model = defaultdict(set)
-        for action in menus.mapped('action'):
-            if action:
-                actions_by_model[action._name].add(action.id)
-
-        existing_actions = {
-            action
-            for model_name, action_ids in actions_by_model.items()
-            for action in self.env[model_name].browse(action_ids).exists()
-        }
-
-        action_menus = menus.filtered(lambda m: m.action and m.action in existing_actions)
-        folder_menus = menus - action_menus
-        visible = self.browse()
-
-        # Model access check configuration
-        access = self.env['ir.model.access']
-        MODEL_BY_TYPE = {
-            'ir.actions.act_window': 'res_model',
-            'ir.actions.report': 'model',
-            'ir.actions.server': 'model_name',
-        }
-
-        # Prefetch action data for performance
-        prefetch_ids = defaultdict(list)
-        for action in action_menus.mapped('action'):
-            prefetch_ids[action._name].append(action.id)
-
-        # Check access for each action menu
-        for menu in action_menus:
-            action = menu.action.with_prefetch(prefetch_ids[action._name])
-            model_name = action._name in MODEL_BY_TYPE and action[MODEL_BY_TYPE[action._name]]
-
-            if not model_name or access.check(model_name, 'read', False):
-                # Make menu visible and its folder ancestors
-                visible += menu
-                parent = menu.parent_id
-                while parent and parent in folder_menus and parent not in visible:
-                    visible += parent
-                    parent = parent.parent_id
-
-        return visible
\ No newline at end of file
+from collections import defaultdict
+
+from odoo import api, models, tools
+from odoo.http import request
+
+
+class IrUiMenu(models.Model):
+    _inherit = 'ir.ui.menu'
+
+    def _get_active_master_code(self):
+        return (request.session.get('active_master') if request else False) or self.env.context.get('active_master')
+
+    @api.model
+    @tools.ormcache('frozenset(self.env.user.groups_id.ids)', 'debug', 'self.env.uid', 'self._get_active_master_code() or ""')
+    def _visible_menu_ids(self, debug=False):
+        context = {'ir.ui.menu.full_list': True}
+        menus = self.with_context(context).search_fetch([], ['action', 'parent_id']).sudo()
+
+        active_master_code = self._get_active_master_code()
+        master_control = self.env['master.control'].sudo().search([('code', '=', active_master_code)], limit=1) if active_master_code else False
+
+        group_ids = set(self.env.user._get_group_ids())
+        if not debug:
+            group_ids -= {
+                self.env['ir.model.data']._xmlid_to_res_id('base.group_no_one', raise_if_not_found=False)
+            }
+
+        menus = menus.filtered(
+            lambda menu: not (menu.groups_id and group_ids.isdisjoint(menu.groups_id._ids))
+        )
+
+        if master_control:
+            if master_control.user_ids and self.env.user not in master_control.user_ids:
+                menus = self.browse()
+            else:
+                hidden_menu_ids = self._get_master_hidden_menu_ids(master_control) | self._get_hidden_menu_ids(master_control)
+                if hidden_menu_ids:
+                    menus = menus.filtered(lambda menu: menu.id not in hidden_menu_ids)
+
+        visible = self._process_action_menus(menus)
+        return set(visible.ids)
+
+    @api.model
+    def load_menus_root(self):
+        root = super().load_menus_root()
+        visible_ids = self._visible_menu_ids(request.session.debug if request else False)
+        root['children'] = [
+            child for child in root.get('children', [])
+            if child['id'] in visible_ids
+        ]
+        root['all_menu_ids'] = [
+            menu_id for menu_id in root.get('all_menu_ids', [])
+            if menu_id in visible_ids
+        ]
+        return root
+
+    @api.model
+    def load_menus(self, debug):
+        all_menus = super().load_menus(debug)
+        visible_ids = self._visible_menu_ids(debug)
+
+        filtered_menus = {'root': dict(all_menus['root'])}
+        for menu_id, menu_data in all_menus.items():
+            if menu_id == 'root':
+                continue
+            if menu_id in visible_ids:
+                filtered_menus[menu_id] = dict(menu_data)
+
+        filtered_menus['root']['children'] = [
+            child_id for child_id in filtered_menus['root'].get('children', [])
+            if child_id in filtered_menus
+        ]
+
+        for menu_id, menu_data in list(filtered_menus.items()):
+            if menu_id == 'root':
+                continue
+            menu_data['children'] = [
+                child_id for child_id in menu_data.get('children', [])
+                if child_id in filtered_menus
+            ]
+
+        return filtered_menus
+
+    def _get_hidden_menu_ids(self, master_control):
+        access_controls = self.env['menu.access.control'].sudo().search([
+            ('master_control_id', '=', master_control.id),
+            ('user_ids', 'in', self.env.user.id),
+        ])
+        hidden_lines = (access_controls.access_menu_line_ids | access_controls.access_sub_menu_line_ids).filtered(
+            lambda line: not line.show_menu
+        )
+        hidden_menu_ids = hidden_lines.mapped('menu_id').ids
+        if not hidden_menu_ids:
+            return set()
+        return set(
+            self.env['ir.ui.menu']
+            .sudo()
+            .with_context({'ir.ui.menu.full_list': True})
+            .search([('id', 'child_of', hidden_menu_ids)]).ids
+        )
+
+    def _get_master_hidden_menu_ids(self, master_control):
+        hidden_lines = (master_control.menu_line_ids | master_control.submenu_line_ids).filtered(
+            lambda line: not line.show_menu
+        )
+        hidden_menu_ids = hidden_lines.mapped('menu_id').ids
+        if not hidden_menu_ids:
+            return set()
+        return set(
+            self.env['ir.ui.menu']
+            .sudo()
+            .with_context({'ir.ui.menu.full_list': True})
+            .search([('id', 'child_of', hidden_menu_ids)]).ids
+        )
+
+    def _process_action_menus(self, menus):
+        actions_by_model = defaultdict(set)
+        for action in menus.mapped('action'):
+            if action:
+                actions_by_model[action._name].add(action.id)
+
+        existing_actions = {
+            action
+            for model_name, action_ids in actions_by_model.items()
+            for action in self.env[model_name].browse(action_ids).exists()
+        }
+
+        action_menus = menus.filtered(lambda menu: menu.action and menu.action in existing_actions)
+        folder_menus = menus - action_menus
+        visible = self.browse()
+
+        access_model = self.env['ir.model.access']
+        model_by_type = {
+            'ir.actions.act_window': 'res_model',
+            'ir.actions.report': 'model',
+            'ir.actions.server': 'model_name',
+        }
+
+        prefetch_ids = defaultdict(list)
+        for action in action_menus.mapped('action'):
+            prefetch_ids[action._name].append(action.id)
+
+        for menu in action_menus:
+            action = menu.action.with_prefetch(prefetch_ids[action._name])
+            model_name = action._name in model_by_type and action[model_by_type[action._name]]
+
+            if not model_name or access_model.check(model_name, 'read', False):
+                visible += menu
+                parent = menu.parent_id
+                while parent and parent in folder_menus and parent not in visible:
+                    visible += parent
+                    parent = parent.parent_id
+
+        return visible
diff --git a/addons_extensions/menu_control_center/models/models.py b/addons_extensions/menu_control_center/models/models.py
index f92c7e386..323c8cc47 100644
--- a/addons_extensions/menu_control_center/models/models.py
+++ b/addons_extensions/menu_control_center/models/models.py
@@ -1,228 +1,192 @@
-# models/models.py
-from odoo import models, fields, api, tools, _
-from collections import defaultdict
-
-class MenuControlUnits(models.Model):
-    _name = 'menu.control.units'
-    _rec_name = 'unit_name'
-
-    _sql_constraints = [
-        ('unique_unit_name', 'UNIQUE(unit_name)', "'Unit Name' already defined. Please don't confuse me 😤.")
-    ]
-
-    unit_name = fields.Char(string='Unit Name',required=True)
-    department_ids = fields.Many2many('hr.department')
-
-    user_ids = fields.Many2many('res.users')
-
-    def generate_department_user_ids(self):
-        for rec in self:
-            user_ids = self.env['hr.employee'].sudo().search([('department_id','in',rec.department_ids.ids)]).user_id.ids
-            self.write({
-                'user_ids': [(6, 0, user_ids)]
-            })
-
-class MenuAccessControl(models.Model):
-    _name = 'menu.access.control'
-    _description = 'Menu Access Control'
-    _rec_name = 'control_unit'
-
-    _sql_constraints = [
-        ('unique_control_unit', 'UNIQUE(control_unit, master_control)', "Only one service can exist with a specific control_unit & Master. Please don't confuse me 🤪.")
-    ]
-
-    control_unit = fields.Many2one('menu.control.units',required=True)
-    user_ids = fields.Many2many('res.users', string="Users", related='control_unit.user_ids')
-    master_control = fields.Many2one('master.control')
-
-
-    access_menu_line_ids = fields.One2many(
-        'menu.access.line', 'access_control_id',
-        string="Accessible Menus", domain=[('menu_id.parent_id','=',False)]
-    )
-
-    access_sub_menu_line_ids = fields.One2many('menu.access.line', 'access_control_id',
-        string="Accessible Menus", domain=[('menu_id.parent_id','!=',False)]
-    )
-
-    def _get_all_submenus(self, menu):
-        """Returns all submenus recursively for a given menu."""
-        submenus = self.env['ir.ui.menu'].search([('parent_id', '=', menu.id), ('active', '=', True)])
-        all_subs = submenus
-        for sm in submenus:
-            all_subs |= self._get_all_submenus(sm)
-        return all_subs
-
-    def _get_all_menus_sql(self):
-        """
-        Fetch all active menus with hierarchy using SQL
-        Returns list of dicts:
-        [
-            {id, parent_id}
-        ]
-        """
-        self.env.cr.execute("""
-            WITH RECURSIVE menu_tree AS (
-                SELECT id, parent_id
-                FROM ir_ui_menu
-                WHERE parent_id IS NULL
-                  AND active = true
-
-                UNION ALL
-
-                SELECT m.id, m.parent_id
-                FROM ir_ui_menu m
-                JOIN menu_tree mt ON mt.id = m.parent_id
-                WHERE m.active = true
-            )
-            SELECT id, parent_id
-            FROM menu_tree
-            ORDER BY parent_id NULLS FIRST, id
-        """)
-        return self.env.cr.dictfetchall()
-
-    def action_generate_menus(self):
-        """
-        Generate main menus and all submenus (SQL-based),
-        and set access_line_id for every submenu.
-        """
-        MenuLine = self.env['menu.access.line']
-
-        for rec in self:
-            # Clear old menus
-            rec.access_menu_line_ids.unlink()
-            rec.access_sub_menu_line_ids.unlink()
-
-            menus = rec._get_all_menus_sql()
-
-            # Map: parent_id -> children
-            children_map = {}
-            for m in menus:
-                children_map.setdefault(m['parent_id'], []).append(m)
-
-            # ---------- Main menus ----------
-            for main in children_map.get(None, []):
-
-                main_line = MenuLine.create({
-                    'access_control_id': rec.id,
-                    'menu_id': main['id'],
-                    'is_main_menu': True,
-                })
-
-                # ---------- Submenus ----------
-                stack = children_map.get(main['id'], [])
-                while stack:
-                    sm = stack.pop()
-                    MenuLine.create({
-                        'access_control_id': rec.id,
-                        'menu_id': sm['id'],
-                        'is_main_menu': True,
-                        'access_line_id': main_line.id,
-                    })
-                    stack.extend(children_map.get(sm['id'], []))
-
-    def action_update_menus(self):
-        MenuLine = self.env['menu.access.line']
-
-        for rec in self:
-            created_count = 0
-
-            # Existing menu IDs
-            existing_menu_ids = set(
-                rec.access_menu_line_ids.mapped('menu_id.id') +
-                rec.access_sub_menu_line_ids.mapped('menu_id.id')
-            )
-
-            menus = rec._get_all_menus_sql()
-
-            # Map parent -> children
-            children_map = {}
-            for m in menus:
-                children_map.setdefault(m['parent_id'], []).append(m)
-
-            # ---------- Main menus ----------
-            for main in children_map.get(None, []):
-
-                main_line = MenuLine.search([
-                    ('access_control_id', '=', rec.id),
-                    ('menu_id', '=', main['id']),
-                    ('access_line_id', '=', False),
-                ], limit=1)
-
-                if not main_line:
-                    main_line = MenuLine.create({
-                        'access_control_id': rec.id,
-                        'menu_id': main['id'],
-                        'is_main_menu': True,
-                    })
-                    created_count += 1
-                    existing_menu_ids.add(main['id'])
-
-                # ---------- Submenus ----------
-                stack = children_map.get(main['id'], [])
-                while stack:
-                    sm = stack.pop()
-
-                    if sm['id'] not in existing_menu_ids:
-                        MenuLine.create({
-                            'access_control_id': rec.id,
-                            'menu_id': sm['id'],
-                            'is_main_menu': True,
-                            'access_line_id': main_line.id,
-                        })
-                        created_count += 1
-                        existing_menu_ids.add(sm['id'])
-
-                    stack.extend(children_map.get(sm['id'], []))
-
-            # ---------- Notification ----------
-            return {
-                'type': 'ir.actions.client',
-                'tag': 'display_notification',
-                'params': {
-                    'title': _('Success') if created_count else _('Info'),
-                    'message': (
-                        _('Added %s new menu(s) (including submenus)') % created_count
-                        if created_count else
-                        _('No new menus found to add.')
-                    ),
-                    'type': 'success' if created_count else 'info',
-                    'sticky': False,
-                }
-            }
-
-
-class MenuAccessLine(models.Model):
-    _name = 'menu.access.line'
-    _description = 'Menu Access Line'
-    _rec_name = 'menu_id'
-
-    access_control_id = fields.Many2one('menu.access.control', ondelete='cascade')
-    menu_id = fields.Many2one('ir.ui.menu', string="Menu")
-    is_main_menu = fields.Boolean(string="Is Main Menu", default=True)
-    parent_menu = fields.Many2one('ir.ui.menu',related='menu_id.parent_id')
-    access_line_id = fields.Many2one('menu.access.line')
-    control_unit = fields.Many2one(
-        'menu.control.units',
-        related='access_control_id.control_unit',
-        store=True
-    )
-
-    def open_submenus_popup_view(self):
-        self.ensure_one()
-
-        return {
-            "name": _("Sub Menus"),
-            "type": "ir.actions.act_window",
-            "res_model": "menu.access.line",
-            "view_mode": "list,form",
-            "views": [
-                (self.env.ref("menu_control_center.view_submenu_line_list").id, "list"),
-            ],
-            "target": "new",
-            "domain": [("access_line_id", "=", self.id)],
-            "context": {"default_access_line_id": self.id},
-        }
-
-
-
+from odoo import api, fields, models, _
+from odoo.exceptions import ValidationError
+
+
+class MenuAccessControl(models.Model):
+    _name = 'menu.access.control'
+    _description = 'Menu Access Control'
+    _rec_name = 'master_control_id'
+
+    master_control_id = fields.Many2one('master.control', string='Master Control', required=True)
+    department_ids = fields.Many2many('hr.department', string='Departments')
+    available_user_ids = fields.Many2many(
+        'res.users',
+        compute='_compute_available_user_ids',
+        string='Available Users',
+    )
+    user_ids = fields.Many2many(
+        'res.users',
+        'menu_access_control_res_users_rel',
+        'access_control_id',
+        'user_id',
+        string='Users',
+    )
+    access_menu_line_ids = fields.One2many(
+        'menu.access.line',
+        'access_control_id',
+        string='Menus',
+        domain=[('menu_id.parent_id', '=', False)],
+    )
+    access_sub_menu_line_ids = fields.One2many(
+        'menu.access.line',
+        'access_control_id',
+        string='Sub Menus',
+        domain=[('menu_id.parent_id', '!=', False)],
+    )
+
+    @api.depends('master_control_id', 'master_control_id.user_ids')
+    def _compute_available_user_ids(self):
+        for record in self:
+            record.available_user_ids = record.master_control_id.user_ids
+
+    @api.onchange('master_control_id')
+    def _onchange_master_control_id(self):
+        for record in self:
+            available_users = record.master_control_id.user_ids
+            record.user_ids = record.user_ids.filtered(lambda user: user in available_users)
+            record._add_department_users()
+
+    @api.onchange('department_ids')
+    def _onchange_department_ids(self):
+        self._add_department_users()
+
+    def _add_department_users(self):
+        for record in self:
+            if not record.master_control_id:
+                record.user_ids = [(5, 0, 0)]
+                continue
+            allowed_users = record.master_control_id.user_ids
+            department_users = self.env['hr.employee'].sudo().search([
+                ('department_id', 'in', record.department_ids.ids),
+                ('user_id', '!=', False),
+            ]).mapped('user_id')
+            record.user_ids = (record.user_ids.filtered(lambda user: user in allowed_users) | (department_users & allowed_users))
+
+    def _sync_menu_lines_from_master(self):
+        line_model = self.env['menu.access.line']
+        for record in self:
+            master_lines = (record.master_control_id.menu_line_ids | record.master_control_id.submenu_line_ids).filtered('show_menu')
+            existing_lines = {line.menu_id.id: line for line in record.access_menu_line_ids | record.access_sub_menu_line_ids}
+            valid_menu_ids = set(master_lines.mapped('menu_id').ids)
+
+            for line in (record.access_menu_line_ids | record.access_sub_menu_line_ids):
+                if line.menu_id.id not in valid_menu_ids:
+                    line.unlink()
+
+            refreshed_lines = {line.menu_id.id: line for line in record.access_menu_line_ids | record.access_sub_menu_line_ids}
+            parent_lines = {}
+            for master_line in master_lines.filtered(lambda line: not line.menu_id.parent_id):
+                access_line = refreshed_lines.get(master_line.menu_id.id)
+                if not access_line:
+                    access_line = line_model.create({
+                        'access_control_id': record.id,
+                        'menu_id': master_line.menu_id.id,
+                        'show_menu': True,
+                    })
+                parent_lines[master_line.menu_id.id] = access_line
+
+            for master_line in master_lines.filtered(lambda line: line.menu_id.parent_id):
+                parent_root_menu = master_line.menu_id
+                while parent_root_menu.parent_id:
+                    parent_root_menu = parent_root_menu.parent_id
+                parent_line = parent_lines.get(parent_root_menu.id)
+                access_line = refreshed_lines.get(master_line.menu_id.id)
+                if not access_line:
+                    line_model.create({
+                        'access_control_id': record.id,
+                        'menu_id': master_line.menu_id.id,
+                        'show_menu': True,
+                        'parent_line_id': parent_line.id if parent_line else False,
+                    })
+
+    @api.model_create_multi
+    def create(self, vals_list):
+        records = super().create(vals_list)
+        records._sync_menu_lines_from_master()
+        self.env['ir.ui.menu'].sudo().clear_caches()
+        return records
+
+    def write(self, vals):
+        result = super().write(vals)
+        if {'master_control_id', 'department_ids'} & set(vals):
+            self._sync_menu_lines_from_master()
+            self._validate_users_belong_to_master()
+        self.env['ir.ui.menu'].sudo().clear_caches()
+        return result
+
+    @api.constrains('master_control_id', 'user_ids')
+    def _validate_users_belong_to_master(self):
+        for record in self:
+            allowed_users = record.master_control_id.user_ids
+            invalid_users = record.user_ids.filtered(lambda user: user not in allowed_users)
+            if invalid_users:
+                raise ValidationError(
+                    _('Users in Menu Access Control must belong to the selected Master Control.')
+                )
+
+    def action_refresh_from_master(self):
+        self._sync_menu_lines_from_master()
+        return {
+            'type': 'ir.actions.client',
+            'tag': 'display_notification',
+            'params': {
+                'title': _('Success'),
+                'message': _('Menus refreshed from Master Control.'),
+                'type': 'success',
+                'sticky': False,
+            },
+        }
+
+    def unlink(self):
+        result = super().unlink()
+        self.env['ir.ui.menu'].sudo().clear_caches()
+        return result
+
+
+class MenuAccessLine(models.Model):
+    _name = 'menu.access.line'
+    _description = 'Menu Access Line'
+    _rec_name = 'menu_id'
+    _order = 'menu_id'
+
+    access_control_id = fields.Many2one('menu.access.control', ondelete='cascade')
+    menu_id = fields.Many2one('ir.ui.menu', string='Menu', required=True)
+    show_menu = fields.Boolean(string='Show Menu', default=True)
+    parent_menu_id = fields.Many2one('ir.ui.menu', related='menu_id.parent_id', string='Parent Menu', store=True)
+    parent_line_id = fields.Many2one('menu.access.line', string='Parent Line')
+    master_control_id = fields.Many2one('master.control', related='access_control_id.master_control_id', store=True)
+
+    _sql_constraints = [
+        ('menu_access_line_unique', 'unique(access_control_id, menu_id)', 'Menu already exists in this access control.'),
+    ]
+
+    def open_submenus_popup_view(self):
+        self.ensure_one()
+        return {
+            'name': _('Sub Menus'),
+            'type': 'ir.actions.act_window',
+            'res_model': 'menu.access.line',
+            'view_mode': 'list,form',
+            'views': [
+                (self.env.ref('menu_control_center.view_submenu_line_list').id, 'list'),
+            ],
+            'target': 'new',
+            'domain': [('parent_line_id', '=', self.id)],
+            'context': {'default_parent_line_id': self.id},
+        }
+
+    @api.model_create_multi
+    def create(self, vals_list):
+        records = super().create(vals_list)
+        self.env['ir.ui.menu'].sudo().clear_caches()
+        return records
+
+    def write(self, vals):
+        result = super().write(vals)
+        self.env['ir.ui.menu'].sudo().clear_caches()
+        return result
+
+    def unlink(self):
+        result = super().unlink()
+        self.env['ir.ui.menu'].sudo().clear_caches()
+        return result
diff --git a/addons_extensions/menu_control_center/security/ir.model.access.csv b/addons_extensions/menu_control_center/security/ir.model.access.csv
index 502e839c6..75aa91eed 100644
--- a/addons_extensions/menu_control_center/security/ir.model.access.csv
+++ b/addons_extensions/menu_control_center/security/ir.model.access.csv
@@ -1,6 +1,6 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_menu_access_control,access.menu.access.control,model_menu_access_control,hr.group_hr_manager,1,1,1,1
-access_menu_access_line,access.menu.access.line,model_menu_access_line,hr.group_hr_manager,1,1,1,1
-access_menu_control_units,access.menu.control.units,model_menu_control_units,hr.group_hr_manager,1,1,1,1
-access_master_control_public,master.control.public,model_master_control,base.group_public,1,0,0,0
-access_master_control_hr,master.control.hr,model_master_control,hr.group_hr_manager,1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_menu_access_control,access.menu.access.control,model_menu_access_control,hr.group_hr_manager,1,1,1,1
+access_menu_access_line,access.menu.access.line,model_menu_access_line,hr.group_hr_manager,1,1,1,1
+access_master_control_menu_line,access.master.control.menu.line,model_master_control_menu_line,hr.group_hr_manager,1,1,1,1
+access_master_control_public,master.control.public,model_master_control,base.group_public,1,0,0,0
+access_master_control_hr,master.control.hr,model_master_control,hr.group_hr_manager,1,1,1,1
diff --git a/addons_extensions/menu_control_center/views/groups.xml b/addons_extensions/menu_control_center/views/groups.xml
index b74b299f9..549ac06ee 100644
--- a/addons_extensions/menu_control_center/views/groups.xml
+++ b/addons_extensions/menu_control_center/views/groups.xml
@@ -4,7 +4,7 @@
         <record id="base.action_res_groups" model="ir.actions.act_window">
             <field name="name">Roles</field>
             <field name="res_model">res.groups</field>
-            <field name="domain">[('is_visible_for_master', '=', True)]</field>
+<!--            <field name="domain">[('is_visible_for_master', '=', True)]</field>-->
 <!--            <field name="context">{'search_default_filter_no_share': 1}</field>-->
 <!--            <field name="help">A group is a set of functional areas that will be assigned to the user in order to give-->
 <!--                them access and rights to specific applications and tasks in the system. You can create custom groups or-->
diff --git a/addons_extensions/menu_control_center/views/masters.xml b/addons_extensions/menu_control_center/views/masters.xml
index dea4a41a7..a466efebf 100644
--- a/addons_extensions/menu_control_center/views/masters.xml
+++ b/addons_extensions/menu_control_center/views/masters.xml
@@ -1,70 +1,109 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<odoo>
-
-    <record id="view_master_control_list" model="ir.ui.view">
-        <field name="name">master.control.list</field>
-        <field name="model">master.control</field>
-        <field name="arch" type="xml">
-            <list>
-                <field name="sequence" widget="handle"/>
-                <field name="name"/>
-                <field name="code"/>
-            </list>
-        </field>
-    </record>
-
-    <record id="view_master_control_form" model="ir.ui.view">
-        <field name="name">master.control.form</field>
-        <field name="model">master.control</field>
-        <field name="arch" type="xml">
-            <form>
-<!--                <header>-->
-<!--                    <button name="action_generate_groups"-->
-<!--                            type="object"-->
-<!--                            string="Generate Groups"-->
-<!--                            class="btn-primary"/>-->
-
-<!--                    <button name="action_update_groups"-->
-<!--                            type="object"-->
-<!--                            string="Update Groups"-->
-<!--                            class="btn-secondary"/>-->
-<!--                </header>-->
-
-                <sheet>
-                    <group>
-                        <field name="name"/>
-                        <field name="code"/>
-<!--                        <field name="default_show" help="Upon Generating this value be placed in Show Option"/>-->
-                    </group>
-
-                    <notebook>
-                        <page string="Roles">
-                            <field name="access_group_ids" widget="one2many_search"/>
-                        </page>
-                    </notebook>
-                </sheet>
-            </form>
-        </field>
-    </record>
-
-
-        <record id="action_master_module_control" model="ir.actions.act_window">
-        <field name="name">Master Control</field>
-        <field name="res_model">master.control</field>
-        <field name="view_mode">list,form</field>
-    </record>
-
-
-    <menuitem id="master_module_access_root"
-              name="Masters"
-              parent="base.menu_custom"
-              sequence="9"/>
-
-    <menuitem id="master_module_control_units"
-              name="Login Masters"
-              parent="master_module_access_root"
-              action="action_master_module_control"
-              sequence="19"/>
-
-
-</odoo>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="view_master_submenu_line_list" model="ir.ui.view">
+        <field name="name">master.control.menu.line.submenu.list</field>
+        <field name="model">master.control.menu.line</field>
+        <field name="arch" type="xml">
+            <list editable="bottom" create="0">
+                <field name="menu_id" readonly="1" force_save="1"/>
+                <field name="parent_menu_id" readonly="1"/>
+                <field name="show_menu"/>
+            </list>
+        </field>
+    </record>
+
+    <record id="view_master_control_list" model="ir.ui.view">
+        <field name="name">master.control.list</field>
+        <field name="model">master.control</field>
+        <field name="arch" type="xml">
+            <list>
+                <field name="sequence" widget="handle"/>
+                <field name="name"/>
+                <field name="code"/>
+                <field name="user_ids" widget="many2many_tags"/>
+            </list>
+        </field>
+    </record>
+
+    <record id="view_master_control_form" model="ir.ui.view">
+        <field name="name">master.control.form</field>
+        <field name="model">master.control</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet>
+                    <group>
+                        <field name="name"/>
+                        <field name="code"/>
+                    </group>
+
+                    <notebook>
+                        <page string="Users">
+                            <field name="user_ids" widget="one2many_search">
+                                <list editable="bottom" create="0" delete="1">
+                                    <field name="name"/>
+                                    <field name="login"/>
+                                    <field name="company_id"/>
+                                </list>
+                            </field>
+                        </page>
+                        <page string="Menus">
+                            <group>
+                                <button name="action_generate_menus" type="object" string="Generate Menus" class="btn-primary"/>
+                                <button name="action_update_menus" type="object" string="Update Menus" class="btn-secondary"/>
+                            </group>
+                            <field name="menu_line_ids" widget="one2many_search">
+                                <list editable="bottom" create="0">
+                                    <field name="menu_id" readonly="1" force_save="1"/>
+                                    <field name="show_menu"/>
+                                    <button name="open_submenus_popup_view" string="Sub Menus" type="object" class="btn-primary"/>
+                                </list>
+                            </field>
+                        </page>
+                        <page string="Sub Menus">
+                            <field name="submenu_line_ids" widget="one2many_search">
+                                <list editable="bottom" create="0" default_group_by="parent_menu_id">
+                                    <field name="menu_id" readonly="1" force_save="1"/>
+                                    <field name="parent_menu_id" readonly="1"/>
+                                    <field name="show_menu"/>
+                                </list>
+                            </field>
+                        </page>
+                    </notebook>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="view_users_form_master_control_inherit" model="ir.ui.view">
+        <field name="name">res.users.form.master.control.inherit</field>
+        <field name="model">res.users</field>
+        <field name="inherit_id" ref="base.view_users_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='company_ids']" position="after">
+                <field name="master_control_ids"
+                       string="Master Access"
+                       widget="many2many_tags"
+                       options="{'no_create': True, 'no_create_edit': True}"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="action_master_module_control" model="ir.actions.act_window">
+        <field name="name">Master Control</field>
+        <field name="res_model">master.control</field>
+        <field name="view_mode">list,form</field>
+    </record>
+
+    <menuitem id="master_module_access_root"
+              name="Menu Access Control"
+              parent="base.menu_custom"
+              sequence="1000"/>
+
+    <menuitem id="master_module_control_units"
+              name="Master Control"
+              parent="master_module_access_root"
+              action="action_master_module_control"
+              sequence="1"/>
+
+</odoo>
diff --git a/addons_extensions/menu_control_center/views/menu_access_control_views.xml b/addons_extensions/menu_control_center/views/menu_access_control_views.xml
index 4acd8e72c..a4ce5a908 100644
--- a/addons_extensions/menu_control_center/views/menu_access_control_views.xml
+++ b/addons_extensions/menu_control_center/views/menu_access_control_views.xml
@@ -1,149 +1,91 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<odoo>
-    <record id="view_submenu_line_list" model="ir.ui.view">
-    <field name="name">menu.access.line.submenu.list</field>
-    <field name="model">menu.access.line</field>
-    <field name="arch" type="xml">
-        <list editable="bottom" create="0">
-            <field name="menu_id" readonly="1" force_save="1"/>
-            <field name="parent_menu"/>
-            <field name="is_main_menu" string="Show Menu"/>
-            <field name="access_line_id" optional="hide" readonly="1" force_save="1"/>
-            <field name="control_unit" optional="hide" readonly="1"/>
-        </list>
-    </field>
-</record>
-
-    <record id="action_submenus_popup" model="ir.actions.act_window">
-        <field name="name">Sub Menus</field>
-        <field name="res_model">menu.access.line</field>
-        <field name="view_mode">list</field>
-        <field name="target">new</field>
-    </record>
-
-    <record id="view_menu_control_units_list" model="ir.ui.view">
-        <field name="name">menu.control.units.list</field>
-        <field name="model">menu.control.units</field>
-        <field name="arch" type="xml">
-            <list>
-                <field name="unit_name"/>
-                <field name="user_ids" widget="many2many_tags"/>
-            </list>
-        </field>
-    </record>
-
-        <record id="view_menu_control_units_form" model="ir.ui.view">
-        <field name="name">menu.control.units.form</field>
-        <field name="model">menu.control.units</field>
-        <field name="arch" type="xml">
-            <form>
-                <sheet>
-                    <group>
-                        <field name="unit_name"/>
-                        <field name="department_ids" widget="many2many_tags"/>
-                        <button name="generate_department_user_ids" string="Generate Department Users" type="object" class="btn-primary"/>
-                    </group>
-                    <notebook>
-                        <page string="User's">
-                            <field name="user_ids"/>
-                        </page>
-                    </notebook>
-                </sheet>
-            </form>
-        </field>
-    </record>
-
-
-    <record id="action_menu_control_units" model="ir.actions.act_window">
-        <field name="name">Menu Control Units</field>
-        <field name="res_model">menu.control.units</field>
-        <field name="view_mode">list,form</field>
-    </record>
-
-
-
-    <record id="view_menu_access_control_list" model="ir.ui.view">
-        <field name="name">menu.access.control.list</field>
-        <field name="model">menu.access.control</field>
-        <field name="arch" type="xml">
-            <list>
-                <field name="control_unit"/>
-                <field name="user_ids" widget="many2many_tags"/>
-                <field name="master_control"/>
-            </list>
-        </field>
-    </record>
-    <record id="view_menu_access_control_form" model="ir.ui.view">
-        <field name="name">menu.access.control.form</field>
-        <field name="model">menu.access.control</field>
-        <field name="arch" type="xml">
-            <form string="Menu Access Control">
-                <sheet>
-                    <group>
-                        <field name="control_unit"/>
-                        <field name="master_control"/>
-                        <field name="user_ids" widget="many2many_tags"/>
-                        <div class="row">
-                            <div class="col-6">
-                                <button name="action_generate_menus" type="object" string="Generate Menus"
-                                        class="btn-primary"/>
-                            </div>
-                            <div class="col-6">
-                                <button name="action_update_menus" type="object" string="Update Menus"
-                                        class="btn-secondary"/>
-                            </div>
-                        </div>
-                    </group>
-                    <notebook>
-                        <page name="main_menus" string="Menus">
-                            <field name="access_menu_line_ids" widget="one2many_search">
-                                <list editable="bottom">
-                                    <field name="menu_id"/>
-                                    <field name="is_main_menu"/>
-                                    <button name="open_submenus_popup_view" string="Sub Menus" type="object"
-                                            class="btn-primary"/>
-                                </list>
-                            </field>
-                        </page>
-                        <page name="sub_menus" string="Sub Menus">
-                            <field name="access_sub_menu_line_ids" widget="one2many_search">
-                                <list create="0" default_group_by="parent_menu" editable="bottom">
-                                    <field name="menu_id" readonly="1" force_save="1"/>
-                                    <field name="parent_menu"/>
-                                    <field name="is_main_menu" string="Show Menu"/>
-                                    <field name="access_line_id" optional="hide" readonly="1" force_save="1"/>
-                                    <field name="control_unit" optional="hide" readonly="1"/>
-                                </list>
-                            </field>
-                        </page>
-                    </notebook>
-                </sheet>
-            </form>
-        </field>
-    </record>
-
-    <record id="action_menu_access_control" model="ir.actions.act_window">
-        <field name="name">Menu Access Control</field>
-        <field name="res_model">menu.access.control</field>
-        <field name="view_mode">list,form</field>
-    </record>
-
-    <menuitem id="menu_menu_access_root"
-              name="Menu Access Control"
-              parent="base.menu_custom"
-              sequence="10"/>
-
-    <menuitem id="menu_menu_control_units"
-              name="Control Units Master"
-              parent="menu_menu_access_root"
-              action="action_menu_control_units"
-              sequence="19"/>
-
-    <menuitem id="menu_menu_access_control"
-              name="Access Control"
-              parent="menu_menu_access_root"
-              action="action_menu_access_control"
-              sequence="20"/>
-
-
-</odoo>
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="view_submenu_line_list" model="ir.ui.view">
+        <field name="name">menu.access.line.submenu.list</field>
+        <field name="model">menu.access.line</field>
+        <field name="arch" type="xml">
+            <list editable="bottom" create="0">
+                <field name="menu_id" readonly="1" force_save="1"/>
+                <field name="parent_menu_id" readonly="1"/>
+                <field name="show_menu"/>
+                <field name="master_control_id" optional="hide" readonly="1"/>
+            </list>
+        </field>
+    </record>
+
+    <record id="action_submenus_popup" model="ir.actions.act_window">
+        <field name="name">Sub Menus</field>
+        <field name="res_model">menu.access.line</field>
+        <field name="view_mode">list</field>
+        <field name="target">new</field>
+    </record>
+
+    <record id="view_menu_access_control_list" model="ir.ui.view">
+        <field name="name">menu.access.control.list</field>
+        <field name="model">menu.access.control</field>
+        <field name="arch" type="xml">
+            <list>
+                <field name="master_control_id"/>
+                <field name="department_ids" widget="many2many_tags"/>
+                <field name="user_ids" widget="many2many_tags"/>
+            </list>
+        </field>
+    </record>
+
+    <record id="view_menu_access_control_form" model="ir.ui.view">
+        <field name="name">menu.access.control.form</field>
+        <field name="model">menu.access.control</field>
+        <field name="arch" type="xml">
+            <form string="Menu Access Control">
+                <sheet>
+                    <group>
+                        <field name="master_control_id"/>
+                        <field name="department_ids" widget="many2many_tags"/>
+                        <field name="available_user_ids" invisible="1"/>
+                        <field name="user_ids"
+                               widget="many2many_tags"
+                               domain="[('id', 'in', available_user_ids)]"
+                               options="{'no_create': True, 'no_create_edit': True}"/>
+                        <button name="action_refresh_from_master"
+                                type="object"
+                                string="Refresh Menus From Master"
+                                class="btn-primary"/>
+                    </group>
+                    <notebook>
+                        <page name="main_menus" string="Menus">
+                            <field name="access_menu_line_ids" widget="one2many_search">
+                                <list editable="bottom" create="0">
+                                    <field name="menu_id" readonly="1" force_save="1"/>
+                                    <field name="show_menu"/>
+                                    <button name="open_submenus_popup_view" string="Sub Menus" type="object" class="btn-primary"/>
+                                </list>
+                            </field>
+                        </page>
+                        <page name="sub_menus" string="Sub Menus">
+                            <field name="access_sub_menu_line_ids" widget="one2many_search">
+                                <list editable="bottom" create="0" default_group_by="parent_menu_id">
+                                    <field name="menu_id" readonly="1" force_save="1"/>
+                                    <field name="parent_menu_id" readonly="1"/>
+                                    <field name="show_menu"/>
+                                </list>
+                            </field>
+                        </page>
+                    </notebook>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_menu_access_control" model="ir.actions.act_window">
+        <field name="name">Menu Access Control</field>
+        <field name="res_model">menu.access.control</field>
+        <field name="view_mode">list,form</field>
+    </record>
+
+    <menuitem id="menu_menu_access_control"
+              name="Access Control"
+              parent="menu_control_center.master_module_access_root"
+              action="action_menu_access_control"
+              sequence="20"/>
+
+</odoo>
