diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index cd009c189f2..a681caa6ecf 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -140,7 +140,7 @@ class gamification_badge(osv.Model):
                 ('everyone', 'Everyone'),
                 ('users', 'A selected list of users'),
                 ('having', 'People having some badges'),
-                ('nobody', 'Nobody'),
+                ('nobody', 'No one'),
             ],
             string="User Authorization Rule",
             help="Who can grant this badge",
@@ -153,18 +153,19 @@ class gamification_badge(osv.Model):
             string='Required Badges',
             help="Only the people having these badges can give this badge"),
 
-        'rule_max': fields.boolean('Limited Sending',
+        'rule_max': fields.boolean('Monthly Limited Sending',
             help="Check to set a monthly limit per person of sending this badge"),
         'rule_max_number': fields.integer('Limitation Number',
             help="The maximum number of time this badge can be sent per month per person."),
         'stat_my_monthly_sending': fields.function(_get_month_my_sent,
+            type="integer",
             string='My Monthly Sending Total',
             help="The number of time the current user has sent this badge this month."),
 
         'rule_automatic': fields.selection([
-                ('manual', 'Given by Users Only'),
-                ('goals', 'List of Goals'),
-                ('python', 'Python Code'),
+                ('goals', 'List of goals to reach'),
+                ('python', 'Custom python code executed'),
+                ('manual', 'Not automatic'),
             ],
             string="Automatic Rule",
             help="Can this badge be automatically rewarded",
@@ -184,16 +185,21 @@ class gamification_badge(osv.Model):
             type="many2many", relation="res.users"),
 
         'stat_count': fields.function(_get_global_count, string='Total',
+            type="integer",
             help="The number of time this badge has been received."),
         'stat_count_distinct': fields.function(_get_unique_global_count,
-            string='Unique Count',
+            type="integer",
+            string='Number of users',
             help="The number of time this badge has been received by individual users."),
         'stat_this_month': fields.function(_get_month_count,
-            string='Monthly Count',
+            type="integer",
+            string='Monthly total',
             help="The number of time this badge has been received this month."),
         'stat_my': fields.function(_get_global_my_count, string='My Total',
+            type="integer",
             help="The number of time the current user has received this badge."),
         'stat_my_this_month': fields.function(_get_month_my_count,
+            type="integer",
             string='My Monthly Total',
             help="The number of time the current user has received this badge this month."),
     }
diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index d3e206b795f..a590308cc5f 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -85,27 +85,33 @@
                             </h1>
                         </div>
                         <group>
-                            <field name="description" />
+                            <field name="description" nolabel="1" placeholder="Badge Description" />
                         </group>
                         <group string="User Rules">
-                            <field name="rule_auth" string="Allowed to Grant" />
+                            <field name="rule_auth" string="Allowed to Grant" widget="radio" />
                             <field name="rule_auth_user_ids" attrs="{'invisible': [('rule_auth','!=','users')]}" widget="many2many_tags" />
                             <field name="rule_auth_badge_ids" attrs="{'invisible': [('rule_auth','!=','having')]}" widget="many2many_tags" />
                             <field name="rule_max" attrs="{'invisible': [('rule_auth','=','nobody')]}" />
                             <field name="rule_max_number" attrs="{'invisible': ['|',('rule_max','=',False),('rule_auth','=','nobody')]}"/>
+                                                        <field name="stat_my_monthly_sending" attrs="{'invisible': [('rule_auth','=','nobody')]}"/>
+
                         </group>
                         <group string="Automatic Rules">
-                            <field name="rule_automatic"/>
+                            <field name="rule_automatic" widget="radio"/>
                             <field name="compute_code" attrs="{'invisible': [('rule_automatic','!=','python')]}"/>
                             <field name="goal_type_ids" attrs="{'invisible': [('rule_automatic','!=','goals')]}" widget="many2many_tags"/>
                         </group>
-                        <group string="Stats">
-                            <field name="stat_count"/>
-                            <field name="stat_count_distinct"/>
-                            <field name="stat_this_month"/>
-                            <field name="stat_my"/>
-                            <field name="stat_my_this_month"/>
-                            <field name="stat_my_monthly_sending"/>
+                        <group string="Statistics">
+                            <group>
+                                <field name="stat_count"/>
+                                <field name="stat_this_month"/>
+                                <field name="stat_count_distinct"/>
+                            </group>
+                            <group>
+                                <field name="stat_my"/>
+                                <field name="stat_my_this_month"/>
+
+                            </group>
                         </group>
                     </sheet>
                 </form>
diff --git a/addons/gamification/goal_view.xml b/addons/gamification/goal_view.xml
index b892a8d9f03..20846802726 100644
--- a/addons/gamification/goal_view.xml
+++ b/addons/gamification/goal_view.xml
@@ -54,7 +54,7 @@
                             <group string="Reference">
                                 <field name="type_id" on_change="on_change_type_id(type_id)" attrs="{'readonly':[('state','!=','draft')]}"/>
                                 <field name="user_id" attrs="{'readonly':[('state','!=','draft')]}"/>
