diff --git a/web_widget_x2many_2d_matrix_example/README.rst b/web_widget_x2many_2d_matrix_example/README.rst
index 4f8000d9..f389992c 100644
--- a/web_widget_x2many_2d_matrix_example/README.rst
+++ b/web_widget_x2many_2d_matrix_example/README.rst
@@ -23,7 +23,7 @@ Contributors
 ------------
 
 * Simone Orsi <simone.orsi@camptocamp.com>
-
+* Anand Kansagra <kansagraanand@hotmail.com>
 
 Maintainer
 ----------
diff --git a/web_widget_x2many_2d_matrix_example/__init__.py b/web_widget_x2many_2d_matrix_example/__init__.py
index 9b429614..d6c56a95 100644
--- a/web_widget_x2many_2d_matrix_example/__init__.py
+++ b/web_widget_x2many_2d_matrix_example/__init__.py
@@ -1,2 +1,3 @@
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 from . import models
 from . import wizard
diff --git a/web_widget_x2many_2d_matrix_example/__manifest__.py b/web_widget_x2many_2d_matrix_example/__manifest__.py
index 75567396..fb1c5077 100644
--- a/web_widget_x2many_2d_matrix_example/__manifest__.py
+++ b/web_widget_x2many_2d_matrix_example/__manifest__.py
@@ -1,7 +1,8 @@
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     'name': 'web_widget_x2many_2d_matrix example',
     'summary': "A small example on how to use `web_widget_x2many_2d_matrix`.",
-    "version": "11.0.1.0.0",
+    "version": "12.0.1.0.0",
     "author": "Camptocamp, "
               "Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/web",
diff --git a/web_widget_x2many_2d_matrix_example/i18n/web_widget_x2many_2d_matrix_example.pot b/web_widget_x2many_2d_matrix_example/i18n/web_widget_x2many_2d_matrix_example.pot
index c7dc0a4b..e6d7b096 100644
--- a/web_widget_x2many_2d_matrix_example/i18n/web_widget_x2many_2d_matrix_example.pot
+++ b/web_widget_x2many_2d_matrix_example/i18n/web_widget_x2many_2d_matrix_example.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 11.0\n"
+"Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
diff --git a/web_widget_x2many_2d_matrix_example/models/__init__.py b/web_widget_x2many_2d_matrix_example/models/__init__.py
index a23d8c46..bf8b6ac4 100644
--- a/web_widget_x2many_2d_matrix_example/models/__init__.py
+++ b/web_widget_x2many_2d_matrix_example/models/__init__.py
@@ -1 +1,2 @@
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 from . import x2m_demo
diff --git a/web_widget_x2many_2d_matrix_example/models/x2m_demo.py b/web_widget_x2many_2d_matrix_example/models/x2m_demo.py
index 039f5a75..bfe88430 100644
--- a/web_widget_x2many_2d_matrix_example/models/x2m_demo.py
+++ b/web_widget_x2many_2d_matrix_example/models/x2m_demo.py
@@ -1,8 +1,10 @@
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 from odoo import models, api, fields
 
 
 class X2MDemo(models.Model):
     _name = 'x2m.demo'
+    _description = 'X2Many Demo'
 
     name = fields.Char()
     line_ids = fields.One2many('x2m.demo.line', 'demo_id')
@@ -24,6 +26,7 @@ class X2MDemo(models.Model):
 
 class X2MDemoLine(models.Model):
     _name = 'x2m.demo.line'
+    _description = 'X2Many Demo Line'
 
     name = fields.Char()
     demo_id = fields.Many2one('x2m.demo')
diff --git a/web_widget_x2many_2d_matrix_example/readme/CONTRIBUTORS.rst b/web_widget_x2many_2d_matrix_example/readme/CONTRIBUTORS.rst
new file mode 100644
index 00000000..1fee00cb
--- /dev/null
+++ b/web_widget_x2many_2d_matrix_example/readme/CONTRIBUTORS.rst
@@ -0,0 +1,2 @@
+* Simone Orsi <simone.orsi@camptocamp.com>
+* Anand Kansagra <kansagraanand@hotmail.com>
diff --git a/web_widget_x2many_2d_matrix_example/readme/DESCRIPTION.rst b/web_widget_x2many_2d_matrix_example/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..1af8b59e
--- /dev/null
+++ b/web_widget_x2many_2d_matrix_example/readme/DESCRIPTION.rst
@@ -0,0 +1 @@
+Install it and click on the menu item `Demo x2m matrix widget`.
diff --git a/web_widget_x2many_2d_matrix_example/static/description/icon.png b/web_widget_x2many_2d_matrix_example/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/web_widget_x2many_2d_matrix_example/static/description/icon.png differ
diff --git a/web_widget_x2many_2d_matrix_example/views/x2m_demo.xml b/web_widget_x2many_2d_matrix_example/views/x2m_demo.xml
index 8f6805b6..0149c0de 100644
--- a/web_widget_x2many_2d_matrix_example/views/x2m_demo.xml
+++ b/web_widget_x2many_2d_matrix_example/views/x2m_demo.xml
@@ -1,54 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-  <record id="view_x2m_demo_form" model="ir.ui.view">
-    <field name="name">x2m.demo.form</field>
-    <field name="model">x2m.demo</field>
-    <field name="arch" type="xml">
-      <form>
-        <sheet>
-          <group>
-            <field name="name" />
-            <field name="line_ids">
-              <tree>
-                <field name="name" />
-                <field name="value" />
-                <field name="user_id" />
-              </tree>
-            </field>
-          </group>
-          <footer>
-            <button name="open_x2m_matrix" type="object"
-                    string="Try x2m 2d matrix"
-                    class="oe_stat_button" icon="fa-edit" />
-          </footer>
-        </sheet>
-      </form>
-    </field>
-  </record>
+    <record id="view_x2m_demo_form" model="ir.ui.view">
+        <field name="name">x2m.demo.form</field>
+        <field name="model">x2m.demo</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet>
+                    <group>
+                        <field name="name"/>
+                        <field name="line_ids">
+                            <tree>
+                                <field name="name"/>
+                                <field name="value"/>
+                                <field name="user_id"/>
+                            </tree>
+                        </field>
+                    </group>
+                    <footer>
+                        <button name="open_x2m_matrix" type="object"
+                                string="Try x2m 2d matrix"
+                                class="oe_stat_button" icon="fa-edit"/>
+                    </footer>
+                </sheet>
+            </form>
+        </field>
+    </record>
 
