diff --git a/sign_oca/__manifest__.py b/sign_oca/__manifest__.py
index 98ee7ee9..3487603e 100644
--- a/sign_oca/__manifest__.py
+++ b/sign_oca/__manifest__.py
@@ -14,10 +14,10 @@
         "security/security.xml",
         "views/menu.xml",
         "data/data.xml",
-        "wizards/res_config_settings_views.xml",
         "data/ir_sequence_data.xml",
         "wizards/sign_oca_template_generate.xml",
         "wizards/sign_oca_template_generate_multi.xml",
+        "views/res_config_settings_views.xml",
         "views/res_partner_views.xml",
         "views/sign_oca_request_log.xml",
         "views/sign_oca_request.xml",
diff --git a/sign_oca/models/__init__.py b/sign_oca/models/__init__.py
index 1cbaaba0..302e081f 100644
--- a/sign_oca/models/__init__.py
+++ b/sign_oca/models/__init__.py
@@ -1,4 +1,5 @@
 from . import res_company
+from . import res_config_settings
 from . import res_users
 from . import res_partner
 from . import sign_oca_template
diff --git a/sign_oca/wizards/res_config_settings.py b/sign_oca/models/res_config_settings.py
similarity index 100%
rename from sign_oca/wizards/res_config_settings.py
rename to sign_oca/models/res_config_settings.py
diff --git a/sign_oca/views/menu.xml b/sign_oca/views/menu.xml
index 582d40db..54ed3c8b 100644
--- a/sign_oca/views/menu.xml
+++ b/sign_oca/views/menu.xml
@@ -13,10 +13,11 @@
         sequence="16"
         groups="sign_oca.sign_oca_group_user"
     />
-    <record model="ir.ui.menu" id="sign_oca_settings_menu">
-        <field name="name">Settings</field>
-        <field name="sequence" eval="90" />
-        <field name="parent_id" ref="sign_oca_root_menu" />
-        <field name="groups_id" eval="[(6,0,[ref('sign_oca.sign_oca_group_admin')])]" />
-    </record>
+    <menuitem
+        name="Settings"
+        id="sign_oca_settings_menu"
+        parent="sign_oca_root_menu"
+        sequence="90"
+        groups="sign_oca.sign_oca_group_admin"
+    />
 </odoo>
diff --git a/sign_oca/wizards/res_config_settings_views.xml b/sign_oca/views/res_config_settings_views.xml
similarity index 73%
rename from sign_oca/wizards/res_config_settings_views.xml
rename to sign_oca/views/res_config_settings_views.xml
index ac400800..8a1146ec 100644
--- a/sign_oca/wizards/res_config_settings_views.xml
+++ b/sign_oca/views/res_config_settings_views.xml
@@ -33,4 +33,19 @@
             </xpath>
         </field>
     </record>
+    <record id="sign_oca_general_settings_act_window" model="ir.actions.act_window">
+        <field name="name">General Settings</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">res.config.settings</field>
+        <field name="view_mode">form</field>
+        <field name="target">inline</field>
+        <field name="context">{'module' : 'sign_oca'}</field>
+    </record>
+    <menuitem
+        name="General settings"
+        id="sign_oca_general_settings_menu"
+        parent="sign_oca_settings_menu"
+        sequence="1"
+        action="sign_oca_general_settings_act_window"
+    />
 </odoo>
diff --git a/sign_oca/views/sign_oca_field.xml b/sign_oca/views/sign_oca_field.xml
index c7a94150..73a571c4 100644
--- a/sign_oca/views/sign_oca_field.xml
+++ b/sign_oca/views/sign_oca_field.xml
@@ -50,12 +50,11 @@
         <field name="domain">[]</field>
         <field name="context">{}</field>
     </record>
-
-    <record model="ir.ui.menu" id="sign_oca_field_menu">
-        <field name="name">Fields</field>
-        <field name="parent_id" ref="sign_oca_settings_menu" /> <!-- TODO -->
-        <field name="action" ref="sign_oca_field_act_window" />
-        <field name="sequence" eval="16" /> <!-- TODO -->
-    </record>
-
+    <menuitem
+        name="Fields"
+        id="sign_oca_field_menu"
+        parent="sign_oca_settings_menu"
+        sequence="16"
+        action="sign_oca_field_act_window"
+    />
 </odoo>
diff --git a/sign_oca/views/sign_oca_role.xml b/sign_oca/views/sign_oca_role.xml
index 716b2016..839fcf73 100644
--- a/sign_oca/views/sign_oca_role.xml
+++ b/sign_oca/views/sign_oca_role.xml
@@ -61,12 +61,11 @@
         <field name="domain">[]</field>
         <field name="context">{}</field>
     </record>
-
-    <record model="ir.ui.menu" id="sign_oca_role_menu">
-        <field name="name">Roles</field>
-        <field name="parent_id" ref="sign_oca_settings_menu" />
-        <field name="action" ref="sign_oca_role_act_window" />
-        <field name="sequence" eval="16" />
-    </record>
-
+    <menuitem
+        name="Roles"
+        id="sign_oca_role_menu"
+        parent="sign_oca_settings_menu"
+        sequence="17"
+        action="sign_oca_role_act_window"
+    />
 </odoo>
diff --git a/sign_oca/wizards/__init__.py b/sign_oca/wizards/__init__.py
index 8d660153..b173f2c6 100644
--- a/sign_oca/wizards/__init__.py
+++ b/sign_oca/wizards/__init__.py
@@ -1,3 +1,2 @@
-from . import res_config_settings
 from . import sign_oca_template_generate
 from . import sign_oca_template_generate_multi