diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index e823e529e62..8fb9c4d7091 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -21,25 +21,23 @@
 
 from openerp.osv import fields, osv
 
-from datetime import date
-
 GAMIFICATION_GOAL_STATE = [
-    ('inprogress','In progress'),
-    ('reached','Reached'),
-    ('failed','Failed'),
+    ('inprogress', 'In progress'),
+    ('reached', 'Reached'),
+    ('failed', 'Failed'),
 ]
 
 GAMIFICATION_PLAN_STATE = [
-    ('draft','Draft'),
-    ('inprogress','In progress'),
-    ('done','Done'),
+    ('draft', 'Draft'),
+    ('inprogress', 'In progress'),
+    ('done', 'Done'),
 ]
 
 GAMIFICATION_PERIOD_STATE = [
-    ('once','Manual'),
-    ('daily','Daily'),
-    ('weekly','Weekly'),
-    ('monthly','Monthly'),
+    ('once', 'Manual'),
+    ('daily', 'Daily'),
+    ('weekly', 'Weekly'),
+    ('monthly', 'Monthly'),
     ('yearly', 'Yearly')
 ]
 
diff --git a/addons/gamification/view/goal.xml b/addons/gamification/view/goal.xml
index e582ff853f0..a788fdecd87 100644
--- a/addons/gamification/view/goal.xml
+++ b/addons/gamification/view/goal.xml
@@ -6,6 +6,15 @@
             <field name="res_model">gamification.goal</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="context">{'search_default_my_in_progress': 1}</field>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                    Click to create a goal. 
+                </p>
+                <p>
+                    A goal is defined by a user and a goal type.
+                    Goals can be created automatically by using goal plans.
+                </p>
+            </field>
         </record>
 
         <record id="goal_list_view" model="ir.ui.view">
diff --git a/addons/gamification/view/plan.xml b/addons/gamification/view/plan.xml
index dc79a6b44fc..109b8ef3319 100644
--- a/addons/gamification/view/plan.xml
+++ b/addons/gamification/view/plan.xml
@@ -6,7 +6,18 @@
             <field name="name">Goal Plans</field>
             <field name="res_model">gamification.goal.plan</field>
             <field name="view_mode">tree,form</field>
-            <field name="context">{'search_default_in_progress': 1}</field>
+            <field name="context">{'search_default_draft_active': 1}</field>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                    Click to create a goal plan. 
+                </p>
+                <p>
+                    Goal plans allow to create and assign to users easily a list of goals.
+                    A goal plan is a predifined list of goals types with a target value.
+                    The plan can use a period (weekly, monthly...) for automatic creation of goals.
+                    The goals are created for the specified users or memeber of the group.
+                </p>
+            </field>
         </record>
 
         <record id="goal_plan_list_view" model="ir.ui.view">
@@ -123,8 +134,8 @@
             <field name="model">gamification.goal.plan</field>
             <field name="arch" type="xml">
                 <search string="Search Goal Plans">
-                    <filter name="in_progress" string="Plans in Progress"
-                        domain="[('state', '=', 'inprogress')]"/>
+                    <filter name="draft_active" string="Draft or Active Plans"
+                        domain="[('state', 'in', ('inprogress', 'draft'))]"/>
                     <field name="name"/>
                     <group expand="0" string="Group By...">
                         <filter string="State" domain="[]" context="{'group_by':'state'}"/>
diff --git a/addons/gamification/view/type.xml b/addons/gamification/view/type.xml
index 0740e5735cc..9a6f1029ef2 100644
--- a/addons/gamification/view/type.xml
+++ b/addons/gamification/view/type.xml
@@ -6,6 +6,15 @@
             <field name="name">Goal Types</field>
             <field name="res_model">gamification.goal.type</field>
             <field name="view_mode">tree,form</field>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                    Click to create a goal type. 
+                </p>
+                <p>
+                    A goal type is a technical model of goal defining a condition to reach.
+                    The dates, values to reach or users are defined in goal instance.
+                </p>
+            </field>
         </record>
 
         <record id="goal_type_list_view" model="ir.ui.view">