-  <record model="ir.ui.view" id="view_x2m_demo_tree">
-    <field name="name">Demo - Tree</field>
-    <field name="model">x2m.demo</field>
-    <field name="arch" type="xml">
-      <tree>
-        <field name="name" />
-      </tree>
-    </field>
-  </record>
+    <record model="ir.ui.view" id="view_x2m_demo_tree">
+        <field name="name">Demo - Tree</field>
+        <field name="model">x2m.demo</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="name"/>
+            </tree>
+        </field>
+    </record>
 
-  <record id="action_x2m_demo" model="ir.actions.act_window">
-    <field name="name">Demo</field>
-    <field name="res_model">x2m.demo</field>
-    <field name="view_type">form</field>
-    <field name="view_mode">tree,form</field>
-    <field name="view_id" ref="view_x2m_demo_tree"/>
-  </record>
+    <record id="action_x2m_demo" model="ir.actions.act_window">
+        <field name="name">Demo</field>
+        <field name="res_model">x2m.demo</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_id" ref="view_x2m_demo_tree"/>
+    </record>
 
-  <menuitem
+    <menuitem
     id="base_matrix_widget_menu"
     name="Demo x2m matrix widget"
-    action="action_x2m_demo"
-    />
+    action="action_x2m_demo"/>
 
 </odoo>
diff --git a/web_widget_x2many_2d_matrix_example/wizard/__init__.py b/web_widget_x2many_2d_matrix_example/wizard/__init__.py
index 68ebaf69..e8c3b455 100644
--- a/web_widget_x2many_2d_matrix_example/wizard/__init__.py
+++ b/web_widget_x2many_2d_matrix_example/wizard/__init__.py
@@ -1 +1,2 @@
-from . import demo_wizard
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from . import x2m_matrix
diff --git a/web_widget_x2many_2d_matrix_example/wizard/demo_wizard.py b/web_widget_x2many_2d_matrix_example/wizard/x2m_matrix.py
similarity index 85%
rename from web_widget_x2many_2d_matrix_example/wizard/demo_wizard.py
rename to web_widget_x2many_2d_matrix_example/wizard/x2m_matrix.py
index 267bcd6e..84e80d48 100644
--- a/web_widget_x2many_2d_matrix_example/wizard/demo_wizard.py
+++ b/web_widget_x2many_2d_matrix_example/wizard/x2m_matrix.py
@@ -1,8 +1,10 @@
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 from odoo import fields, models
 
 
-class DemoWizard(models.TransientModel):
+class X2mMatrixDemoWiz(models.TransientModel):
     _name = 'x2m.matrix.demo.wiz'
+    _description = 'X2Many Matrix Demo Wizard'
 
     line_ids = fields.Many2many(
         'x2m.demo.line', default=lambda self: self._default_line_ids())
diff --git a/web_widget_x2many_2d_matrix_example/wizard/x2m_matrix.xml b/web_widget_x2many_2d_matrix_example/wizard/x2m_matrix.xml
index db0c02ee..226de82b 100644
--- a/web_widget_x2many_2d_matrix_example/wizard/x2m_matrix.xml
+++ b/web_widget_x2many_2d_matrix_example/wizard/x2m_matrix.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-  <record id="x2many_2d_matrix_demo" model="ir.ui.view">
-    <field name="name">x2m.matrix.demo.wiz</field>
-    <field name="model">x2m.matrix.demo.wiz</field>
-    <field name="type">form</field>
-    <field name="arch" type="xml">
-      <form>
-        <field name="line_ids" widget="x2many_2d_matrix" field_x_axis="demo_id" field_y_axis="user_id" field_value="value">
-          <tree>
-            <field name="demo_id"/>
-            <field name="user_id"/>
-            <field name="value"/>
-          </tree>
+    <record id="x2many_2d_matrix_demo" model="ir.ui.view">
+        <field name="name">x2m.matrix.demo.wiz</field>
+        <field name="model">x2m.matrix.demo.wiz</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form>
+                <field name="line_ids" widget="x2many_2d_matrix"
+                       field_x_axis="demo_id" field_y_axis="user_id" field_value="value">
+                    <tree>
+                        <field name="demo_id"/>
+                        <field name="user_id"/>
+                        <field name="value"/>
+                    </tree>
+                </field>
+            </form>
         </field>
-      </form>
-    </field>
-  </record>
+    </record>
 
 </odoo>