diff --git a/bi_sql_editor/README.rst b/bi_sql_editor/README.rst
index 01f21e17..2eb6b3fe 100644
--- a/bi_sql_editor/README.rst
+++ b/bi_sql_editor/README.rst
@@ -77,7 +77,8 @@ To configure this module, you need to:
 * Click on the button 'Create SQL View, Indexes and Models'. (this step could
   take a while, if view is materialized)
 
-* If it's a MATERIALIZED view: 
+* If it's a MATERIALIZED view:
+
     * a cron task is created to refresh
       the view. You can so define the frequency of the refresh.
     * the size of view (and the indexes is displayed)
@@ -93,9 +94,9 @@ Usage
 
 To use this module, you need to:
 
-* Go to 'Reporting' / 'Custom Reports' 
+#. Go to 'Reporting' / 'Custom Reports'
 
-* select the desired report
+#. Select the desired report
 
   .. figure:: /bi_sql_editor/static/description/05_reporting_pivot.png
      :width: 800 px
diff --git a/bi_sql_editor/__openerp__.py b/bi_sql_editor/__openerp__.py
index a69a1cad..8670ca6e 100644
--- a/bi_sql_editor/__openerp__.py
+++ b/bi_sql_editor/__openerp__.py
@@ -21,8 +21,8 @@
         'views/menu.xml',
     ],
     'demo': [
-        'demo/res_groups.xml',
-        'demo/bi_sql_view.xml',
+        'demo/res_groups_demo.xml',
+        'demo/bi_sql_view_demo.xml',
     ],
     'installable': True,
 }
diff --git a/bi_sql_editor/demo/bi_sql_view.xml b/bi_sql_editor/demo/bi_sql_view_demo.xml
similarity index 100%
rename from bi_sql_editor/demo/bi_sql_view.xml
rename to bi_sql_editor/demo/bi_sql_view_demo.xml
diff --git a/bi_sql_editor/demo/res_groups.xml b/bi_sql_editor/demo/res_groups.xml
deleted file mode 100644
index 2e9eadeb..00000000
--- a/bi_sql_editor/demo/res_groups.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (C) 2014 - Today GRAP (http://www.grap.coop)
-@author Sylvain LE GAL (https://twitter.com/legalsylvain)
-License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
--->
-
-<openerp><data>
-
-    <record id="base.group_no_one" model="res.groups">
-        <field name="users" eval="[(4, ref('base.user_root'))]" />
-    </record>
-
-    <record id="sql_request_abstract.group_sql_request_user" model="res.groups">
-        <field name="users" eval="[(4, ref('base.user_demo'))]" />
-    </record>
-
-</data></openerp>
diff --git a/bi_sql_editor/demo/res_groups_demo.xml b/bi_sql_editor/demo/res_groups_demo.xml
new file mode 100644
index 00000000..0a3803c5
--- /dev/null
+++ b/bi_sql_editor/demo/res_groups_demo.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (C) 2014 - Today GRAP (http://www.grap.coop)
+@author Sylvain LE GAL (https://twitter.com/legalsylvain)
+License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+-->
+
+<odoo>
+    <data>
+        <record id="base.group_no_one" model="res.groups">
+            <field name="users" eval="[(4, ref('base.user_root'))]" />
+        </record>
+
+        <record id="sql_request_abstract.group_sql_request_user" model="res.groups">
+            <field name="users" eval="[(4, ref('base.user_demo'))]" />
+        </record>
+    </data>
+</odoo>
diff --git a/bi_sql_editor/models/bi_sql_view.py b/bi_sql_editor/models/bi_sql_view.py
index ec873452..048c4d42 100644
--- a/bi_sql_editor/models/bi_sql_view.py
+++ b/bi_sql_editor/models/bi_sql_view.py
@@ -27,14 +27,14 @@ class BiSQLView(models.Model):
 
     _STATE_SQL_EDITOR = [
         ('model_valid', 'SQL View and Model Created'),
-        ('ui_valid', 'Graph, action and Menu Created'),
+        ('ui_valid', 'Views, Action and Menu Created'),
     ]
 
     technical_name = fields.Char(
         string='Technical Name', required=True,
-        help="Suffix of the SQL view. (SQL full name will be computed and"
-        " prefixed by 'x_bi_sql_view_'. Should have correct"
-        "syntax. For more information, see https://www.postgresql.org/"
+        help="Suffix of the SQL view. SQL full name will be computed and"
+        " prefixed by 'x_bi_sql_view_'. Syntax should follow: "
+        "https://www.postgresql.org/"
         "docs/current/static/sql-syntax-lexical.html#SQL-SYNTAX-IDENTIFIERS")
 
     view_name = fields.Char(
diff --git a/bi_sql_editor/models/bi_sql_view_field.py b/bi_sql_editor/models/bi_sql_view_field.py
index 5c464e13..df8c9e6e 100644
--- a/bi_sql_editor/models/bi_sql_view_field.py
+++ b/bi_sql_editor/models/bi_sql_view_field.py
@@ -84,7 +84,7 @@ class BiSQLViewField(models.Model):
 
     ttype = fields.Selection(
         string='Field Type', selection=_TTYPE_SELECTION, help="Type of the"
-        " Odoo field that will be created. Let empty if you don't want to"
+        " Odoo field that will be created. Keep empty if you don't want to"
         " create a new field. If empty, this field will not be displayed"
         " neither available for search or group by function")
 
@@ -98,7 +98,7 @@ class BiSQLViewField(models.Model):
     many2one_model_id = fields.Many2one(
         comodel_name='ir.model', string='Model',
         help="For 'Many2one' Odoo field.\n"
-        " Co Model of the field.")
+        " Comodel of the field.")
 
     # Compute Section
     @api.multi