diff --git a/addons/account/views/account_invoice_view.xml b/addons/account/views/account_invoice_view.xml
index b5520c4a3c7..92ccc306cdb 100644
--- a/addons/account/views/account_invoice_view.xml
+++ b/addons/account/views/account_invoice_view.xml
@@ -376,7 +376,7 @@
                                 context="{'search_default_customer':1, 'show_address': 1}"
                                 options='{"always_reload": True}'
                                 domain="[('customer', '=', True)]"/>
-                            <field name="payment_term_id" class="oe_inline"/>
+                            <field name="payment_term_id"/>
                         </group>
                         <group>
                             <field name="date_invoice"/>
@@ -447,7 +447,7 @@
                                 <field name="reconciled" invisible="1"/>
                                 <field name="outstanding_credits_debits_widget" colspan="2" nolabel="1" widget="payment" attrs="{'invisible': [('state', 'not in', 'open')]}"/>
                             </group>
-                            <field name="comment" class="oe_inline" placeholder="Terms and conditions..."/>
+                            <field name="comment" placeholder="Terms and conditions..."/>
                         </page>
                         <page string="Other Info">
                             <group>
diff --git a/addons/account/views/account_payment_view.xml b/addons/account/views/account_payment_view.xml
index 7a53640131e..8ba6383a983 100644
--- a/addons/account/views/account_payment_view.xml
+++ b/addons/account/views/account_payment_view.xml
@@ -105,9 +105,9 @@
                                 <field name="payment_method" string=" " widget="radio" attrs="{'invisible': [('hide_payment_method', '=', True)], 'readonly': [('state', '!=', 'draft')]}"/>
                                 <field name="payment_method_code" invisible="1"/>
                                 <label for="amount"/>
-                                <div name="amount_div">
-                                    <field name="amount" class="oe_inline" attrs="{'readonly': [('state', '!=', 'draft')]}"/>
-                                    <field name="currency_id" options="{'no_create': True}" groups="base.group_multi_currency" class="oe_inline" attrs="{'readonly': [('state', '!=', 'draft')]}"/>
+                                <div name="amount_div" class="o_row">
+                                    <field name="amount" attrs="{'readonly': [('state', '!=', 'draft')]}"/>
+                                    <field name="currency_id" options="{'no_create': True}" groups="base.group_multi_currency" attrs="{'readonly': [('state', '!=', 'draft')]}"/>
                                 </div>
                             </group>
                             <group>
diff --git a/addons/account/views/partner_view.xml b/addons/account/views/partner_view.xml
index ab6bfcf4118..febcb551a59 100644
--- a/addons/account/views/partner_view.xml
+++ b/addons/account/views/partner_view.xml
@@ -177,4 +177,4 @@
             </field>
         </record>
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/auth_signup/res_users_view.xml b/addons/auth_signup/res_users_view.xml
index 7c749271e77..ad84480c65d 100644
--- a/addons/auth_signup/res_users_view.xml
+++ b/addons/auth_signup/res_users_view.xml
@@ -8,10 +8,17 @@
             <field name="inherit_id" ref="base.view_users_form"/>
             <field name="arch" type="xml">
                 <!-- add state field in header -->
-                <xpath expr="//sheet" position="before">
-                    <header>
-                        <field name="state" widget="statusbar"/>
-                    </header>
+                <xpath expr="//header" position="inside">
+                    <button string="Send Reset Password Instructions"
+                                type="object" name="action_reset_password"
+                                attrs="{'invisible': [('state', '!=', 'active')]}"/>
+                    <button string="Send an Invitation Email"
+                                type="object" name="action_reset_password" context="{'create_user': 1}"
+                                attrs="{'invisible': [('state', '!=', 'new')]}"/>
+                    <field name="state" widget="statusbar"/>
+                </xpath>
+
+                <xpath expr="//header" position="after">
                     <div class="oe_form_box_info oe_text_center" attrs="{'invisible': [('signup_valid', '!=', True)]}">
                         <p attrs="{'invisible': [('state', '!=', 'active')]}">
                             <b>A password reset has been requested for this user. An email containing the following link has been sent:</b>
@@ -23,17 +30,6 @@
                         <field name="signup_valid" invisible="1"/>
                     </div>
                 </xpath>
-                <!-- add Reset Password button -->
-                <xpath expr="//div[@name='button_box']//button" position="replace">
-                        <button string="Send Reset Password Instructions"
-                                class="oe_link"
-                                type="object" name="action_reset_password"
-                                attrs="{'invisible': [('state', '!=', 'active')]}"/>
-                        <button string="Send an Invitation Email"
-                                class="oe_link"
-                                type="object" name="action_reset_password" context="{'create_user': 1}"
-                                attrs="{'invisible': [('state', '!=', 'new')]}"/>
-                </xpath>
             </field>
         </record>
 
diff --git a/addons/base_vat/base_vat_view.xml b/addons/base_vat/base_vat_view.xml
index ba6af923a87..946bc744f58 100644
--- a/addons/base_vat/base_vat_view.xml
+++ b/addons/base_vat/base_vat_view.xml
@@ -9,10 +9,10 @@
             <field name="arch" type="xml">
                 <field name="property_account_position" position="after">
                     <label for="vat"/>
