diff --git a/agreement/__manifest__.py b/agreement/__manifest__.py
index 2e524d5d..cc43e2fc 100644
--- a/agreement/__manifest__.py
+++ b/agreement/__manifest__.py
@@ -19,6 +19,9 @@
         "sale_management",
     ],
     "data": [
+        "data/module_category.xml",
+        "security/res_groups.xml",
+        "security/ir.model.access.csv",
         "views/reports.xml",
         "views/agreement.xml",
         "views/agreement_clause.xml",
@@ -29,7 +32,7 @@
         "views/agreement_renewaltype.xml",
         "views/agreement_increasetype.xml",
         "views/res_partner.xml",
-        "security/ir.model.access.csv",
+        "views/menu.xml",
     ],
     "application": True,
     "development_status": "Beta",
diff --git a/agreement/data/module_category.xml b/agreement/data/module_category.xml
new file mode 100644
index 00000000..d3c2ee7a
--- /dev/null
+++ b/agreement/data/module_category.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="agreement" model="ir.module.category">
+        <field name="name">Agreement</field>
+        <field name="sequence">80</field>
+    </record>
+
+</odoo>
diff --git a/agreement/models/partner_agreement.py b/agreement/models/agreement.py
similarity index 100%
rename from agreement/models/partner_agreement.py
rename to agreement/models/agreement.py
diff --git a/agreement/security/ir.model.access.csv b/agreement/security/ir.model.access.csv
index 996aeba7..13b3a0ed 100644
--- a/agreement/security/ir.model.access.csv
+++ b/agreement/security/ir.model.access.csv
@@ -1,9 +1,17 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_agreement_allusers,agreement all users,model_agreement,,1,1,1,1
-access_agreement_section_allusers,section all users,model_agreement_section,,1,1,1,1
-access_agreement_clause_allusers,clause all users,model_agreement_clause,,1,1,1,1
-access_agreement_stage_allusers,stage all users,model_agreement_stage,,1,1,1,1
-access_agreement_type_allusers,type all users,model_agreement_type,,1,1,1,1
-access_agreement_subtype_allusers,subtype all users,model_agreement_subtype,,1,1,1,1
-access_agreement_renewaltype_allusers,renewaltype all users,model_agreement_renewaltype,,1,1,1,1
-access_agreement_increasetype_allusers,increasetype all users,model_agreement_increasetype,,1,1,1,1
+access_agreement_allusers,agreement all users,model_agreement,agreement.group_agreement_user,1,1,1,0
+access_agreement_allusers,agreement all users,model_agreement,agreement.group_agreement_manager,1,1,1,1
+access_agreement_section_allusers,section all users,model_agreement_section,agreement.group_agreement_user,1,1,1,0
+access_agreement_section_allusers,section all users,model_agreement_section,agreement.group_agreement_manager,1,1,1,1
+access_agreement_clause_allusers,clause all users,model_agreement_clause,agreement.group_agreement_user,1,1,1,0
+access_agreement_clause_allusers,clause all users,model_agreement_clause,agreement.group_agreement_manager,1,1,1,1
+access_agreement_stage_allusers,stage all users,model_agreement_stage,agreement.group_agreement_user,1,0,0,0
+access_agreement_stage_allusers,stage all users,model_agreement_stage,agreement.group_agreement_manager,1,1,1,1
+access_agreement_type_allusers,type all users,model_agreement_type,agreement.group_agreement_user,1,0,0,0
+access_agreement_type_allusers,type all users,model_agreement_type,agreement.group_agreement_manager,1,1,1,1
+access_agreement_subtype_allusers,subtype all users,model_agreement_subtype,agreement.group_agreement_user,1,0,0,0
+access_agreement_subtype_allusers,subtype all users,model_agreement_subtype,agreement.group_agreement_manager,1,1,1,1
+access_agreement_renewaltype_allusers,renewaltype all users,model_agreement_renewaltype,agreement.group_agreement_user,1,0,0,0
+access_agreement_renewaltype_allusers,renewaltype all users,model_agreement_renewaltype,agreement.group_agreement_manager,1,1,1,1
+access_agreement_increasetype_allusers,increasetype all users,model_agreement_increasetype,agreement.group_agreement_user,1,0,0,0
+access_agreement_increasetype_allusers,increasetype all users,model_agreement_increasetype,agreement.group_agreement_manager,1,1,1,1
diff --git a/agreement/security/res_groups.xml b/agreement/security/res_groups.xml
new file mode 100644
index 00000000..a0917b7b
--- /dev/null
+++ b/agreement/security/res_groups.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <!-- User group -->
+    <record id="group_agreement_user" model="res.groups">
+        <field name="name">User</field>
+        <field name="category_id" ref="agreement"/>
+        <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
+    </record>
+
+    <!-- Manager group -->
+    <record id="group_agreement_manager" model="res.groups">
+        <field name="name">Manager</field>
+        <field name="category_id" ref="agreement"/>
+        <field name="implied_ids" eval="[(4, ref('group_agreement_user'))]"/>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
+    </record>
+
+</odoo>
diff --git a/agreement/views/agreement.xml b/agreement/views/agreement.xml
index f05b3b5a..2b42591f 100644
--- a/agreement/views/agreement.xml
+++ b/agreement/views/agreement.xml
@@ -295,34 +295,4 @@
         <field name="view_mode">tree,kanban,form</field>
     </record>
 
