diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 48d6320fbc3..c29371e4c44 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1628,6 +1628,7 @@
                         <field name="name"/>
                         <field name="active"/>
                     </group>
+                    <label for="note"/>
                     <field name="note" placeholder="Payment term explanation for the customer..."/>
                     <separator string="Computation"/>
                     <field name="line_ids"/>
@@ -2443,7 +2444,7 @@
                         <field name="sign"/>
                         <field name="style_overwrite"/>
                     </group>
-                    <notebook>
+                    <notebook attrs="{'invisible': [('type','not in',['accounts','account_type'])]}">
                         <page string="Report">
                             <group>
                                 <field name="display_detail" attrs="{'invisible': [('type','not in',['accounts','account_type'])]}"/>
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 1ad729d9c09..743391d1522 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -43,9 +43,8 @@
                                 <field name="free_if_more_than" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
                                 <field name="amount" attrs="{'required':[('free_if_more_than','&lt;&gt;',False)], 'invisible':[('free_if_more_than','=',False)]}"/>
                             </div>
+                            <field name="use_detailed_pricelist"/>
                         </group>
-                        <newline/>
-                        <field name="use_detailed_pricelist"/>
                     </group>
                     <field name="pricelist_ids" attrs="{'invisible':[('use_detailed_pricelist','=',False)]}" mode="tree">
                         <tree string="Delivery grids">
@@ -142,7 +141,7 @@
                         </page>
                         <page string="Destination">
                             <group string="Countries">
-                                <field name="country_ids"/>
+                                <field name="country_ids" nolabel="1"/>
                             </group>
                             <group string="States">
                                 <field colspan="2" name="state_ids" nolabel="1"/>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 33f737aa66e..457d8f33a07 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -203,7 +203,7 @@
         </record>
 
         <record id="hr_expense_product" model="ir.actions.act_window">
-            <field name="name">Products</field>
+            <field name="name">Expense Categories</field>
             <field name="res_model">product.product</field>
             <field name="view_type">form</field>
             <field name="view_mode">kanban,tree,form</field>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 4410784c63c..564edf57c02 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -500,11 +500,15 @@
             <field name="name">hr.contribution.register.form</field>
             <field name="model">hr.contribution.register</field>
             <field name="arch" type="xml">
-                <form string="Contribution">
-                    <field name="name"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    <separator string="Description"/>
-                    <field name="note" nolabel="1"/>
+                <form string="Contribution" version="7.0">
+                    <group>
+                        <field name="name"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection" class="oe_inline"/>
+                    </group>
+                    <newline/>
+                    <group>
+                    <separator string="Description"/><newline/>
+                    <field name="note" nolabel="1"/></group>
                 </form>
             </field>
         </record>
diff --git a/addons/l10n_fr_rib/bank_view.xml b/addons/l10n_fr_rib/bank_view.xml
index 414ad51954a..4bc697b6173 100644
--- a/addons/l10n_fr_rib/bank_view.xml
+++ b/addons/l10n_fr_rib/bank_view.xml
@@ -21,12 +21,12 @@
             <field name="model">res.partner.bank</field>
             <field name="inherit_id" ref="base.view_partner_bank_form" />
             <field name="arch" type="xml">
-                <field name="acc_number" position="before">
-                    <field name="bank_code" />
-                    <field name="office" />
+                <field name="acc_number" position="after">
+                    <field name="bank_code" attrs="{'invisible':[('state','!=','rib')]}"/>
+                    <field name="office" attrs="{'invisible':[('state','!=','rib')]}"/>
                     <newline />
-                    <field name="rib_acc_number" />
-                    <field name="key" />
+                    <field name="rib_acc_number" attrs="{'invisible':[('state','!=','rib')]}"/>
+                    <field name="key" attrs="{'invisible':[('state','!=','rib')]}"/>
                     <newline />
                 </field>
             </field>
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index c5fa52afe29..cb7ad61e928 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -427,10 +427,14 @@
                     </header>
                     <sheet>
                         <group>
