diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index f6e21f338e7..870330218c2 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -44,7 +44,7 @@
                     <field name="name" />
                     <newline/>
                     <group expand="0" string="Group By..." groups="base.group_extended">
-                        <filter string="Type"  domain="[]" context="{'group_by':'type'}"/>
+                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
                     </group>
                </search>
             </field>
@@ -80,7 +80,7 @@
                     <separator string="Directory Type" colspan="4"/>
                     <field name="type"/>
                     <group colspan="4" col="4" attrs="{'invisible': [('type','!=','ressource')]}">
-                        <field name="ressource_type_id"  on_change="onchange_content_id(ressource_type_id)" 
+                        <field name="ressource_type_id"  on_change="onchange_content_id(ressource_type_id)"
                             attrs="{'required': [('type','=','ressource')] }"/>
                         <field name="resource_find_all" groups="base.group_extended" />
                         <newline/>
@@ -93,7 +93,7 @@
                         <field name="ressource_parent_type_id"/>
                         <field name="ressource_id" select="2" readonly="1"/>
                     </group>
-                    
+
                 </page>
                 <page string="Generated Files" groups="base.group_extended">
                     <label colspan="4" string="For each entry here, virtual files will appear in this folder." />
@@ -168,7 +168,7 @@
                     <field name="storage_id" />
                     <newline/>
                     <group expand="0" string="Group By..." groups="base.group_extended">
-                        <filter string="Type"  domain="[]" context="{'group_by':'type'}"/>
+                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
                         <filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Storage" domain="[]" context="{'group_by':'storage_id'}"/>
                     </group>
diff --git a/addons/document_ftp/wizard/ftp_browse_view.xml b/addons/document_ftp/wizard/ftp_browse_view.xml
index 44cedccfc3e..7a52c1fd291 100644
--- a/addons/document_ftp/wizard/ftp_browse_view.xml
+++ b/addons/document_ftp/wizard/ftp_browse_view.xml
@@ -4,7 +4,7 @@
     <record id="ftp_browse_form" model="ir.ui.view">
             <field name="name">Document FTP Browse</field>
             <field name="model">document.ftp.browse</field>
-            <field name="type">form</field>           
+            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Browse Document">
                     <separator string="Browse Document" colspan="4"/>
@@ -12,7 +12,7 @@
                     <separator colspan="4"/>
                     <group col="4" colspan="4">
                         <label string="" colspan="2"/>
-                        <button special="cancel" string="_Close" icon="gtk-cancel"/>
+                        <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
                         <button name="browse_ftp" string="_Browse" type="object" icon="gtk-ok"/>
                     </group>
                 </form>
@@ -32,7 +32,7 @@
         <menuitem
         name="Shared Repository (FTP)"
         action="action_ftp_browse"
-        id="menu_document_browse"        
+        id="menu_document_browse"
         icon="STOCK_EXECUTE"
         parent="document.menu_document_doc" sequence="1"/>
 
diff --git a/addons/project/project.py b/addons/project/project.py
index a746f88cfb8..ca56fa3ba77 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -423,8 +423,7 @@ class task(osv.osv):
         'date_start': fields.datetime('Starting Date'),
         'date_end': fields.datetime('Ending Date'),
         'date_deadline': fields.date('Deadline'),
-        'project_id': fields.many2one('project.project', 'Project', ondelete='cascade',
-            help="If you have [?] in the project name, it means there are no analytic account linked to this project."),
+        'project_id': fields.many2one('project.project', 'Project', ondelete='cascade'),
         'parent_ids': fields.many2many('project.task', 'project_task_parent_rel', 'task_id', 'parent_id', 'Parent Tasks'),
         'child_ids': fields.many2many('project.task', 'project_task_parent_rel', 'parent_id', 'task_id', 'Delegated Tasks'),
         'notes': fields.text('Notes'),
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 421729ccda5..bf801adca1d 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -21,8 +21,8 @@
                         <field name="name" string="Project Name" select="1"/>
                         <field name="parent_id" string="Parent Project"/>
                         <field name="user_id" string="Project Manager" select="1" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
-                        <field name="date_start" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
-                        <field name="date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
+                        <field name="date_start" string="Start Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
+                        <field name="date" string="End Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
                         <field name="progress_rate" widget="progressbar"/>
                     </group>
                     <notebook colspan="4">
@@ -44,11 +44,13 @@
                             </group>
                             <newline/>
                             <group col="9" colspan="8">
