diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index e3d001583f0..07dfb5b89e7 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -50,6 +50,7 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_phone_tree_view"/>
         <field name="domain" eval="'[(\'categ_id\',\'=\','+str(ref('categ_phone1'))+')]'"/>
+        <field name="context">{'set_editable':True}</field>
         <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_incoming0">
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 09e133c06ec..bb5187f7a03 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -16,18 +16,6 @@
     </record>
 
    <menuitem action="crm_phonecall_categ_action" id="menu_crm_case_phonecall-act" parent="crm.menu_crm_case_categ"/>
-    # ------------------------------------------------------
-    # Phonecall Stage
-    # ------------------------------------------------------
-        <record id="crm_phonecall_stage_act" model="ir.actions.act_window">
-            <field name="name">Phonecall Stages</field>
-            <field name="res_model">crm.case.stage</field>
-            <field name="view_type">form</field>
-             <field name="view_id" ref="crm.crm_case_stage_tree"/>
-            <field name="domain">[('object_id.model', '=', 'crm.phonecall')]</field>
-            <field name="context">{'object_id':'crm.phonecall'}</field>
-        </record>
-      <menuitem action="crm_phonecall_stage_act" id="menu_crm_phonecall_stage_act" parent="crm.menu_crm_case_stage"/>
 
     # ------------------------------------------------------
     # Phone Calls
@@ -89,19 +77,20 @@
                         attrs="{'invisible':[('opportunity_id','!=',False)]}" />
                 </group>
                 <group col="3" colspan="2">
-                    <separator colspan="4" string="Contacts" />
+                    <separator colspan="3" string="Contacts" />
                     <field name="partner_id" />
                     <button string="Convert to Partner"
-                        colspan="2"
                         icon="terp-crm"
                         name="%(wizard_crm_phonecall_partner_create)d"
                         type="action"
                         attrs="{'invisible':[('partner_id','!=',False)]}" />
+                    <newline/>
                     <field name="partner_address_id" string="Contact" />
+                    <newline/>
                     <field name="partner_mobile" />
                 </group>
                 <group col="2" colspan="2">
-                    <separator colspan="4" string="Categorization" />
+                    <separator colspan="2" string="Categorization" />
                     <field name="priority"/>
                     <field name="opportunity_id"
                         on_change="onchange_case_id(case_id, name, partner_id)"
@@ -170,7 +159,6 @@
                </field>
                <newline/>
                <group expand="1" string="Group By..." colspan="4">
-                   <filter string="Stage" icon="terp-crm" domain="[]" context="{'group_by':'stage_id'}"/>
                    <filter string="Partner" icon="terp-crm" domain="[]"  context="{'group_by':'partner_id'}"/>
                    <filter string="Responsible" icon="terp-crm" domain="[]" context="{'group_by':'user_id'}"/>
                    <separator orientation="vertical"/>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 979b4d3cc89..1f7fc3f3c72 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -1,31 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-<!--        <menuitem icon="terp-product" id="menu_main_product" name="Products"/>-->
-<!--        <menuitem-->
-<!--            id="menu_config_product"-->
-<!--            name="Configuration"-->
-<!--            parent="product.menu_main_product"-->
-<!--            sequence="1"-->
-<!--            groups="group_product_manager"/>-->
-		<menuitem groups="base.group_extended" id="prod_config_main" name="Product" parent="base.menu_base_config" sequence="50"/>
+        <menuitem groups="base.group_extended" id="prod_config_main" name="Product" parent="base.menu_base_config" sequence="50"/>
         <record id="product_search_form_view" model="ir.ui.view">
             <field name="name">product.search.form</field>
             <field name="model">product.product</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Product">
-                    <group col='8' colspan='4'>
-                        <filter string="Services" icon="terp-stock" domain="[('type','=','service')]"/>
-                        <filter string="Stockable" icon="terp-stock" domain="['|',('type','=','product'),('type','=','consu')]"/>
-                        <field name="default_code" select="1"/>
-                        <field name="name" select="1"/>
-                        <field name="categ_id" select="1" widget="selection"/>
-                   </group>
+                   <filter string="Services" icon="terp-stock" domain="[('type','=','service')]"/>
+                   <filter string="Stockable" icon="terp-stock" domain="['|',('type','=','product'),('type','=','consu')]"/>
+                   <separator orientation="vertical"/>
+                   <field name="default_code" select="1"/>
+                   <field name="name" select="1"/>
+                   <field name="categ_id" select="1" widget="selection"/>
                    <newline/>
-                   <group col='8' colspan='4'>
-                          <field name="pricelist_id" select="1" widget="selection" context="{'pricelist': self}" />
-                    </group>
+                   <group col='8' colspan='7' expand="1" string="Extended options...">
+                       <field name="pricelist_id" select="1" widget="selection" context="{'pricelist': self}" />
+                   </group>
                 </search>
             </field>
         </record>
@@ -78,7 +70,7 @@
                     <notebook colspan="4">
                         <page string="Information">
                             <group colspan="2" col="2">
-                                <separator string="	Requisition" colspan="2"/>
+                                <separator string="    Requisition" colspan="2"/>
                                 <field name="type" select="2"/>
                                 <field name="procure_method"/>
                                 <field name="supply_method"/>
@@ -188,8 +180,8 @@
             <field name="search_view_id" ref="product_search_form_view"/>
         </record>
 
-		<menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="4"/>
-		<menuitem action="product.product_normal_action" id="product.menu_products" parent="base.menu_product" sequence="1"/>
+        <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="4"/>
+        <menuitem action="product.product_normal_action" id="product.menu_products" parent="base.menu_product" sequence="1"/>
 <!--        <menuitem action="product_normal_action" id="menu_products" parent="product.menu_main_product" sequence="1"/>-->
 
         <record id="product_normal_action_puchased" model="ir.actions.act_window">
