diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index 572a814d897..527d94de6ec 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -10,14 +10,14 @@
             <field name="arch" type="xml">
                 <form string="Action Bindings" version="7.0">
                     <group>
-                        <group string="Action Binding">
+                        <group>
                             <field name="name"/>
                             <field name="model_id" on_change="onchange_object_id(model_id)"/>
                             <field name="model"/>
                             <field name="res_id"/>
                             <field name="key2"/>
                         </group>
-                        <group string="Action">
+                        <group>
                             <field name="action_id" on_change="onchange_action_id(action_id)"/>
                             <field name="value_unpickle" colspan="4" string="Action Reference"/>
                         </group>
@@ -32,18 +32,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="User-defined Defaults" version="7.0">
-                    <label for="name" class="oe_edit_only"/>
-                    <h1><field name="name"/></h1>
                     <group>
-                        <group string="Model">
-                            <field name="model_id" on_change="onchange_object_id(model_id)"/>
+                        <group>
+                            <field name="name"/>
                             <field name="model"/>
-                            <field name="key2" string="Condition"/>
-                        </group>
-                        <group string="Default Value">
+                            <field name="model_id" on_change="onchange_object_id(model_id)"/>
                             <field name="value_unpickle" nolabel="1"/>
                         </group>
-                        <group string="Default Value Scope">
+                        <group>
+                            <field name="key2" string="Condition"/>
                             <field name="user_id"/>
                             <field name="company_id" groups="base.group_multi_company"/>
                         </group>
diff --git a/openerp/addons/base/ir/workflow/workflow_view.xml b/openerp/addons/base/ir/workflow/workflow_view.xml
index f66c175d72e..00662a68f29 100644
--- a/openerp/addons/base/ir/workflow/workflow_view.xml
+++ b/openerp/addons/base/ir/workflow/workflow_view.xml
@@ -15,14 +15,12 @@
       <field name="type">form</field>
       <field name="arch" type="xml">
           <form string="Workflow" version="7.0">
-             <sheet>
               <group col="4">
                   <field name="name"/>
                   <field name="osv"/>
                   <field name="on_create"/>
               </group>
               <field name="activities"/>
-            </sheet>
           </form>
       </field>
     </record>
diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml
index a26f6b6f34e..8b409d40e39 100644
--- a/openerp/addons/base/res/res_company_view.xml
+++ b/openerp/addons/base/res/res_company_view.xml
@@ -28,7 +28,6 @@
                         <label for="name" class="oe_edit_only"/>
                         <h1>
                             <field name="name" class="oe_inline"/>
-                            <button name="%(preview_report)d" string="Preview Header/Footer" type="action" icon="gtk-print" class="oe_inline"/>
                         </h1>
                         <group col="4">
                             <field name="partner_id" readonly="1" required="0" groups="base.group_no_one"/>
@@ -62,7 +61,11 @@
                             </group>
                             <separator string="Header/Footer of Reports"/>
                             <group>
-                                <field name="rml_header1" placeholder="Global Business Solutions"/>
+                                <label for="rml_header1"/>
+                                <div>
+                                    <field name="rml_header1" placeholder="Global Business Solutions" class="oe_inline"/>
+                                    <button name="%(preview_report)d" string="Preview Header/Footer" type="action" icon="gtk-print" class="oe_inline"/>
+                                </div>
                                 <field name="rml_footer1" groups="base.group_no_one"/>
                                 <label for="rml_footer2"/>
                                 <div name="bank_acc">