-    <!-- Top menu item -->
-    <menuitem
-        name="Agreements"
-        id="partner_agreement_menu_root"
-        web_icon="agreement,static/description/icon.png"
-        sequence="51"/>
-
-    <!-- menu categories -->
-    <menuitem
-        name="Agreements"
-        id="partner_agreement_menu_1"
-        parent="partner_agreement_menu_root"
-        sequence="10"
-        action="partner_agreement_agreement"/>
-    <menuitem
-        name="Templates"
-        id="partner_agreement_menu_4"
-        parent="partner_agreement_menu_root"
-        sequence="20"
-        action="partner_agreement_agreement_templates"/>
-    <menuitem
-        name="Agreement Parts"
-        id="partner_agreement_menu_2"
-        sequence="30"
-        parent="partner_agreement_menu_root"/>
-    <menuitem
-        name="Configuration"
-        id="partner_agreement_menu_3"
-        sequence="40"
-        parent="partner_agreement_menu_root"/>
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/agreement/views/agreement_clause.xml b/agreement/views/agreement_clause.xml
index 90082b43..c25cc404 100644
--- a/agreement/views/agreement_clause.xml
+++ b/agreement/views/agreement_clause.xml
@@ -92,11 +92,4 @@
         <field name="view_mode">tree,pivot,form</field>
     </record>
 
-    <!-- Menu Items -->
-    <menuitem
-        name="Clauses"
-        id="partner_agreement_clauses_menu_1"
-        parent="agreement.partner_agreement_menu_2"
-        sequence="32"
-        action="partner_agreement_action_clause"/>
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/agreement/views/agreement_increasetype.xml b/agreement/views/agreement_increasetype.xml
index 7620ae19..d28cfd8d 100644
--- a/agreement/views/agreement_increasetype.xml
+++ b/agreement/views/agreement_increasetype.xml
@@ -41,11 +41,4 @@
         <field name="view_mode">tree,form</field>
     </record>
 
-    <!-- Menu Items -->
-    <menuitem
-        name="Increase Types"
-        id="partner_agreement_increasetype_menu_1"
-        parent="agreement.partner_agreement_menu_3"
-        sequence="45"
-        action="partner_agreement_action_increasetype"/>
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/agreement/views/agreement_renewaltype.xml b/agreement/views/agreement_renewaltype.xml
index df762c9a..31fa1323 100644
--- a/agreement/views/agreement_renewaltype.xml
+++ b/agreement/views/agreement_renewaltype.xml
@@ -39,11 +39,4 @@
         <field name="view_mode">tree,form</field>
     </record>
 
-    <!-- Menu Items -->
-    <menuitem
-        name="Renewal Types"
-        id="partner_agreement_renewaltype_menu_1"
-        parent="agreement.partner_agreement_menu_3"
-        sequence="44"
-        action="partner_agreement_action_renewaltype"/>
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/agreement/views/agreement_section.xml b/agreement/views/agreement_section.xml
index 7d7cb290..3e3e5f51 100644
--- a/agreement/views/agreement_section.xml
+++ b/agreement/views/agreement_section.xml
@@ -86,11 +86,4 @@
         <field name="view_mode">tree,form</field>
     </record>
 
-    <!-- Menu Items -->
-    <menuitem
-        name="Sections"
-        id="partner_agreement_sections_menu_1"
-        parent="agreement.partner_agreement_menu_2"
-        sequence="31"
-        action="partner_agreement_action_section"/>
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/agreement/views/agreement_stages.xml b/agreement/views/agreement_stages.xml
index 11e15b8d..66f7b094 100644
--- a/agreement/views/agreement_stages.xml
+++ b/agreement/views/agreement_stages.xml
@@ -40,11 +40,4 @@
         <field name="view_mode">tree,form</field>
     </record>
 