@@ -255,7 +247,7 @@
             <field name="view_id" ref="product_category_list_view"/>
         </record>
 <!--        <menuitem action="product_category_action_form" id="menu_product_category_action_form" parent="product.menu_config_product" sequence="1"/>-->
-		<menuitem action="product_category_action_form" id="menu_product_category_action_form" parent="prod_config_main" sequence="60"/>
+        <menuitem action="product_category_action_form" id="menu_product_category_action_form" parent="prod_config_main" sequence="60"/>
 
 
         <record id="product_normal_action_tree" model="ir.actions.act_window">
@@ -316,7 +308,7 @@
             <field name="view_id" ref="product_uom_tree_view"/>
         </record>
         <menuitem id="next_id_16" name="Units of Measure" parent="prod_config_main" sequence="65"/>
-		<menuitem action="product_uom_form_action" id="menu_product_uom_form_action" parent="next_id_16"/>
+        <menuitem action="product_uom_form_action" id="menu_product_uom_form_action" parent="next_id_16"/>
 
         <record id="product_uom_categ_form_view" model="ir.ui.view">
             <field name="name">product.uom.categ.form</field>
@@ -367,7 +359,7 @@
             <field name="view_mode">tree,form</field>
         </record>
 <!--        <menuitem action="product_ul_form_action" groups="base.group_extended" id="menu_product_ul_form_action" parent="product.menu_config_product" sequence="4"/>-->
-		<menuitem action="product_ul_form_action" groups="base.group_extended" id="menu_product_ul_form_action" parent="prod_config_main" sequence="65"/>
+        <menuitem action="product_ul_form_action" groups="base.group_extended" id="menu_product_ul_form_action" parent="prod_config_main" sequence="65"/>
 
         <record id="product_packaging_tree_view" model="ir.ui.view">
             <field name="name">product.packaging.tree.view</field>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 5bb75fdd7a3..60d925d6fe4 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -232,24 +232,22 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
-                    <group col='11' colspan='4'>
-                        <filter icon="terp-sale" string="Quotations" domain="[('state','=','draft')]"/>
-                        <filter icon="terp-sale" string="Running" domain="[('state','in',('manual','progress'))]"/>
-                        <filter icon="terp-sale" string="Sales To Invoice" domain="[('state','=','manual')]"/>
-                        <separator orientation="vertical"/>
-                        <field name="name" select="1"/>
-                        <field name="partner_id" select="1"/>
-                        <field name="user_id" select="1" widget="selection">
-                            <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Sale Orders" default="1"/>
-                        </field>
-                        <field name="date_order" select="1" string="Order date" />
-					</group>
-					<group expand="1" string="Group By..." colspan="4" col="8">
-						<filter string="Customer" icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
+                    <filter icon="terp-sale" string="Quotations" domain="[('state','=','draft')]"/>
+                    <filter icon="terp-sale" string="Running" domain="[('state','in',('manual','progress'))]"/>
+                    <filter icon="terp-sale" string="Sales To Invoice" domain="[('state','=','manual')]"/>
+                    <separator orientation="vertical"/>
+                    <field name="name" select="1"/>
+                    <field name="partner_id" select="1"/>
+                    <field name="user_id" select="1" widget="selection">
+                        <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Sale Orders" default="1"/>
+                    </field>
+                    <field name="date_order" select="1" string="Order date" />
+                    <newline/>
+                    <group expand="1" string="Group By..." colspan="4" col="8">
+                        <filter string="Customer" icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Order Date" icon="terp-sale" domain="[]" context="{'group_by':'date_order'}"/>
-					</group>                       
-
+                    </group>
                </search>
             </field>
         </record>
@@ -391,22 +389,20 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
-                    <group col='8' colspan='4'>
-                        <filter icon="terp-purchase" string="To Invoice" domain="[('invoiced','&lt;&gt;', 1),('state','=','done')]" separator="1"/>
-                        <separator orientation="vertical"/>
-                        <field name="order_id" select="1"/>
-                        <field name="order_partner_id" select="1"/>
-                        <field name="product_id" select="1"/>
-                        <field name="salesman_id" select="1" widget="selection">
-                            <filter icon="terp-sale" domain="[('salesman_id','=',uid)]" help="My Sale Order Lines"/>
-                            <filter icon="terp-sale" domain="[('salesman_id','child_of',[uid])]" help="My Departments Sale Order Lines"/>
-                        </field>
-					<group expand="context.get('report',False)" string="Group By..." colspan="4" col="8">
-						<filter string="Product" icon="terp-sale"  default="1" domain="[]" context="{'group_by':'product_id'}"/>
+                    <filter icon="terp-purchase" string="To Invoice" domain="[('invoiced','&lt;&gt;', 1),('state','=','done')]" separator="1"/>
+                    <separator orientation="vertical"/>
+                    <field name="order_id" select="1"/>
+                    <field name="order_partner_id" select="1"/>
+                    <field name="product_id" select="1"/>
+                    <field name="salesman_id" select="1" widget="selection">
+                        <filter icon="terp-sale" domain="[('salesman_id','=',uid)]" help="My Sale Order Lines"/>
+                        <filter icon="terp-sale" domain="[('salesman_id','child_of',[uid])]" help="My Departments Sale Order Lines"/>
+                    </field>
+                    <newline/>
+                    <group expand="context.get('report',False)" string="Group By..." colspan="4" col="8">
+                        <filter string="Product" icon="terp-sale"  default="1" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="Order" icon="terp-sale" domain="[]" context="{'group_by':'order_id'}"/>
                         <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
-					</group>                                                
-
                     </group>
                 </search>
             </field>