-                    <div name="vat_info">
-                        <field name="vat" on_change="vat_change(vat)" placeholder="e.g. BE0477472701" class="oe_inline"/>
-                        <button colspan="2" name="button_check_vat" string="Check Validity" type="object" icon="gtk-execute" class="oe_inline"/>
-                        <field name="vat_subjected" class="oe_inline"/>
+                    <div name="vat_info" class="o_row">
+                        <field name="vat" on_change="vat_change(vat)" placeholder="e.g. BE0477472701"/>
+                        <button name="button_check_vat" string="Check Validity" class="oe_link" type="object" icon="fa-cog"/>
+                        <field name="vat_subjected"/>
                     </div>
                 </field>
             </field>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index cfc52e0fdd4..d4378b94fb7 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -140,26 +140,24 @@
                                 options='{"create_name_field": "name"}'
                                 context="{'default_name': contact_name, 'default_street': street, 'default_city': city, 'default_state_id': state_id, 'default_zip': zip, 'default_country_id': country_id, 'default_function': function, 'default_phone': phone, 'default_mobile': mobile, 'default_fax': fax, 'default_email': email_from, 'default_user_id': user_id, 'default_team_id': team_id}"/>
                             <label for="street" string="Address"/>
-                            <div>
-                                <field name="street" placeholder="Street..."/>
-                                <field name="street2"/>
-                                <div class="address_format">
-                                    <field name="city" placeholder="City" style="width: 40%%"/>
-                                    <field name="state_id" on_change="onchange_state(state_id)" options='{"no_open": True}' placeholder="State" style="width: 24%%"/>
-                                    <field name="zip" placeholder="ZIP" style="width: 34%%"/>
-                                </div>
-                                <field name="country_id" placeholder="Country" options='{"no_open": True, "no_create": True}'/>
+                            <div class="o_address_format">
+                                <field name="street" placeholder="Street..." class="o_address_street"/>
+                                <field name="street2" placeholder="Street 2..." class="o_address_street"/>
+                                <field name="city" placeholder="City" class="o_address_city"/>
+                                <field name="state_id" class="o_address_state" placeholder="State" options='{"no_open": True}' on_change="onchange_state(state_id)"/>
+                                <field name="zip" placeholder="ZIP" class="o_address_zip"/>
+                                <field name="country_id" placeholder="Country" class="o_address_country" options='{"no_open": True, "no_create": True}'/>
                             </div>
                         </group>
                         <group>
                             <label for="contact_name"/>
-                            <div>
-                                <field name="contact_name" class="oe_inline"/><span attrs="{'invisible': [('title', '=', '')]}">, </span>
-                                <field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" class="oe_inline" options='{"no_open": True}'/>
+                            <div class="o_row">
+                                <field name="contact_name"/><span attrs="{'invisible': [('title', '=', '')]}">, </span>
+                                <field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" options='{"no_open": True}'/>
                             </div>
                             <field name="email_from" widget="email"/>
                             <field name="function"/>
-                            <field name="phone"/>
+                            <field name="phone" widget="phone"/>
                             <field name="mobile"/>
                             <field name="fax"/>
                         </group>
@@ -167,7 +165,7 @@
                             <field name="user_id" on_change="on_change_user(user_id, context)"
                                 context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'base.group_sale_salesman_all_leads'] }"/>
                             <label for="team_id" groups="base.group_multi_salesteams"/>
-                            <div groups="base.group_multi_salesteams">
+                            <div class="o_row" groups="base.group_multi_salesteams">
                                 <field name="team_id"/>
                                 <button name="case_escalate" string="Escalate"
                                         type="object" class="oe_link"
@@ -421,13 +419,16 @@
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
                             <h1><field name="name" placeholder="e.g. Product Pricing"/></h1>
-                            <label for="planned_revenue" style="padding-right: 50px" class="oe_edit_only"/>
-                            <label for="probability" class="oe_edit_only"/>
-                            <h2>
+                            <div class="o_row">
+                                <label for="planned_revenue" class="oe_edit_only"/>
+                                <label for="probability" class="oe_edit_only"/>
+                            </div>
+                            <h2 class="o_row">
                                 <field name="company_currency" invisible="1"/>
-                                <field name="planned_revenue" class="oe_inline" widget='monetary' options="{'currency_field': 'company_currency'}"/>
+                                <field name="planned_revenue" widget='monetary' options="{'currency_field': 'company_currency'}"/>
                                 <span class="oe_grey"> at </span>
-                                <field name="probability" class="oe_inline" widget="integer"/>%%
+                                <field name="probability" widget="integer"/>
+                                <span>%%</span>
                             </h2>
                         </div>
                         <group>
@@ -437,14 +438,15 @@
                                     string="Customer"
                                     context="{'default_name': partner_name, 'default_email': email_from, 'default_phone': phone}"/>
                                 <field name="email_from" string="Email" widget="email"/>
-                                <field name="phone"/>
+                                <field name="phone" widget="phone"/>
                             </group>
 
                             <group>
                                 <label for="title_action"/>
-                                <div>
-                                    <field name="date_action" nolabel="1"/> <label string="-" attrs="{'invisible': ['|', ('date_action', '=', False), ('title_action', '=', False)]}"/>
-                                    <field name="title_action" class="oe_inline" nolabel="1" placeholder="e.g. Call for proposal"/>
+                                <div class="o_row">
+                                    <field name="date_action" nolabel="1"/>
+                                    <span attrs="{'invisible': ['|', ('date_action', '=', False), ('title_action', '=', False)]}" class="oe_read_only"> - </span>
+                                    <field name="title_action"  nolabel="1" placeholder="e.g. Call for proposal"/>
                                 </div>
                                 <field name="date_deadline"/>
                                 <field name="priority" widget="priority"/>