+                            	<separator colspan="8"/>
+                            	<newline/>
                                 <field name="state" select="1" readonly="1"/>
                                 <button name="set_template" string="Set as Template" type="object" states="open" icon="gtk-convert"/>
                                 <button name="set_open" string="Reactivate Project" type="object" states="pending,cancelled,close" icon="gtk-ok"/>
                                 <button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
-                                <button name="set_done" string="Done" type="object" states="open,pending" icon="gtk-jump-to"/>
+                                <button name="set_done" string="Done" type="object" states="open,pending" icon="terp-dialog-close"/>
                                 <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
                                 <button name="reset_project" string="Reset as Project" type="object" states="template" icon="gtk-convert"/>
                                 <button
@@ -110,7 +112,7 @@
                    <newline />
                     <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
                         <filter string="Manager" name="Manager"  icon="terp-personal" domain = "[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Partner" name="Partner"  icon="terp-personal" domain = "[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Partner" name="Partner" icon="terp-partner" domain = "[]" context="{'group_by':'partner_id'}" help="Parent Project"/>
                          <separator orientation="vertical"/>
                         <filter string="Parent" name="Parent"  icon="terp-folder-blue" domain = "[]" context="{'group_by':'parent_id'}"/>
                     </group>
@@ -239,7 +241,7 @@
                                 <button name="%(action_project_task_reevaluate)d" states="done,cancelled" string="Reactivate" type="action" icon="gtk-convert" context="{'button_reactivate':True}" />
                                 <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
                                 <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/>
-                                <button name="%(action_project_task_close)d" states="pending,open" string="Done" type="action" icon="gtk-apply"/>
+                                <button name="%(action_project_task_close)d" states="pending,open" string="Done" type="action" icon="terp-dialog-close"/>
                                 <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
                             </group>
                         </page>
@@ -276,7 +278,7 @@
                             <field name="partner_id"/>
                             <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                             <group col="4" colspan="2">
-                                <field name="type_id" widget="selection" readonly="1"/>
+                                <field name="type_id" widget="selection"/>
                                 <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/>
                                 <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/>
                             </group>
@@ -302,6 +304,7 @@
                     <field name="delegated_user_id" invisible="context.get('show_delegated', True)"/>
                     <field name="remaining_hours" widget="float_time" sum="Remaining Hours" invisible="context.get('set_visible',False)"/>
                     <field name="date_deadline" invisible="context.get('set_visible',False)"/>
+                    <field name="type_id" groups="base.group_extended" invisible="context.get('set_visible',False)"/>
                     <button name="next_type" invisible="context.get('set_visible',False)"
                         states="draft,open,pending"
                         string="Change Stage"
@@ -309,7 +312,6 @@
                         icon="gtk-go-forward"
                         groups="base.group_extended"
                         help="Change Type"/>
-                    <field name="type_id" groups="base.group_extended" invisible="context.get('set_visible',False)"/>
                     <field name="date_start" invisible="1"/>
                     <field name="date_end" invisible="1"/>
                     <field name="progress" widget="progressbar" invisible="context.get('set_visible',False)"/>
@@ -369,7 +371,7 @@
             <field name="arch" type="xml">
                <search string="Task Edition">
                     <group col="20" colspan="4">
-                        <filter string="Current" domain="[('state','in',('open','draft'))]"  name="current" help="Draft, Open and Pending Tasks" icon="terp-check" default="1"/>
+                        <filter string="Current" domain="[('state','in',('open','draft'))]"  name="current" help="Draft, In Progress and Pending Tasks" icon="terp-check" default="1"/>
                         <filter string="In Progress" domain="[('state','=','open')]" help="Open Tasks" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
                         <separator orientation="vertical"/>
@@ -397,9 +399,10 @@
                         <filter string="Stages" name="group_stage_id" icon="terp-stage" domain="[]" context="{'group_by':'type_id'}"/>
                         <filter string="State" name="group_state" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
+                        <filter string="Deadline" icon="terp-gnome-cpu-frequency-applet+" domain="[]" context="{'group_by':'date_deadline'}"/>
+                        <separator orientation="vertical"/>
                         <filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}"/>
                         <filter string="End Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_end'}"/>
-                        <filter string="Deadline" icon="terp-gnome-cpu-frequency-applet+" domain="[]" context="{'group_by':'date_deadline'}"/>
                     </group>
                 </search>
             </field>
