diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 4beda0999d0..a284523665c 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -112,7 +112,7 @@
 
         <!-- Menus -->
         <record id="action_hr_analytic_timesheet_open_tree" model="ir.actions.act_window">
-            <field name="name">Costs to Invoice</field>
+            <field name="name">Bill Tasks Works</field>
             <field name="res_model">account.analytic.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
diff --git a/addons/product/product.py b/addons/product/product.py
index 09732a9bff3..922868684aa 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -308,6 +308,7 @@ class product_template(osv.osv):
         'uos_coeff' : lambda *a: 1.0,
         'mes_type' : lambda *a: 'fixed',
         'categ_id' : _default_category,
+        'type' : lambda *a: 'consu',
     }
 
     def _check_uom(self, cursor, user, ids):
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 8f2e5efe649..b7c7f621818 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -9,10 +9,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Product">
-                   <filter string="Services" icon="terp-accessories-archiver" domain="[('type','=','service')]"/>
-		   <filter icon="terp-accessories-archiver" string="Consumable"
-                        domain="[('type','=', 'consumable')]"/>                   
-                   <filter string="Stockable" icon="terp-accessories-archiver" domain="['|',('type','=','product'),('type','=','consu')]"/>
+                   <filter string="Services" icon="terp-accessories-archiver" domain="[('type','=','service')]"/>                   
+                   <filter string="Consumable/Stockable" icon="terp-accessories-archiver" domain="['|',('type','=','product'),('type','=','consu')]"/>
                    <separator orientation="vertical"/>
                    <filter string="To Sell" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/>
                    <filter string="To Purchase" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]" />
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 5e5be5ee4b0..6b4796cc099 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -46,7 +46,7 @@
                             <separator colspan="4"/>
                             <group col="9" colspan="8">
                                 <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_template" string="Set as Template" type="object" states="open" icon="gtk-convert" groups="base.group_extended"/>
                                 <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="terp-dialog-close"/>
@@ -67,9 +67,9 @@
                                 </tree>
                             </field>
                         </page>
-                        <page groups="base.group_extended" string="Partner Info">
+                        <page groups="base.group_extended" string="Accounting">
                             <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1"/>
-                            <field domain="[('partner_id','=',partner_id)]" name="contact_id" string="Contact Address"/>
+                            <field domain="[('partner_id','=',partner_id)]" name="contact_id" string="Invoice Address"/>
                             <field name="warn_customer"/>
                             <newline/>
                             <separator colspan="2" string="Mail Header"/>