@@ -453,7 +455,7 @@
                             <group>
                                 <field name="user_id" on_change="on_change_user(user_id, context)" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'base.group_sale_salesman_all_leads']}"/>
                                 <label for="team_id" groups="base.group_multi_salesteams"/>
-                                <div groups="base.group_multi_salesteams">
+                                <div groups="base.group_multi_salesteams" class="o_row">
                                     <field name="team_id" widget="selection"/>
                                     <button name="case_escalate" string="Escalate" type="object" class="oe_link"
                                             attrs="{'invisible': ['|', ('team_id','=',False), ('probability', '=', 100)]}"/>
@@ -475,23 +477,21 @@
                                 <group>
                                     <field name="partner_name"/>
                                     <label for="street" string="Address"/>
-                                    <div>
-                                        <field name="street" placeholder="Street..."/>
-                                        <field name="street2"/>
-                                        <div class="address_format">
-                                            <field name="city" placeholder="City" style="width: 40%%"/>
-                                            <field name="state_id" options='{"no_open": True}' on_change="onchange_state(state_id)" placeholder="State" style="width: 24%%"/>
-                                            <field name="zip" placeholder="ZIP" style="width: 34%%"/>
-                                        </div>
-                                        <field name="country_id" placeholder="Country" options='{"no_open": True, "no_create": True}'/>
+                                    <div class="o_address_format">
+                                        <field name="street" placeholder="Street..." class="o_address_street"/>
+                                        <field name="street2" placeholder="Street 2..." class="o_address_street"/>
+                                        <field name="city" placeholder="City" class="o_address_city"/>
+                                        <field name="state_id" class="o_address_state" placeholder="State" options='{"no_open": True}' on_change="onchange_state(state_id)"/>
+                                        <field name="zip" placeholder="ZIP" class="o_address_zip"/>
+                                        <field name="country_id" placeholder="Country" class="o_address_country" options='{"no_open": True, "no_create": True}'/>
                                     </div>
                                 </group>
 
                                 <group>
                                     <label for="contact_name"/>
                                     <div>
-                                        <field name="contact_name" class="oe_inline"/>
-                                        <field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" options='{"no_open": True}' class="oe_inline"/>
+                                        <field name="contact_name"/>
+                                        <field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" options='{"no_open": True}'/>
                                     </div>
                                     <field name="function"/>
                                     <field name="mobile"/>
diff --git a/addons/crm/sales_team_view.xml b/addons/crm/sales_team_view.xml
index 16737d40962..47b00ddfd43 100644
--- a/addons/crm/sales_team_view.xml
+++ b/addons/crm/sales_team_view.xml
@@ -94,8 +94,8 @@
                                 <field name="stage_ids"/>
                         </page>
                    </xpath>
-                   <xpath expr="//field[@name='change_responsible']" position="after">
-                        <group name="alias_info" string="Leads Email Alias" class="oe_inline" attrs="{'invisible': [('alias_domain', '=', False)]}">
+                   <xpath expr="//group[@name='sales_team_escalation_group']" position="after">
+                        <group name="alias_info" string="Leads Email Alias" attrs="{'invisible': [('alias_domain', '=', False)]}">
                             <label for="alias_name" string="Email Alias"
                                 attrs="{'invisible': [('alias_domain', '=', False)]}"/>
                             <div name="alias_def"
diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
index cb744689773..eab8f47d675 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -8,11 +8,11 @@
             <field name="arch" type="xml">
                 <form string="Convert to Opportunity">
                     <group name="name">
-                        <field name="name" class="oe_inline" widget="radio"/>
+                        <field name="name" widget="radio"/>
                     </group>
                     <group string="Assign these opportunities to">
-                        <field name="user_id" class="oe_inline" on_change="on_change_user(user_id, team_id, context)"/>
-                        <field name="team_id" class="oe_inline" groups="base.group_multi_salesteams"/>
+                        <field name="user_id" on_change="on_change_user(user_id, team_id, context)"/>
+                        <field name="team_id" groups="base.group_multi_salesteams"/>
                     </group>
                     <group string="Opportunities" attrs="{'invisible': [('name', '!=', 'merge')]}">
                         <field name="opportunity_ids" nolabel="1">
@@ -31,15 +31,13 @@
                         </field>
                     </group>
                     <group name="action" attrs="{'invisible': [('name', '!=', 'convert')]}" string="Customers" col="1">
-                        <field name="action" class="oe_inline" nolabel="1" widget="radio" on_change="onchange_action(action, context)" />
+                        <field name="action" nolabel="1" widget="radio" on_change="onchange_action(action, context)" />
                         <group col="2">
-                            <field name="partner_id" attrs="{'required': [('action', '=', 'exist')], 'invisible':[('action','!=','exist')]}"
-                                class="oe_inline"/>
+                            <field name="partner_id" attrs="{'required': [('action', '=', 'exist')], 'invisible':[('action','!=','exist')]}"/>
                         </group>
                     </group>
                     <footer>
                         <button name="action_apply" string="Create Opportunity" type="object" class="oe_highlight"/>
-                        or
                         <button string="Cancel" class="oe_link" special="cancel"/>
                     </footer>
                 </form>
diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index 296a46ae6e1..c99f905a370 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -253,10 +253,10 @@
                                 <field name="company_id" groups="base.group_multi_company"/>
                             </group>
                             <group >
-                                <label for="odometer" />
-                                <div>
-                                    <field name="odometer" class="oe_inline"/>
-                                    <field name="odometer_unit" class="oe_inline"/>
+                                <label for="odometer"/>
+                                <div class="o_row">
+                                    <field name="odometer"/>
+                                    <field name="odometer_unit"/>
                                 </div>
                                 <field name="acquisition_date" />
                                 <field name="car_value" />
@@ -272,14 +272,14 @@
                                 <field name="transmission" />
                                 <field name="fuel_type" />
                                 <label for="co2"/>
-                                <div>
-                                    <field name="co2" class="oe_inline"/> g/km
+                                <div class="o_row">
+                                    <field name="co2"/><span>g/km</span>
                                 </div>
                                 <field name="horsepower" />
                                 <field name="horsepower_tax" />
                                 <label for="power"/>
-                                <div>
-                                    <field name="power" class="oe_inline"/> kW
+                                <div class="o_row">
+                                    <field name="power"/><span>kW</span>
                                 </div>
                             </group>
                         </group>
@@ -302,7 +302,7 @@
                     <field name="vin_sn" />
                     <field name="acquisition_date" />
                     <field name="state_id"/>
-                    <field name="odometer" />
+                    <field name="odometer"/>
                     <field name="odometer_unit" />
                     <field name="contract_renewal_due_soon" invisible="1"/>
                     <field name="contract_renewal_overdue" invisible="1" />
@@ -448,9 +448,9 @@
                             </group>
                             <group string="Odometer details">
                                 <label for="odometer"/>
-                                <div>
-                                    <field name="odometer" class="oe_inline"/>
-                                    <field name="odometer_unit" class="oe_inline"/>
+                                <div class="o_row">
+                                    <field name="odometer"/>
+                                    <field name="odometer_unit"/>
                                 </div>
                             </group>
                         </group>
@@ -647,7 +647,7 @@
             <field name="arch" type="xml">
                 <form string="Fuel Logs">
                     <sheet>
-                        <group col="2">
+                        <group>
                             <group string="Vehicle Details">
                                 <field name="vehicle_id" on_change="on_change_vehicle(vehicle_id)"/>
                             </group>
@@ -657,12 +657,12 @@
                                 <field name="amount" on_change="on_change_amount(liter,price_per_liter,amount)"/>
                             </group>
                         </group>
-                        <group col="2">
+                        <group>
                             <group string="Odometer Details">
                                 <label for="odometer"/>
-                                <div>
-                                    <field name="odometer" class="oe_inline"/>
-                                    <field name="odometer_unit" class="oe_inline"/>
+                                <div class="o_row">
+                                    <field name="odometer"/>
+                                    <field name="odometer_unit"/>
                                 </div>
                             </group>
                             <group string="Additional Details">
@@ -672,9 +672,7 @@
                                 <field name="vendor_id" context="{'default_supplier': True}"/>
                             </group>
                         </group>
-                        <group string="Notes">
-                            <field nolabel="1" name="notes" placeholder="Write here any other information"/>
-                        </group>
+                        <field name="notes" placeholder="Write here any other information"/>
                     </sheet>
                 </form>
             </field>
@@ -761,9 +759,9 @@
                             </group>
                             <group string="Odometer Details">
                                 <label for="odometer"/>
-                                <div>
-                                    <field name="odometer" class="oe_inline"/>
-                                    <field name="odometer_unit" class="oe_inline"/>
+                                <div class="o_row">
+                                    <field name="odometer"/>
+                                    <field name="odometer_unit"/>
                                 </div>
                             </group>
                         </group>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index a57db47ccfb..c3d33d0e6c7 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -350,7 +350,7 @@
                         <field name="state" widget="statusbar" statusbar_visible="recruit,open"/>
                     </header>
                     <sheet>
-                        <div class="oe_right" name="button_box"/>
+                        <div class="oe_button_box" name="button_box"/>
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
                             <h1><field name="name"/></h1>
@@ -518,4 +518,4 @@
             groups="group_multi_departments"/>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 164cefa9c97..d0378f610bb 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -87,12 +87,13 @@
                         <group>
                             <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}" required="1"/>
                             <field name="holiday_status_id" context="{'employee_id':employee_id}"/>
-                                <label for="number_of_days_temp" string="Duration"/>
+                            <label for="number_of_days_temp" string="Duration"/>
                             <div>
-                                <group col="3" attrs="{'invisible': [('type', '=', 'add')]}">
-                                    <field name="date_from" nolabel="1" on_change="onchange_date_from(date_to, date_from)" attrs="{'required':[('type', '=', 'remove')]}" class="oe_inline"/><label string="-" class="oe_inline"/>
-                                    <field name="date_to" nolabel="1" on_change="onchange_date_to(date_to, date_from)"  attrs="{'required':[('type', '=', 'remove')]}" class="oe_inline"/>
-                                </group>
+                                <div attrs="{'invisible': [('type', '=', 'add')]}">
+                                    <field name="date_from" on_change="onchange_date_from(date_to, date_from)" attrs="{'required':[('type', '=', 'remove')]}" class="oe_inline"/>
+                                    <label string="-" class="oe_inline"/>
+                                    <field name="date_to" on_change="onchange_date_to(date_to, date_from)"  attrs="{'required':[('type', '=', 'remove')]}" class="oe_inline"/>
+                                </div>
                                 <div>
                                     <field name="number_of_days_temp" class="oe_inline"/> days
                                 </div>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 65c32f7eb3e..b0c39e04337 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -700,4 +700,4 @@
     </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/mass_mailing/views/mass_mailing.xml b/addons/mass_mailing/views/mass_mailing.xml