@@ -414,10 +417,7 @@
             <field name="view_id" ref="view_task_tree2"/>
             <field name="context">{"search_default_project_id":project_id, "search_default_user_id":uid, "search_default_current": 1}</field>
             <field name="search_view_id" ref="view_task_search_form"/>
-            <field name="help">In OpenERP, a project is made of a set of activities (or tasks) for completion.A list view allows the manager to quickly check for task status and make it evolve, delegate task, etc. A search tool allows a multi-criteria sort of activities.
-
-Issues like bugs in a system, client complain, materials breakdown are collected here.A list view allows the manager to quickly check for them, assign them, make their status evolved.
-</field>
+            <field name="help">In OpenERP, a project is made of a set of activities (or tasks) for completion. A list view allows the manager to quickly check for task status and make it evolve, delegate task, etc. A search tool allows a multi-criteria sort of activities.</field>
         </record>
         <menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_project_management" sequence="2"/>
 
diff --git a/addons/project/wizard/project_task_delegate.py b/addons/project/wizard/project_task_delegate.py
index 2ce74ceefc8..2430b8a0896 100644
--- a/addons/project/wizard/project_task_delegate.py
+++ b/addons/project/wizard/project_task_delegate.py
@@ -30,7 +30,7 @@ class project_task_delegate(osv.osv_memory):
 
     _columns = {
         'name': fields.char('Delegated Title', size=64, required=True, help="New title of the task delegated to the user"),
-        'prefix': fields.char('Your Task Title', size=64, required=True, help="New title of your own task to validate the work done"),
+        'prefix': fields.char('Your Task Title', size=64, required=True, help="Title for your validation task"),
         'user_id': fields.many2one('res.users', 'Assign To', required=True, help="User you want to delegate this task to"),
         'new_task_description': fields.text('New Task Description', help="Reinclude the description of the task in the task of the user"),
         'planned_hours': fields.float('Planned Hours',  help="Estimated time to close this task by the delegated user"),
@@ -51,7 +51,7 @@ class project_task_delegate(osv.osv_memory):
         project = task.project_id
         manager = project.user_id or False
         partner = task.partner_id or task.project_id.partner_id
-        
+
         if 'name' in fields:
             if task.name.startswith(_('CHECK: ')):
                 newname = str(task.name).replace(_('CHECK: '), '')
diff --git a/addons/project/wizard/project_task_delegate_view.xml b/addons/project/wizard/project_task_delegate_view.xml
index a9e4e97b93a..dc299826419 100644
--- a/addons/project/wizard/project_task_delegate_view.xml
+++ b/addons/project/wizard/project_task_delegate_view.xml
@@ -18,7 +18,7 @@
                       <group colspan="2" col="2">
 		                    <separator string="Validation Task" colspan="4"/>
 		                    <field name="planned_hours_me"  widget="float_time" colspan="4"/>
-           	                <field name="prefix" colspan="4"/>
+           	                <field name="prefix" string="Validatation Task Title" colspan="4"/>
                             <field name="state" colspan="4"/>
 		              </group>
                       <separator string="" colspan="4"/>
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 5c5a8907dc9..05e047914b7 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -70,7 +70,7 @@ class project_issue(crm.crm_case, osv.osv):
             message = _('Issue ') + " '" + name + "' "+ _("is Closed.")
             self.log(cr, uid, id, message)
         return res
-    
+
     def _compute_day(self, cr, uid, ids, fields, args, context=None):
         if context is None:
             context = {}
@@ -152,7 +152,7 @@ class project_issue(crm.crm_case, osv.osv):
                                  domain="[('partner_id','=',partner_id)]"),
         'company_id': fields.many2one('res.company', 'Company'),
         'description': fields.text('Description'),