-                                <field name="planline_id" groups="base.group_no_one"  attrs="{'readonly':[('state','!=','draft')]}"/>
+                                <field name="plan_id" attrs="{'readonly':[('state','!=','draft')]}"/>
                             </group>
                             <group string="Schedule">
                                 <field name="start_date" attrs="{'readonly':[('state','!=','draft')]}"/>
@@ -69,13 +69,16 @@
                                 <field name="last_update" groups="base.group_no_one"/>
                             </group>
                             <group string="Data" colspan="4">
-                                <field name="target_goal" attrs="{'readonly':[('state','!=','draft')]}"/>
+                                <field name="target_goal" attrs="{'readonly':[('state','!=','draft')]}" class="oe_inline"/>
                                 <label for="current" />
                                 <div>
                                     <field name="current"  attrs="{'readonly':[('computation_mode','!=','manually')]}" class="oe_inline"/>
                                     <button string="Refresh state" type="object" name="update" class="oe_highlight oe_inline" attrs="{'invisible':['|',('computation_mode', '=', 'manually'),('state', '=', 'draft')]}"/>
                                     <button name="write" type="object" string="The current value is up to date" help="Indicate that the current value of the manual goal is still correct and avoid reminders" attrs="{'invisible':['|',('computation_mode','!=', 'manually'),('state','=','draft')]}"/>
                                 </div>
+                                <field name="type_condition"/>
+                                <field name="type_suffix"/>
+                                <field name="type_ponctual"/>
                             </group>
                         </group>
                     </sheet>
@@ -166,9 +169,9 @@
                                             </t>
                                             <t t-if="record.type_condition.raw_value != 'higher'">
                                                 <div class="oe_goal_state">
-                                                    <t t-esc="record.current.raw_value" /> → <t t-esc="record.target_goal.raw_value" />
+                                                    <t t-esc="record.current.raw_value" />
                                                 </div>
-                                                <em>reached when lower than</em>
+                                                <em>reached when lower than <t t-esc="record.target_goal.raw_value" /></em>
                                             </t>
                                         </t>
                                         
diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index 32d2eb2c7d0..82a0d60b903 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -1,7 +1,7 @@
 /* Kanban views */
 .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_goal,
 .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_badge {
-  width: 200px;
+  width: 220px;
   min-height: 200px;
 }
 .oe_kanban_badge_avatars {
diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js
index c743d39282a..44af26550a0 100644
--- a/addons/gamification/static/src/js/gamification.js
+++ b/addons/gamification/static/src/js/gamification.js
@@ -123,7 +123,6 @@ openerp.gamification = function(instance) {
                 if (self.view.dataset.model === 'gamification.goal' && self.$el.find('.oe_goal_gauge').length == 1) {
                     var unique_id = _.uniqueId("goal_gauge_");
                     self.$el.find('.oe_goal_gauge').attr('id', unique_id);
-                    console.log(self.record);
                     var g = new JustGage({
                         id: unique_id,
                         node: self.$el.find('.oe_goal_gauge').empty().get(0),
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 5f8f6e599c7..1adff3ccc22 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -423,13 +423,16 @@
         </record>
 
 
-        <record model="ir.actions.act_window" id="gamification.goal_plan_list_action">
+        <record id="goal_plan_list_action2" model="ir.actions.act_window">
+            <field name="name">Goal Plans</field>
             <field name="domain">[('category', '=', 'hr')]</field>
+            <field name="res_model">gamification.goal.plan</field>
+            <field name="view_mode">kanban,form</field>
         </record>
 
         <menuitem name="Interview Requests" parent="menu_eval_hr" id="menu_open_hr_evaluation_interview_requests"
             action="action_hr_evaluation_interview_tree"/>
-        <menuitem id="gamification_plan_menu_hr" parent="menu_eval_hr" action="gamification.goal_plan_list_action" groups="gamification.group_goal_manager"/>
+        <menuitem id="gamification_plan_menu_hr" parent="menu_eval_hr" action="goal_plan_list_action2" groups="gamification.group_goal_manager"/>
         <menuitem id="gamification_goal_menu_hr" parent="menu_eval_hr" action="goals_menu_groupby_act" groups="gamification.group_goal_manager"/>
 
       <!-- Email Compose message Action-->
diff --git a/addons/hr_gamification/badge_view.xml b/addons/hr_gamification/badge_view.xml
index 98be93e0279..1f47bd74d6f 100644
--- a/addons/hr_gamification/badge_view.xml
+++ b/addons/hr_gamification/badge_view.xml
@@ -34,7 +34,7 @@
                     What are you thank for?
                     <group>
                         <field name="employee_id" invisible="1" />
-                        <field name="badge_id" nolabel="1" />
+                        <field name="badge_id" nolabel="1" colspan="4" />
                         <field name="comment" nolabel="1" placeholder="Describe what they did and why it matters" />
                     </group>
                     <footer>