index baebe825304..93f644fb9b9 100644
--- a/addons/mass_mailing/views/mass_mailing.xml
+++ b/addons/mass_mailing/views/mass_mailing.xml
@@ -369,9 +369,7 @@
                         <button name="cancel_mass_mailing" type="object" attrs="{'invisible': [('state', '!=', 'in_queue')]}" class="oe_highlight" string="Cancel"/>
                         <button name="retry_failed_mail" type="object" attrs="{'invisible': ['|', ('state', '!=', 'done'), ('failed', '=', 0)]}" class="oe_highlight" string="Retry"/>
 
-                        <!-- Note : the statusbar is between <span> because of a Chrome CSS interpretation bug,
-                        which render the statusbar on two lines instead of one -->
-                        <span><field name="state" readonly="1" widget="statusbar"/></span>
+                        <field name="state" readonly="1" widget="statusbar"/>
                     </header>
                     <div class="oe_form_box_info oe_text_center" attrs="{'invisible': [('scheduled', '=', 0)]}">
                         <p><strong>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 32c042f1604..1d46d16c72e 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -731,21 +731,20 @@
                     </div>
                     <group>
                         <group>
-                            <field name="product_id" on_change="product_id_change(product_id, product_qty)" domain="[('bom_ids','!=',False),('bom_ids.type','!=','phantom')]" class="oe_inline" context='{"default_type": "product"}'/>
+                            <field name="product_id" on_change="product_id_change(product_id, product_qty)" domain="[('bom_ids','!=',False),('bom_ids.type','!=','phantom')]" context='{"default_type": "product"}'/>
                             <field name="product_tmpl_id" invisible="1"/>
                             <label for="product_qty"/>
-                            <div>
-                                <field name="product_qty" class="oe_inline" on_change="product_id_change(product_id, product_qty)"/>
-                                <field name="product_uom" groups="product.group_uom" class="oe_inline"/>
+                            <div class="o_row">
+                                <field name="product_qty" on_change="product_id_change(product_id, product_qty)"/>
+                                <field name="product_uom" groups="product.group_uom"/>
                                 <button type="action"
                                     name="%(mrp.action_change_production_qty)d"
                                     string="Update" states="confirmed" class="oe_edit_only oe_link"/>
                             </div>
                             <label for="product_uos_qty" groups="product.group_uos"/>
-                            <div groups="product.group_uos">
-                                <field name="product_uos_qty" class="oe_inline"/>
-                                <label string="-" attrs="{'invisible':[('product_uos','=',False)]}" class="oe_inline"/>
-                                <field name="product_uos" class="oe_inline"/>
+                            <div groups="product.group_uos" class="o_row">
+                                <field name="product_uos_qty"/>
+                                <field name="product_uos"/>
                             </div>
                             <field name="date_planned"/>
                         </group>
@@ -757,7 +756,7 @@
                                                 ('product_tmpl_id.product_variant_ids','=',product_id),
                                                 ('product_id','=',False)]"
                                 context="{'default_product_id': product_id, 'default_product_tmpl_id': product_tmpl_id}" on_change="bom_id_change(bom_id)" required="1"/>
-                            <field name="routing_id" class="oe_inline" groups="mrp.group_mrp_routings"/>
+                            <field name="routing_id" groups="mrp.group_mrp_routings"/>
                             <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'mrp.group_mrp_user']}"/>
                             <field name="origin"/>
                         </group>
diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index dc49df48bb3..ae9fc80a471 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -189,4 +189,4 @@
     <menuitem name="Stages" id="menu_notes_stage" parent="menu_note_configuration" action="note.action_note_stage" sequence="21" />
 
   </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/note/static/src/css/note.css b/addons/note/static/src/css/note.css