-        'state': fields.selection([('draft', 'Draft'), ('open', 'Todo'), ('cancel', 'Cancelled'), ('done', 'Closed'),('pending', 'Pending'), ], 'State', size=16, readonly=True,
+        'state': fields.selection([('draft', 'Draft'), ('open', 'To Do'), ('cancel', 'Cancelled'), ('done', 'Closed'),('pending', 'Pending'), ], 'State', size=16, readonly=True,
                                   help='The state is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
                                   \nWhen the case is over, the state is set to \'Done\'.\
@@ -409,7 +409,7 @@ class project(osv.osv):
         'project_escalation_id' : fields.many2one('project.project','Project Escalation', help='If any issue is escalated from the current Project, it will be listed under the project selected here.', states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'reply_to' : fields.char('Reply-To Email Address', size=256)
     }
-    
+
     def _check_escalation(self, cr, uid, ids):
          project_obj = self.browse(cr, uid, ids[0])
          if project_obj.project_escalation_id:
diff --git a/addons/project_issue/project_issue_menu.xml b/addons/project_issue/project_issue_menu.xml
index 9c074ed2fd3..514fd59c8d6 100644
--- a/addons/project_issue/project_issue_menu.xml
+++ b/addons/project_issue/project_issue_menu.xml
@@ -12,10 +12,10 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="project_issue_tree_view"/>
-        <field name="domain" eval="[('categ_id','=',ref('bug_categ'))]"/>
+        <field name="domain" eval=""/>
         <field name="context">{"search_default_user_id": uid, "search_default_current":1, "search_default_project_id":project_id}</field>
         <field name="search_view_id" ref="view_project_issue_filter"/>
-        <field name="help">Issues like bugs in a system, client complain, materials breakdown are collected here.A list view allows the manager to quickly check for them, assign them, make their status evolved.</field>
+        <field name="help">Issues like bugs in a system, client complain, materials breakdown are collected here. A list view allows the manager to quickly check for them, assign them, make their status evolved.</field>
     </record>
 
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view0">
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index ac8ffc5b721..7fc2db7c775 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -66,7 +66,7 @@
                             <group col="8" colspan="4">
                             <field name="state" />
                             <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
-                            <button name="case_close" string="Close" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
+                            <button name="case_close" string="Close" states="open,draft,pending" type="object" icon="terp-dialog-close"/>
                             <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
                             <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                             <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
@@ -75,7 +75,7 @@
                         </page>
                         <page string="Emails" groups="base.group_extended">
                             <group colspan="4">
-                            <field colspan="4" name="email_cc" string="Global CC" widget="char"/>
+                            <field colspan="4" name="email_cc" string="Global CC" widget="url"/>
                             </group>
                             <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
                                 <tree string="History">
@@ -157,7 +157,7 @@
             <field name="model">project.issue</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Issue Tracker Tree"  colors="red:state=='open';blue:state=='pending';grey:state in ('cancel', 'done')">
+                <tree string="Issue Tracker Tree" colors="black:state=='open';blue:state=='pending';grey:state in ('cancel', 'done')">
                     <field name="id"/>
                     <field name="create_date"/>
                     <field name="name"/>
@@ -174,11 +174,12 @@
                     <field name="assigned_to"/>
                     <field name="state"/>
                     <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
-                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
+                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" help="To Do"/>
                     <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                     <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
                     <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
                     <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
+                    <field name="categ_id" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -190,8 +191,8 @@
             <field name="arch" type="xml">
                 <search string="Issue Tracker Search">
                     <group>
-                        <filter string="Current" name="current" domain="[('state','in',('open','draft'))]" help="Draft and Open Issues" icon="terp-check" default="1"/>
-                        <filter string="In Progress" domain="[('state','=','open')]" help="Open Issues" icon="terp-camera_test"/>
+                        <filter string="Current" name="current" domain="[('state','in',('open','draft'))]" help="Draft and To Do" icon="terp-check" default="1"/>
+                        <filter string="To Do" domain="[('state','=','open')]" help="Open Issues" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]"  help="Pending Issues" icon="terp-gtk-media-pause"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-go-today" string="   Today   " separator="1" domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]" help="Today's bugs" />
@@ -204,25 +205,31 @@
                         <field name="user_id"/>
                         <field name="project_id" string="Project"/>
                         <field name="state"/>
+                        <field name="categ_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..."  groups="base.group_extended">
+                    	<filter string="Responsible" icon="terp-personal"
+                            domain="[]" context="{'group_by':'user_id'}" />
+                    	<filter string="Partner" icon="terp-partner" domain="[]"
+                            context="{'group_by':'partner_id'}" />
+						<separator orientation="vertical"/>
                         <filter string="Project"  icon="terp-folder-blue" domain="[]"
                             context="{'group_by':'project_id'}" />