-                            <field name='name'/>
-                            <field name='category_id'/>
-                            <field name='supplier'/>
-                            <field name='price'/>
+                            <group>
+                                <field name='name'/>
+                                <field name='category_id'/>
+                            </group>
+                            <group>
+                                <field name='supplier'/>
+                                <field name='price'/>
+                            </group>
                         </group>
                         <label for='description'/>
                         <field name='description'/>
@@ -461,7 +465,7 @@
                     <sheet>
                         <group string="Schedule Date">
                             <group>
-                                <field name="alter_type"/>
+                                <field name="alter_type" class="oe_inline"/>
                                 <field name="specific_day" attrs="{'invisible': [('alter_type','!=','specific')], 'required':[('alter_type','=','specific')]}"/>
                             </group>
                         </group>
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index 784a14228d5..8d725b3beee 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -12,15 +12,23 @@
             <field name="model">product.pricelist.version</field>
             <field name="arch" type="xml">
                 <form string="Pricelist Version" version="7.0">
-                    <group col="4">
-                        <field name="name"/>
-                        <field name="active"/>
-                        <field colspan="4" name="pricelist_id"/>
-                        <field name="date_start"/>
-                        <field name="date_end"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="pricelist_id"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        </group>
+                        <group>
+                            <field name="date_start"/>
+                            <field name="date_end"/>
+                            <field name="active"/>
+                        </group>
                     </group>
-                    <field name="items_id"/>
+                    <notebook>
+                    <page string="Item List">
+                        <field name="items_id"/>
+                    </page>
+                    </notebook>
                 </form>
             </field>
         </record>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index c547a611cd4..c5437ed3e33 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -585,10 +585,12 @@
             <field name="model">product.ul</field>
             <field name="arch" type="xml">
                 <form string="Packaging" version="7.0">
+                    <sheet>
                     <group>
                         <field name="name"/>
                         <field name="type"/>
                     </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index da3a6d132ee..9901fbdb1f1 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -37,15 +37,19 @@
                 <field name="state" widget="statusbar" statusbar_visible="draft,in_progress,done" statusbar_colors='{"in_progress":"blue"}'/>
             </header>
             <sheet>
-                <div class="oe_edit_only">
-                    <label for="name" class="oe_inline"/>
-                    <label for="origin" class="oe_inline"/>
+                <div class="pull-left">
+                    <label for="name" class="oe_edit_only oe_inline"/>
+                    <h1>
+                        <field name="name" class="oe_inline"/>
+                    </h1>
+                </div>
+                <div class="pull-left">
+                    <label for="origin" class="oe_edit_only oe_inline"/>
+                    <h1>
+                        <label string="," attrs="{'invisible':[('origin','=',False)]}"/>
+                        <field name="origin" class="oe_inline" placeholder="e.g. PO0025"/>
+                    </h1>
                 </div>
-                <h1>
-                    <field name="name" class="oe_inline"/>
-                    <label string="," attrs="{'invisible':[('origin','=',False)]}"/>
-                    <field name="origin" class="oe_inline" placeholder="e.g. PO0025"/>
-                </h1>
                 <group>
                     <group>
                         <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'purchase_requisition.group_purchase_requisition_user', 'purchase.group_purchase_user', 'account.group_account_invoice']}"/>
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 74f71ecfeea..752026005a3 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -216,7 +216,7 @@
                         </group>
                         <group>
                             <field name="calendar_id"/>
-                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company" attrs="{'invisible':[('calendar_id','=',False)]}"/>
                         </group>
                     </group>
                     <group>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index e96652c11aa..37a4c93c219 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1558,11 +1558,11 @@
             <field name="model">stock.incoterms</field>
             <field name="arch" type="xml">
                 <form string="Incoterms" version="7.0">
-                    <group>
+                    <sheet>
                         <field name="name"/>
                         <field name="code"/>
                         <field name="active"/>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -1691,10 +1691,10 @@
             <field name="model">stock.journal</field>
             <field name="arch" type="xml">
                 <form string="Stock Journal" version="7.0">
-                    <group>
+                    <sheet>
                         <field name="name"/>
                         <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'account.group_account_invoice', 'stock.group_stock_manager']}"/>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>