-    <!-- Menu Items -->
-    <menuitem
-        name="Stages"
-        id="partner_agreement_stage_menu_1"
-        parent="agreement.partner_agreement_menu_3"
-        sequence="41"
-        action="partner_agreement_action_stage"/>
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/agreement/views/agreement_subtype.xml b/agreement/views/agreement_subtype.xml
index 0024b91a..e6b8ba65 100644
--- a/agreement/views/agreement_subtype.xml
+++ b/agreement/views/agreement_subtype.xml
@@ -39,11 +39,4 @@
         <field name="view_mode">tree,form</field>
     </record>
 
-    <!-- Menu Items -->
-    <menuitem
-        name="Sub-Types"
-        id="partner_agreement_subtype_menu_1"
-        parent="agreement.partner_agreement_menu_3"
-        sequence="43"
-        action="partner_agreement_action_subtype"/>
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/agreement/views/agreement_type.xml b/agreement/views/agreement_type.xml
index 21aeb5a4..2e4d8b72 100644
--- a/agreement/views/agreement_type.xml
+++ b/agreement/views/agreement_type.xml
@@ -39,11 +39,4 @@
         <field name="view_mode">tree,form</field>
     </record>
 
-    <!-- Menu Items -->
-    <menuitem
-        name="Types"
-        id="partner_agreement_type_menu_1"
-        parent="agreement.partner_agreement_menu_3"
-        sequence="42"
-        action="partner_agreement_action_type"/>
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/agreement/views/menu.xml b/agreement/views/menu.xml
new file mode 100644
index 00000000..6e69cbeb
--- /dev/null
+++ b/agreement/views/menu.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0"?>
+<odoo>
+
+    <!-- Top menu item -->
+    <menuitem
+            name="Agreements"
+            id="agreement_root"
+            web_icon="agreement,static/description/icon.png"
+            sequence="80"
+            groups="agreement.group_agreement_user"/>
+
+    <!-- Dashboard -->
+    <menuitem
+            name="Dashboard"
+            id="agreement_dashboard"
+            parent="agreement_root"
+            sequence="10"/>
+
+    <!-- Operations -->
+    <menuitem
+            name="Operations"
+            id="agreement_operations"
+            parent="agreement_root"
+            sequence="20"/>
+    <menuitem
+            name="Agreements"
+            id="agreements"
+            parent="agreement_operations"
+            sequence="10"
+            action="partner_agreement_agreement"/>
+
+    <!-- Master Data -->
+    <menuitem
+            name="Master Data"
+            id="agreement_masterdata"
+            parent="agreement_root"
+            sequence="30"/>
+    <menuitem
+            name="Parts"
+            id="agreement_parts"
+            sequence="10"
+            parent="agreement_masterdata"/>
+    <menuitem
+            name="Clauses"
+            id="agreement_clauses"
+            parent="agreement_masterdata"
+            sequence="20"
+            action="partner_agreement_action_clause"/>
+    <menuitem
+            name="Sections"
+            id="agreement_sections"
+            parent="agreement_masterdata"
+            sequence="30"
+            action="partner_agreement_action_section"/>
+
+    <!-- Reporting -->
+    <menuitem
+            name="Reporting"
+            id="agreement_reporting"
+            sequence="40"
+            parent="agreement_root"
+            groups="agreement.group_agreement_manager"/>
+
+    <!-- Configuration -->
+    <menuitem
+            name="Configuration"
+            id="agreement_configuration"
+            sequence="50"
+            parent="agreement_root"
+            groups="agreement.group_agreement_manager"/>
+    <menuitem
+            name="Templates"
+            id="template"
+            parent="agreement_configuration"
+            sequence="20"
+            action="partner_agreement_agreement_templates"/>
+    <menuitem
+            name="Renewal Types"
+            id="agreement_renewaltype"
+            parent="agreement_configuration"
+            sequence="30"
+            action="partner_agreement_action_renewaltype"/>
+    <menuitem
+            name="Stages"
+            id="agreement_stages"
+            parent="agreement_configuration"
+            sequence="40"
+            action="partner_agreement_action_stage"/>
+    <menuitem
+            name="Types"
+            id="agreement_types"
+            parent="agreement_configuration"
+            sequence="50"
+            action="partner_agreement_action_type"/>
+    <menuitem
+            name="Sub-Types"
+            id="agreement_subtypes"
+            parent="agreement_configuration"
+            sequence="60"
+            action="partner_agreement_action_subtype"/>
+</odoo>