diff --git a/addons/hr_goal/__openerp__.py b/addons/hr_goal/__openerp__.py
index 08854e9cf23..cc2a70dffbb 100644
--- a/addons/hr_goal/__openerp__.py
+++ b/addons/hr_goal/__openerp__.py
@@ -27,12 +27,10 @@
     'description': """Gamification of goals""",
 
     'data': [
-        'view/menu.xml',
         'view/type.xml',
-        # 'view/definition.xml',
-        # 'view/instance.xml',
-        # 'view/preset.xml',
-    ],
+        'view/goal.xml',
+        'view/menu.xml',
+        ],
     'installable': True,
     'application': True,
 }
diff --git a/addons/hr_goal/goal.py b/addons/hr_goal/goal.py
index 59cdc7c5f72..88c26a1767c 100644
--- a/addons/hr_goal/goal.py
+++ b/addons/hr_goal/goal.py
@@ -130,7 +130,6 @@ class gamification_goal(osv.Model):
     }
 
     _defaults = {
-        'start_date': fields.date.today,
         'current': 0,
         'status': 'inprogress',
     }
diff --git a/addons/hr_goal/view/goal.xml b/addons/hr_goal/view/goal.xml
new file mode 100644
index 00000000000..3b60aac1976
--- /dev/null
+++ b/addons/hr_goal/view/goal.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <record id="goal_list_action" model="ir.actions.act_window">
+            <field name="name">Goals</field>
+            <field name="res_model">gamification.goal</field>
+            <field name="view_mode">tree,form,calendar</field>
+        </record>
+
+        <record id="goal_list_view" model="ir.ui.view">
+            <field name="name">Goal list</field>
+            <field name="model">gamification.goal</field>
+            <field name="arch" type="xml">
+                <tree string="Goal list" colors="red:status == 'failed';green:status == 'reached'"> 
+                    <field name="type_id"/>
+                    <field name="user_id"/>
+                    <field name="current"/>
+                    <field name="target_goal"/>
+                    <field name="start_date"/>
+                    <field name="end_date"/>
+                    <field name="status" invisible="1"/>
+                </tree>
+            </field>
+        </record>
+		
+		<record id="goal_form_view" model="ir.ui.view">
+            <field name="name">Goal form</field>
+            <field name="model">gamification.goal</field>
+            <field name="arch" type="xml">
+                <form string="Goal" version="7.0">
+                    <sheet>
+                        <group>
+                            <group string="Reference">
+                                <field name="type_id"/>
+                                <field name="user_id"/>
+                                <field name="plan_id"/>
+                            </group>
+                            <group string="Schedule">
+                                <field name="start_date"/>
+                                <field name="end_date"/>
+                            </group>
+                            <group string="Data">
+                                <field name="target_goal"/>
+                                <field name="current"/>
+                                <field name="status"/>
+                            </group>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="goal_calendar_view" model="ir.ui.view">
+            <field name="name">Goal calendar</field>
+            <field name="model">gamification.goal</field>
+            <field name="arch" type="xml">
+                <calendar string="Goal"
+                        date_start="start_date"
+                        date_stop="end_date"
+                        color="type_id">
+                    <field name="type_id"/>
+                </calendar>
+            </field>
+        </record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/hr_goal/view/instance.xml b/addons/hr_goal/view/instance.xml
deleted file mode 100644
index d89f2f1ca22..00000000000
--- a/addons/hr_goal/view/instance.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data>
-        <record id="instance_list_action" model="ir.actions.act_window">
-            <field name="name">Goals</field>
-            <field name="res_model">hr.goal.instance</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-
-        <menuitem id="instances_menu" parent="goal_menu"
-            action="instance_list_action"/>
-    </data>
-</openerp>
\ No newline at end of file
diff --git a/addons/hr_goal/view/type.xml b/addons/hr_goal/view/type.xml
index bfcf7c93b62..c189685e4e2 100644
--- a/addons/hr_goal/view/type.xml
+++ b/addons/hr_goal/view/type.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <record id="goal_list_action" model="ir.actions.act_window">
+        <record id="goal_type_list_action" model="ir.actions.act_window">
             <field name="name">Goal types</field>
             <field name="res_model">gamification.goal.type</field>
             <field name="view_mode">tree,form</field>