diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 19a00e77339..a7f3eaf18a0 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -85,7 +85,8 @@
                                     <group>
                                         <field name="type"/>
                                         <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)" groups="product.group_uom"/>
-                                        <field name="list_price" string="Sale Price of Template"/>
+                                        <field name="list_price" string="Base Sale Price"/>
+                                        <field name="lst_price" string="Public Sale Price"/>
                                     </group>
                                     <group>
                                         <field name="default_code"/>
@@ -102,7 +103,7 @@
                                 <group name="procurement">
                                     <group name="general">
                                         <field name="cost_method" groups="product.group_costing_method"/>
-                                        <field name="standard_price" string="Cost Price of Template" attrs="{'readonly':[('cost_method','=','average')]}"/>
+                                        <field name="standard_price" string="Base Cost Price" attrs="{'readonly':[('cost_method','=','average')]}"/>
                                     </group>
                                     <group name="procurement_uom" groups="product.group_uom" string="Purchase">
                                         <field name="uom_po_id"/>
@@ -228,6 +229,30 @@
             <field name="name">Products</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">product.product</field>
+            <field name="view_mode">kanban,tree,form</field>
+            <field name="view_type">form</field>
+            <field name="context">{"search_default_filter_to_sell":1}</field>
+            <field name="view_id" ref="product_product_tree_view"/>
+            <field name="search_view_id" ref="product_search_form_view"/>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to define a new product.
+              </p><p>
+                You must define a product for everything you sell, whether it's
+                a physical product, a consumable or a service you offer to
+                customers.
+              </p><p>
+                The product form contains information to simplify the sale
+                process: price, notes in the quotation, accounting data,
+                procurement methods, etc.
+              </p>
+            </field>
+        </record>
+        
+        <record id="product_action_template" model="ir.actions.act_window">
+            <field name="name">Products by Templates</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">product.product</field>
             <field name="view_mode">tree,form,kanban</field>
             <field name="view_type">form</field>
             <field name="context">{"search_default_template_id":1, "search_default_filter_to_sell":1}</field>
@@ -249,21 +274,21 @@
         </record>
 
         <record id="open_view_product_tree1" model="ir.actions.act_window.view">
-            <field name="sequence" eval="1"/>
+            <field name="sequence" eval="2"/>
             <field name="view_mode">tree</field>
             <field name="view_id" ref="product_product_tree_view"/>
             <field name="act_window_id" ref="product_normal_action_sell"/>
         </record>
 
         <record id="open_view_product_form1" model="ir.actions.act_window.view">
-            <field name="sequence" eval="2"/>
+            <field name="sequence" eval="3"/>
             <field name="view_mode">form</field>
             <field name="view_id" ref="product_normal_form_view"/>
             <field name="act_window_id" ref="product_normal_action_sell"/>
         </record>
 
         <record id="open_view_product_kanban1" model="ir.actions.act_window.view">
-            <field name="sequence" eval="3"/>
+            <field name="sequence" eval="1"/>
             <field name="view_mode">kanban</field>
             <field name="view_id" ref="product_kanban_view"/>
             <field name="act_window_id" ref="product_normal_action_sell"/>
@@ -271,6 +296,7 @@
 
         <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
         <menuitem action="product.product_normal_action_sell" id="product.menu_products" parent="base.menu_product" sequence="1"/>
+        <menuitem action="product.product_action_template" id="product.menu_products_bytemplate" parent="base.menu_product"/>
 
         <record id="product_normal_action_puchased" model="ir.actions.act_window">
             <field name="name">Products</field>
@@ -742,10 +768,15 @@
                         </div>
                         <notebook>
                             <page string="Information">
-                                <group>
-                                    <field name="type" class="oe_inline"/>
-                                    <field name="uom_id" class="oe_inline" on_change="onchange_uom(uom_id,uom_po_id)" groups="product.group_uom"/>
+                                <group  colspan="4">
+                                    <group>
+                                    <field name="type"/>
+                                    <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)" groups="product.group_uom"/>
                                     <field name="list_price"/>
+                                    </group>
+                                    <group>
+                                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                    </group>
                                 </group>
                                 <group colspan="4" string="Product Variants">
                                     <field colspan="4" name="product_variant_ids" nolabel="1">