index 780cd280830..bf88d099ffb 100644
--- a/addons/note/static/src/css/note.css
+++ b/addons/note/static/src/css/note.css
@@ -1,8 +1,10 @@
 .oe_kanban_column .note_text_line_through {
-  text-decoration: line-through; }
+  text-decoration: line-through;
+}
 
 .openerp .oe_form .oe_pad.oe_memo {
-  width: auto; }
+  width: auto;
+}
 .openerp .oe_form .oe_form_field.oe_memo {
   margin: 0;
   padding: 0px;
@@ -11,3 +13,8 @@
   .openerp .oe_form .oe_form_field.oe_memo .cleditorMain {
     border: none;
     padding: 0px; }
+
+.o-form-view.o_note_form_view .o_form_statusbar .o_statusbar_buttons, .o-form-view.o_note_form_view .o_form_statusbar .o_statusbar_status {
+  order: 1;
+}
+
diff --git a/addons/note/static/src/css/note.sass b/addons/note/static/src/css/note.sass
index 08f0548bd22..9ce859f9c67 100644
--- a/addons/note/static/src/css/note.sass
+++ b/addons/note/static/src/css/note.sass
@@ -27,3 +27,8 @@
       .cleditorMain
         border: none
         padding: 0px
+
+.o-form-view.o_note_form_view
+  .o_form_statusbar
+    .o_statusbar_buttons, .o_statusbar_status
+      order: 1 // many2many tag before statusbar button div (no button)
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index aeca4224ae7..44e6d116c5f 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -663,9 +663,7 @@
                         <button string="Set to Active" name="set_active" type="object" states="inactive,deprecated"/>
                         <button string="Set to Inactive" name="set_inactive" type="object" states="active" />
                         <button string="Set to Deprecated" name="set_deprecate" type="object" states="active,inactive" />
-                        <div class="oe_right">
-                            <field name="state" widget="statusbar" statusbar_visible="active,inactive,deprecated" statusbar_colors='{"deprecated" : "red"}' nolabel="1"/>
-                        </div>
+                        <field name="state" widget="statusbar" statusbar_visible="active,inactive,deprecated" statusbar_colors='{"deprecated" : "red"}' nolabel="1"/>
                     </header>
 
                     <sheet>
diff --git a/addons/point_of_sale/res_partner_view.xml b/addons/point_of_sale/res_partner_view.xml
index f0533f3e4d9..34448d0c1bd 100644
--- a/addons/point_of_sale/res_partner_view.xml
+++ b/addons/point_of_sale/res_partner_view.xml
@@ -8,11 +8,12 @@
             <field name="inherit_id" ref="stock.view_partner_stock_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//group[@name='warehouse']" position="before">
-                    <group name="point_of_sale" position="replace">
-                        <group string="Point of Sale">
-                            <field name="barcode" />
-                            <button name="%(action_edit_ean)d" type="action" string="Set a Custom EAN" />
-                        </group>
+                    <group string="Point of Sale" name="point_of_sale">
+                        <label for="barcode"/>
+                        <div class="o_row">
+                            <field name="barcode" nolabel="1"/>
+                            <button name="%(action_edit_ean)d" type="action" string="Set a Custom EAN" class="oe_link"/>
+                        </div>
                     </group>
                 </xpath>
             </field>
diff --git a/addons/pos_loyalty/views/views.xml b/addons/pos_loyalty/views/views.xml
index 4659e2b9061..2aa4f110727 100644
--- a/addons/pos_loyalty/views/views.xml
+++ b/addons/pos_loyalty/views/views.xml
@@ -20,7 +20,7 @@
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="point_of_sale.view_partner_property_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//group[@string='Point of Sale']" position="after">
+                <xpath expr="//group[@name='point_of_sale']" position="after">
                     <group name="loyalty" string="Loyalty Programs">
                         <field name="loyalty_points" />
                     </group>
diff --git a/addons/product/partner_view.xml b/addons/product/partner_view.xml
index a713943fd1b..813e8c9a59a 100644
--- a/addons/product/partner_view.xml
+++ b/addons/product/partner_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml"> 
                 <group name="sale">
                     <field name="property_product_pricelist" groups="product.group_sale_pricelist" attrs="{'invisible': [('is_company','=',False),('parent_id','!=',False)]}"/>
-                    <div name="parent_pricelists" groups="product.group_sale_pricelist" attrs="{'invisible': ['|',('is_company','=',True),('parent_id','=',False)]}">
+                    <div name="parent_pricelists" groups="product.group_sale_pricelist" colspan="2" attrs="{'invisible': ['|',('is_company','=',True),('parent_id','=',False)]}">
                         <p>Pricelists are managed on <button name="open_commercial_entity" type="object" string="the parent company" class="oe_link"/></p>
                     </div>
                 </group>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 2a97f0d262a..b4e7997fb38 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -864,4 +864,4 @@
         </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 36ff5bccf03..411bb77b6c9 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -691,4 +691,4 @@
         <menuitem action="project_tags_action" id="menu_project_tags_act" parent="base.menu_definitions" groups="base.group_no_one"/>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index b9b03b0bf60..bd5a38b2d5d 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -343,4 +343,4 @@
         </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 0b33340797b..a39ae3e37d5 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -263,8 +263,8 @@
                                 </div>
                                 <field name="amount_total" nolabel="1" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                             </group>
-                            <div class="oe_clear"/>
                             <field name="notes" class="oe_inline" placeholder="An administrator can set up default Terms and conditions in your Company settings."/>
+                            <div class="oe_clear"/>
                         </page>
                         <page string="Bid">
                             <group>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 8e20b5c5e36..d95f65aef92 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -289,8 +289,8 @@
                                 </div>
                                 <field name="amount_total" nolabel="1" class="oe_subtotal_footer_separator" widget='monetary' options="{'currency_field': 'currency_id'}"/>
                             </group>
-                            <div class="oe_clear"/>
                             <field name="note" class="oe_inline" placeholder="An administrator can set up default Terms and conditions in your Company settings."/>
+                            <div class="oe_clear"/>
                         </page>
                         <page string="Other Information" groups="base.group_user">
                             <group>
diff --git a/addons/sales_team/sales_team.xml b/addons/sales_team/sales_team.xml
index 4bf0c95ec16..1786272c364 100644
--- a/addons/sales_team/sales_team.xml
+++ b/addons/sales_team/sales_team.xml
@@ -92,7 +92,7 @@
                             </page>
                             <page string="More Info" groups="base.group_sale_manager">
                                 <group name="sales_team_more_info">
-                                    <group string="Escalation">
+                                    <group string="Escalation" name="sales_team_escalation_group">
                                         <field name="parent_id"/>
                                         <field name="change_responsible"/>                                
                                     </group>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 331c3e0c9fe..8779f80da7e 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1121,27 +1121,24 @@
                 </header>
                 <sheet>
                     <group>
-                        <group name="main_grp" colspan="4">
+                        <group name="main_grp" colspan="2">
                             <group name="main_grp_col1">
                                 <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
                                 <label for="product_uom_qty"/>
-                                <div>
+                                <div class="o_row">
                                     <field name="product_uom_qty"
-                                        on_change="onchange_quantity(product_id, product_uom_qty, product_uom, product_uos)"
-                                        class="oe_inline"/>
-                                    <field name="product_uom" groups="product.group_uom" class="oe_inline"/>
-                                    <button name="%(stock.move_scrap)d"
-                                            string="Scrap" type="action"
-                                            icon="terp-gtk-jump-to-ltr" context="{'scrap': True}"
-                                            states="draft,waiting,confirmed,assigned" colspan="1"/>
+                                        on_change="onchange_quantity(product_id, product_uom_qty, product_uom, product_uos)"/>
+                                    <field name="product_uom" groups="product.group_uom"/>
+                                    <button name="%(stock.move_scrap)d" class="btn-default"
+                                            string="Scrap" type="action" context="{'scrap': True}"
+                                            states="draft,waiting,confirmed,assigned"/> <!-- FIXME icon="terp-gtk-jump-to-ltr" -->
                                 </div>
                                 <field name="name"/>
                                 <label for="product_uos_qty" groups="product.group_uos"/>
-                                <div groups="product.group_uos">
+                                <div groups="product.group_uos" class="o_row">
                                     <field name="product_uos_qty"
-                                        on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)"
-                                        class="oe_inline"/>
-                                    <field name="product_uos" class="oe_inline"/>
+                                        on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)"/>
+                                    <field name="product_uos"/>
                                 </div>
                             </group>
                             <group name="main_grp_col2">
