diff --git a/addons/procurement/wizard/schedulers_all_view.xml b/addons/procurement/wizard/schedulers_all_view.xml
index a2f987e3aa1..539ee7b1865 100644
--- a/addons/procurement/wizard/schedulers_all_view.xml
+++ b/addons/procurement/wizard/schedulers_all_view.xml
@@ -13,7 +13,7 @@
                     <header>
                         <button name="procure_calculation" string="Compute Schedulers" type="object" icon="gtk-ok" />
                     </header>
-                    <group string="This wizard allows you to run all procurement, production and/or purchase orders that should be processed based on their configuration. By default, the scheduler is launched automatically every night by OpenERP. You can use this menu to force it to be launched now. Note that it runs in the background, you may have to wait for a few minutes until it has finished computing.">
+                    <group>
                         <field name="automatic"/>
                     </group>
                 </form>
diff --git a/addons/product_expiry/product_expiry_view.xml b/addons/product_expiry/product_expiry_view.xml
index e0a249d09eb..3e2d6573443 100644
--- a/addons/product_expiry/product_expiry_view.xml
+++ b/addons/product_expiry/product_expiry_view.xml
@@ -8,7 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="date" position="after">
-                    <separator string="Dates" colspan="4" />
                     <field name="life_date" />
                     <field name="use_date" />
                     <field name="removal_date" />
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index e6e5970ee64..fd6ec506893 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -119,20 +119,13 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                 </header>
                 <sheet>
-                    <div class="oe_title">
-                        <div class="oe_edit_only">
-                            <label for="name"  /> 
-                        </div>
-                        <h1>
-                            <field name="name" placeholder="Annual inventory"/>
-                        </h1>
-                    </div>
-                <group>
-                    <group>
-                        <field name="date"/>
+                    <h1>
+                        <field name="name" placeholder="Annual inventory" class="oe_inline"/>
+                        <field name="date" class="oe_inline"/>
+                    </h1>
+                    <div>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    </group>
-                </group>
+                    </div>
                     <notebook>
                     <page string="General Informations">
                         <field name="inventory_line_id">
@@ -160,7 +153,8 @@
                                 </group>
                             </form>
                         </field>
-                    </page><page string="Posted Inventory">
+                    </page>
+                    <page string="Posted Inventory">
                          <field name="move_ids" context="{'inventory_id':active_id}" >
                             <tree string="Stock Moves">
                                 <field name="product_id"/>
@@ -334,7 +328,9 @@
                             <field name="prefix"/>
                             <field name="name"/>
                             <field name="ref"/>
-                            <field name="date"/>
+                            <group string="Dates">
+                                <field name="date"/>
+                            </group>
                         </group>
                         <group string="Traceability">
                             <field name="stock_available"/>
@@ -730,7 +726,7 @@
                     <label for="name" class="oe_edit_only"/>
                     <h1>
                         <field name="name" class="oe_inline"/>
-                        <span attr="{'invisible': [('origin','=',False)]}"></span>
+                        <label string="-" attrs="{'invisible':[('origin','=',False)]}"/> 
                         <field name="origin" placeholder="PO0032" class="oe_inline"/>
                     </h1>
                     <label for="partner_id" class="oe_edit_only"/>
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 05b3c5a213f..e9cd86ea1c8 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -255,16 +255,29 @@
                                          domain = "[('category_id','in',[product_uom_categ,product_uos_categ])]"
                                          on_change = "onchange_uom(product_uom, product_id, active_uom, planned_outgoing, to_procure)"/>
                             <field name="active_uom" invisible = "True" />
+                        </group>
+                        <group colspan ="2" col="2">
+                            <separator colspan ="2" string = "Minimum Stock Rule Indicators"/>
+                            <field name="minimum_op"/>
+                            <field name="maximum_op"/>
+                        </group>
+                    </group>
+                    <group colspan="4" col="3">
+                        <group>
+                            <separator colspan ="2" string = "Current Period Situation"/>
+                            <field name="stock_start"/>
+                            <field name="already_out"/>
+                            <field name="already_in"/>
+                        </group>
+                        <group>
                             <separator colspan ="2" string = "Forecasts"/>
                             <field name="warehouse_forecast"/>
                             <field name="company_forecast"/>
                             <field name="confirmed_forecasts_only"/>
                         </group>
-                        <group colspan ="2" col="2">
-                            <separator colspan ="2" string = "Current Period Situation"/>
-                            <field name="stock_start"/>
-                            <field name="already_out"/>
-                            <field name="already_in"/>
+                    </group>
+                    <group colspan="4" col="8">
+                        <group>
                             <separator colspan ="2" string = "Planning and Situation for Calculated Period"/>
                             <field name="planned_outgoing"/>
                             <field name="outgoing"/>
@@ -275,21 +288,23 @@
                             <button name="calculate_planning" string="Calculate Planning" type="object" icon="gtk-execute" colspan="2"/>
                             <field name="stock_only"/>
                         </group>
-                        <group colspan ="2" col="2">
-                            <separator colspan ="2" string = "Minimum Stock Rule Indicators"/>
-                            <field name="minimum_op"/>
-                            <field name="maximum_op"/>
+                        <group>
                             <separator colspan ="2" string = "Calculated Period Simulation"/>
                             <field name="outgoing_before"/>
                             <field name="incoming_before"/>
                             <field name="stock_simulation"/>
                             <button name="procure_incomming_left" icon="gtk-convert" string="Procure Incoming Left" type="object" colspan="2"/>
                             <field name="procure_to_stock"/>
+                        </group>
+                    </group>
+                    <group>
+                        <group>
                             <separator colspan ="2" string = "Internal Supply"/>
                             <button name="internal_supply" string="Supply from Another Warehouse" icon="gtk-convert"  type="object" colspan="2"/>
                             <field name="supply_warehouse_id" domain = "[('company_id','=',company_id)] "/>
                             <field name="stock_supply_location"/>
                         </group>
+                        <group></group>
                     </group>
                     <separator colspan ="4" string = "Procurement History"/>
                     <field name = "history" colspan = "2" nolabel = "1"/>
diff --git a/addons/stock_planning/wizard/stock_planning_createlines_view.xml b/addons/stock_planning/wizard/stock_planning_createlines_view.xml
index 2ebddb89212..3772ceddf31 100644
--- a/addons/stock_planning/wizard/stock_planning_createlines_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_createlines_view.xml
@@ -9,7 +9,6 @@
             <field name="arch" type="xml">
                 <form string="Create Stock Planning Lines" version="7.0">
                     <header>
-                        <button icon="gtk-cancel" special="cancel" string="Close"/>
                         <button icon="gtk-ok" name="create_planning" string="Create" type="object"/>
                     </header>
                     <group col="4">