diff --git a/bin/addons/base/module/module_view.xml b/bin/addons/base/module/module_view.xml
index 86ace2bcaf6..6f2155b7c7f 100644
--- a/bin/addons/base/module/module_view.xml
+++ b/bin/addons/base/module/module_view.xml
@@ -90,19 +90,26 @@
                     <field name="name" select="1"/>
                     <field name="certificate" />
                     <field colspan="4" name="shortdesc" select="2"/>
+                    <field name="category_id"/>
+                    <field name="demo" readonly="1"/>
                     <notebook colspan="4">
                         <page string="Module">
-                            <field colspan="4" name="description" select="2"/>
-                            <field name="installed_version"/>
-                            <field name="latest_version"/>
-                            <field name="author" select="2"/>
-                            <field name="website" select="2" widget="url"/>
-                            <field name="maintainer" attrs="{'invisible': [('maintainer', '=', False)]}"/>
-                            <field name="url" widget="url"/>
-                            <field name="contributors" widget="char" attrs="{'invisible': [('contributors', '=', False)]}"/>
-                            <field name="published_version"/>
-                            <field name="license"/>
-                            <field name="demo" readonly="1"/>
+                            <group colspan="4" col="4">
+                                <group colspan="2" col="2">
+                                    <separator string="Author" colspan="2"/>
+                                    <field name="author" select="2"/>
+                                    <field name="license"/>
+                                    <field name="website" select="2" widget="url" string="Author Website"/>
+                                </group>
+                                <group colspan="2" col="2">
+                                    <separator string="Version" colspan="2"/>
+                                    <field name="installed_version"/>
+                                    <field name="latest_version"/>
+                                    <field name="published_version"/>
+                                </group>
+                            </group>
+                            <separator string="Description" colspan="4"/>
+                            <field colspan="4" name="description" select="2" nolabel="1"/>
                             <newline/>
                             <field name="state" readonly="1" select="1"/>
                             <group col="6" colspan="2">
diff --git a/bin/addons/base/module/wizard/wizard_module_import.py b/bin/addons/base/module/wizard/wizard_module_import.py
index 1350a4ad0ba..6c35822fd0f 100644
--- a/bin/addons/base/module/wizard/wizard_module_import.py
+++ b/bin/addons/base/module/wizard/wizard_module_import.py
@@ -93,7 +93,7 @@ class move_module_wizard(wizard.interface):
                 'arch': ask_form,
                 'fields': ask_fields,
                 'state': [
-                    ('end', 'Cancel', 'gtk-cancel'),
+                    ('end', 'Close', 'gtk-cancel'),
                     ('import', 'Import module', 'gtk-ok', True)
                 ]
             }
diff --git a/bin/addons/base/module/wizard/wizard_update_module.py b/bin/addons/base/module/wizard/wizard_update_module.py
index 22e52bb6d6d..6526074852e 100644
--- a/bin/addons/base/module/wizard/wizard_update_module.py
+++ b/bin/addons/base/module/wizard/wizard_update_module.py
@@ -71,7 +71,7 @@ class wizard_update_module(wizard.interface):
             'actions': [],
             'result': {'type': 'form', 'arch': arch, 'fields': fields,
                 'state': [
-                    ('end', 'Cancel', 'gtk-cancel'),
+                    ('end', 'Close', 'gtk-cancel'),
                     ('update', 'Check new modules', 'gtk-ok', True)
                 ]
             }