@@ -1165,7 +1162,7 @@
                             <field name="partner_id" context="{'contact_display':'partner'}" />
                             <field name="move_dest_id" groups="base.group_no_one" readonly="1"/>
                         </group>
-                        <group name="quants_grp" string="Reserved Quants" colspan="4" groups="base.group_no_one">
+                        <group name="quants_grp" string="Reserved Quants" colspan="2" groups="base.group_no_one">
                             <field name="string_availability_info"/>
                         </group>
                     </group>
diff --git a/addons/survey/views/survey_views.xml b/addons/survey/views/survey_views.xml
index caa04d18d6f..dfdfbe6040f 100644
--- a/addons/survey/views/survey_views.xml
+++ b/addons/survey/views/survey_views.xml
@@ -139,9 +139,9 @@
                                 </field>
                             </page>
                             <page string="Options">
-                                <group colspan="4">
-                                    <field name="users_can_go_back" string="User can come back in the previous page" />
-                                    <field name="auth_required" />
+                                <group class="o_label_nowrap">
+                                    <field name="users_can_go_back" string="User can come back in the previous page"/>
+                                    <field name="auth_required"/>
                                     <field name="quizz_mode" groups="base.group_no_one"/>
                                 </group>
                             </page>
@@ -396,22 +396,28 @@
                                 </field>
                             </page>
                             <page string="Options">
-                                <group string="Constraints" >
-                                    <field name="constr_mandatory" string="Mandatory Answer"/>
-                                    <field name="constr_error_msg" attrs="{'invisible': [('constr_mandatory', '=', False)]}"/>
-                                    <group colspan="2" nolabel="1" attrs="{'invisible': [('type', 'not in', ['textbox', 'numerical_box', 'datetime'])]}">
-                                        <field name="validation_required" attrs="{'invisible': [('validation_email', '=', True), ('type', '=', 'textbox')]}"/>
-                                        <group colspan="2" nolabel="1" attrs="{'invisible': [('validation_required', '=', False)]}">
-                                        <field name="validation_length_min" attrs="{'invisible': [('type', '!=', 'textbox')]}"/>
-                                        <field name="validation_length_max" attrs="{'invisible': [('type', '!=', 'textbox')]}"/>
-                                        <field name="validation_min_float_value" attrs="{'invisible': [('type', '!=', 'numerical_box')]}"/>
-                                        <field name="validation_max_float_value" attrs="{'invisible': [('type', '!=', 'numerical_box')]}"/>
-                                        <field name="validation_min_date" attrs="{'invisible': [('type', '!=', 'datetime')]}"/>
-                                        <field name="validation_max_date" attrs="{'invisible': [('type', '!=', 'datetime')]}"/>
-                                        <field name="validation_error_msg" />
-                                        </group>
+                                <group string="Constraints">
+                                    <group colspan="2" col="4">
+                                        <field name="constr_mandatory" string="Mandatory Answer"/>
+                                        <field name="constr_error_msg" attrs="{'invisible': [('constr_mandatory', '=', False)]}"/>
+                                    </group>
+                                    <div colspan="2" attrs="{'invisible': [('type', 'not in', ['textbox', 'numerical_box', 'datetime'])]}">
+                                        <group>
+                                            <field name="validation_required" attrs="{'invisible': [('validation_email', '=', True), ('type', '=', 'textbox')]}"/>
+                                        </group>
+                                        <group col="4" attrs="{'invisible': [('validation_required', '=', False)]}">
+                                            <field name="validation_length_min" attrs="{'invisible': [('type', '!=', 'textbox')]}"/>
+                                            <field name="validation_length_max" attrs="{'invisible': [('type', '!=', 'textbox')]}"/>
+                                            <field name="validation_min_float_value" attrs="{'invisible': [('type', '!=', 'numerical_box')]}"/>
+                                            <field name="validation_max_float_value" attrs="{'invisible': [('type', '!=', 'numerical_box')]}"/>
+                                            <field name="validation_min_date" attrs="{'invisible': [('type', '!=', 'datetime')]}"/>
+                                            <field name="validation_max_date" attrs="{'invisible': [('type', '!=', 'datetime')]}"/>
+                                            <field name="validation_error_msg" colspan="4"/>
+                                        </group>
+                                    </div>
+                                    <group>
+                                        <field name="matrix_subtype" attrs="{'invisible':[('type','not in',['matrix'])]}"/>
                                     </group>