-                        <filter string="Stage" icon="terp-stage" domain="[]"
-                            context="{'group_by':'stage_id'}" />
-                        <filter string="Priority" icon="terp-rating-rated" domain="[]"
-                            context="{'group_by':'priority'}" />
                         <filter string="Version" icon="terp-gtk-jump-to-rtl"
                             domain="[]" context="{'group_by':'type_id'}" />
-                        <separator orientation="vertical" />
-                        <filter string="Partner" icon="terp-personal" domain="[]"
-                            context="{'group_by':'partner_id'}" />
-                        <filter string="Salesman" icon="terp-personal"
-                            domain="[]" context="{'group_by':'user_id'}" />
+						<separator orientation="vertical"/>
+						<filter string="Category" icon="terp-stock_symbol-selection" domain="[]"
+                            context="{'group_by':'categ_id'}" />
+						<filter string="Priority" icon="terp-rating-rated" domain="[]"
+                            context="{'group_by':'priority'}" />
+                        <filter string="Stage" icon="terp-stage" domain="[]"
+                            context="{'group_by':'stage_id'}" />
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"
+                            context="{'group_by':'state'}" />
                         <separator orientation="vertical" />
                         <filter string="Month" icon="terp-go-month"
-                            domain="[]" context="{'group_by':'create_date'}" />
+                            domain="[]" context="{'group_by':'create_date'}" help="Creation Month"/>
                     </group>
                 </search>
             </field>
@@ -316,6 +323,6 @@
                 </field>
             </field>
        </record>
-       
+
     </data>
 </openerp>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index ae5b2600092..132dc24ce4a 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -30,7 +30,7 @@
                 <form string="Project Resource Allocation">
                     <field name="resource_id" select="1"/>
                     <field name="phase_id"/>
-                    <field name="useability"/>
+                    <field name="useability" string="Availability"/>
                 </form>
             </field>
         </record>
@@ -90,16 +90,21 @@
             <field name="arch" type="xml">
                 <form string="Project Phase">
                     <group colspan="6" col="6">
-                        <field name="name" select="1"/>
-                        <field name="project_id" on_change="onchange_project(project_id)"/>
-                        <field name="responsible_id"/>
-                    </group>
-                    <group colspan="6" col="6">
-                        <field name="duration" />
-                        <field name="product_uom" nolabel="1" domain="[('category_id.name', '=', 'Working Time')]"/>
-                        <field name="date_start"/>
-                        <field name="date_end"/>
+	                    <group colspan="2" col="2">
+	                        <field name="name" select="1"/>
+	                        <field name="date_start"/>
+	                        <field name="date_end"/>
+	                    </group>
+	                    <group colspan="2" col="2">
+	                       <field name="project_id" on_change="onchange_project(project_id)" />
+	                       <field name="duration" />
+	                    </group>
+	                    <group colspan="2" col="2">
+	                       <field name="responsible_id"/>
+	                       <newline/>
+	                       <field name="product_uom" nolabel="1" domain="[('category_id.name', '=', 'Working Time')]" colspan="2"/>
                     </group>
+					</group>
                     <notebook colspan="4">
                         <page string="Resource Allocation">
                             <field colspan="4" name="resource_ids" nolabel="1">
@@ -116,9 +121,9 @@
                             <group col="12" colspan="4">
                                 <field name="state" select="1"/>
                                 <button string="Draft" name="set_draft" states="open" icon="gtk-indent"/>
-                                <button string="Start Phase" name="set_open" states="pending,draft" icon="gtk-execute"/>
-                                <button string="Done" name="set_done" states="pending,open" icon="gtk-apply"/>
                                 <button string="Pending" name="set_pending" states="open" icon="gtk-media-pause"/>
+                                <button string="Done" name="set_done" states="pending,open" icon="terp-dialog-close"/>
+                                <button string="Start Phase" name="set_open" states="pending,draft" icon="gtk-execute"/>
                                 <button string="Cancel" name="set_cancel" states="draft,open,pending" icon="gtk-cancel"/>
                             </group>
                         </page>
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 4d88aae05c0..f857c31d756 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -527,10 +527,10 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="project.view_task_search_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/search/group[@string='Group By...']/filter[@string='End Date']" position="after">
+                <xpath expr="/search/group[@string='Group By...']/filter[@string='Project']" position="after">
+                	<separator orientation="vertical"/>
                     <filter string="Sprint" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'sprint_id'}"/>
                     <filter string="Backlog" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'product_backlog_id'}"/>
-                    <separator orientation="vertical"/>
                 </xpath>
             </field>
         </record>