-                                    <field name="matrix_subtype" attrs="{'invisible':[('type','not in',['matrix'])]}"/>
                                 </group>
                                 <group string="Display mode" attrs="{'invisible':[('type','not in',['simple_choice', 'multiple_choice'])]}">
                                     <field name="display_mode" string="Format" attrs="{'invisible':[('type','not in',['simple_choice'])],'required':[('type','=','simple_choice')]}"/>
diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 00716c073d8..4d19723ad91 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -209,4 +209,4 @@
         <menuitem id="menu_module_updates" parent="base.menu_management" sequence="20" action="modules_updates_act_cl"/>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index e4a0df2f374..8d3865c9a7e 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -589,4 +589,4 @@
         <menuitem action="action_partner_category_form" id="menu_partner_category_form" name="Categories" sequence="1" parent="menu_config_address_book" groups="base.group_no_one"/>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 8a365e7d295..5e01192fc1c 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -734,7 +734,7 @@ class groups_view(osv.osv):
         view = self.pool['ir.model.data'].xmlid_to_object(cr, SUPERUSER_ID, 'base.user_groups_view', context=context)
         if view and view.exists() and view._name == 'ir.ui.view':
             xml1, xml2 = [], []
-            xml1.append(E.separator(string=_('Application'), colspan="4"))
+            xml1.append(E.separator(string=_('Application'), colspan="2"))
             for app, kind, gs in self.get_groups_by_application(cr, uid, context):
                 # hide groups in category 'Hidden' (except to group_no_one)
                 attrs = {'groups': 'base.group_no_one'} if app and app.xml_id == 'base.module_category_hidden' else {}
@@ -751,7 +751,8 @@ class groups_view(osv.osv):
                         field_name = name_boolean_group(g.id)
                         xml2.append(E.field(name=field_name, **attrs))
 
-            xml = E.field(*(xml1 + xml2), name="groups_id", position="replace")
+            xml2.append({'class': "o_label_nowrap"})
+            xml = E.field(E.group(*(xml1), col="2"), E.group(*(xml2), col="4"), name="groups_id", position="replace")
             xml.addprevious(etree.Comment("GENERATED AUTOMATICALLY BY GROUPS"))
             xml_content = etree.tostring(xml, pretty_print=True, xml_declaration=True, encoding="utf-8")
             view.write({'arch': xml_content})
diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index 8d54be9c996..062dcc6f31e 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -150,8 +150,8 @@
                             <div attrs="{'invisible': [('id', '>', 0)]}">
                                 <field name="groups_id" readonly="1" widget="many2many_tags" style="display: inline;"/> You will be able to define additional access rights by editing the newly created user under the Settings / Users menu.
                             </div>
-                            <field name="phone" placeholder="e.g. +32.81.81.37.00"/>
-                            <field name="mobile" placeholder="e.g. +32.479.19.28.37"/>
+                            <field name="phone" widget="phone" placeholder="e.g. +32.81.81.37.00"/>
+                            <field name="mobile" widget="phone" placeholder="e.g. +32.479.19.28.37"/>
                             <field name="fax" placeholder="e.g. +32.81.81.37.10"/>
                         </group>
                     </sheet>
@@ -163,12 +163,12 @@
             <field name="model">res.users</field>
             <field name="arch" type="xml">
                 <form string="Users">
+                    <header>
+                        <button string="Change Password" type="action" name="%(change_password_wizard_action)d" help="Change the user password."/>
+                    </header>
                     <sheet>
                         <field name="id" invisible="1"/>
-                        <div class="oe_button_box" name="button_box">
-                            <button string="Change Password" type="action" name="%(change_password_wizard_action)d"
-                                class="oe_link" help="Change the user password."/>
-                        </div>
+                        <div class="oe_button_box" name="button_box"/>
                         <field name="image" widget='image' class="oe_avatar oe_left" options='{"preview_image": "image_medium"}'/>
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
@@ -189,9 +189,7 @@
                                 <group string="Allowed Companies" groups="base.group_multi_company">
                                     <field name="company_ids" nolabel="1" widget="many2many_tags"/>
                                 </group>
-                                <group col="4">
-                                    <field name="groups_id"/>
-                                </group>
+                                <field name="groups_id"/>
                             </page>
                             <page string="Preferences">
                                 <group>