diff --git a/odoo/addons/base/views/res_bank_views.xml b/odoo/addons/base/views/res_bank_views.xml
index 950472edd15..b83bcb46222 100644
--- a/odoo/addons/base/views/res_bank_views.xml
+++ b/odoo/addons/base/views/res_bank_views.xml
@@ -7,31 +7,34 @@
             <field name="model">res.bank</field>
             <field name="arch" type="xml">
                 <form string="Bank">
-                    <group col="4">
-                        <field name="name"/>
-                        <field name="bic"/>
-                    </group>
-                    <group>
-                        <group string="Address">
-                            <label for="street" string="Address"/>
-                            <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" class="o_address_state" placeholder="State" options='{"no_open": True}'/>
-                                <field name="zip" placeholder="ZIP" class="o_address_zip"/>
-                                <field name="country" placeholder="Country" class="o_address_country" options='{"no_open": True, "no_create": True}'/>
-                            </div>
+                    <sheet>
+                        <group name="bank_details" col="4">
+                            <field name="name"/>
+                            <field name="bic"/>
                         </group>
-                        <group string="Communication">
-                            <field name="phone"/>
-                            <field name="email" widget="email"/>
-                            <field name="active"/>
+                        <group>
+                            <group name="address_details" string="Address">
+                                <label for="street" string="Address"/>
+                                <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" class="o_address_state" placeholder="State" options='{"no_open": True}'/>
+                                    <field name="zip" placeholder="ZIP" class="o_address_zip"/>
+                                    <field name="country" placeholder="Country" class="o_address_country" options='{"no_open": True, "no_create": True}'/>
+                                </div>
+                            </group>
+                            <group name="communication_details" string="Communication">
+                                <field name="phone"/>
+                                <field name="email" widget="email"/>
+                                <field name="active"/>
+                            </group>
                         </group>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>
+
         <record id="view_res_bank_tree" model="ir.ui.view">
             <field name="name">res.bank.tree</field>
             <field name="model">res.bank</field>
@@ -43,6 +46,7 @@
                 </tree>
             </field>
         </record>
+
         <record id="action_res_bank_form" model="ir.actions.act_window">
             <field name="name">Banks</field>
             <field name="res_model">res.bank</field>
@@ -79,6 +83,7 @@
                 </form>
             </field>
         </record>
+
         <record id="view_partner_bank_tree" model="ir.ui.view">
             <field name="name">res.partner.bank.tree</field>
             <field name="model">res.partner.bank</field>
@@ -93,6 +98,7 @@
                 </tree>
             </field>
         </record>
+
         <record id="view_partner_bank_search" model="ir.ui.view">
             <field name="name">res.partner.bank.search</field>
             <field name="model">res.partner.bank</field>
@@ -104,6 +110,7 @@
                 </search>
             </field>
         </record>
+
         <record id="action_res_partner_bank_account_form" model="ir.actions.act_window">
             <field name="name">Bank Accounts</field>
             <field name="res_model">res.partner.bank</field>
@@ -116,7 +123,6 @@
             </field>
         </record>
 
-
     </data>
 </odoo>
 
diff --git a/odoo/addons/base/views/res_country_views.xml b/odoo/addons/base/views/res_country_views.xml
index aede3731c9d..b76aa7b0569 100644
--- a/odoo/addons/base/views/res_country_views.xml
+++ b/odoo/addons/base/views/res_country_views.xml
@@ -20,34 +20,36 @@
             <field name="model">res.country</field>
             <field name="arch" type="xml">
                 <form>
-                    <div class="oe_button_box">
-                    </div>
-                    <field name="image" widget="image" class="oe_avatar"/>
-                    <group>
-                        <group>
-                            <field name="name"/>
-                            <field name="currency_id"/>
-                            <field name="code"/>
+                    <sheet>
+                        <div class="oe_button_box">
+                        </div>
+                        <field name="image" widget="image" class="oe_avatar"/>
+                        <group name="main_group">
+                            <group name="country_details">
+                                <field name="name"/>
+                                <field name="currency_id"/>
+                                <field name="code"/>
+                            </group>
+                            <group name="phone_vat_settings">
+                                <field name="phone_code"/>
+                                <field name="vat_label"/>
+                            </group>
+                            <group name="advanced_address_formatting" string="Advanced Address Formatting" groups="base.group_no_one" col="4" colspan="4">
+                                <field name="address_view_id"/>
+                                <div colspan="2" class="text-muted">Choose a subview of partners that includes only address fields, to change the way users can input addresses.</div>
+                                <field name="address_format" placeholder="Address format..."/>
+                                <div colspan="2" name="div_address_format" class="text-muted">Change the way addresses are displayed in reports</div>
+                                <field name="name_position"/>
+                            </group>
                         </group>
-                        <group>
-                            <field name="phone_code"/>
-                            <field name="vat_label"/>
-                        </group>
-                        <group string="Advanced Address Formatting" groups="base.group_no_one" col="4" colspan="4">
-                            <field name="address_view_id"/>
-                            <div colspan="2" class="text-muted">Choose a subview of partners that includes only address fields, to change the way users can input addresses.</div>
-                            <field name="address_format" placeholder="Address format..."/>
-                            <div colspan="2" name="div_address_format" class="text-muted">Change the way addresses are displayed in reports</div>
-                            <field name="name_position"/>
-                        </group>
-                    </group>
-                    <label for="state_ids"/>
-                    <field name="state_ids">
-                        <tree editable="bottom">
-                            <field name="name"/>
-                            <field name="code"/>
-                        </tree>
-                    </field>
+                        <label for="state_ids"/>
+                        <field name="state_ids">
+                            <tree editable="bottom">
+                                <field name="name"/>
+                                <field name="code"/>
+                            </tree>
+                        </field>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -75,13 +77,15 @@
             <field name="model">res.country.group</field>
             <field name="arch" type="xml">
                 <form string="Country Group">
-                    <div class="oe_title">
-                        <label for="name" string="Group name" class="oe_edit_only"/>
-                        <h1><field name="name"/></h1>
-                    </div>
-                    <group name="country_group">
-                        <field name="country_ids" widget="many2many_tags"/>
-                    </group>
+                    <sheet>
+                        <div class="oe_title">
+                            <label for="name" string="Group name" class="oe_edit_only"/>
+                            <h1><field name="name"/></h1>
+                        </div>
+                        <group name="country_group">
+                            <field name="country_ids" widget="many2many_tags"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -112,11 +116,13 @@
             <field name="model">res.country.state</field>
             <field name="arch" type="xml">
                 <form string="State">
-                    <group>
-                        <field name="name"/>
-                        <field name="code"/>
-                        <field name="country_id" options='{"no_open": True}'/>
-                    </group>
+                    <sheet>
+                        <group>
+                            <field name="name"/>
+                            <field name="code"/>
+                            <field name="country_id" options='{"no_open": True}'/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/odoo/addons/base/views/res_partner_views.xml b/odoo/addons/base/views/res_partner_views.xml
index 447683bfdeb..ac44e451bbb 100644
--- a/odoo/addons/base/views/res_partner_views.xml
+++ b/odoo/addons/base/views/res_partner_views.xml
@@ -18,10 +18,12 @@
             <field name="model">res.partner.title</field>
             <field name="arch" type="xml">
                 <form string="Partner Titles">
-                    <group col="4">
-                        <field name="name"/>
-                        <field name="shortcut"/>
-                    </group>
+                    <sheet>
+                        <group col="4">
+                            <field name="name"/>
+                            <field name="shortcut"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -683,11 +685,13 @@
             <field name="model">res.partner.category</field>
             <field name="arch" type="xml">
                 <form string="Contact Tag">
-                    <group col="4">
-                        <field name="name"/>
-                        <field name="active"/>
-                        <field name="parent_id"/>
-                    </group>
+                    <sheet>
+                        <group col="4">
+                            <field name="name"/>
+                            <field name="active"/>
+                            <field name="parent_id"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -721,11 +725,13 @@
             <field name="model">res.partner.industry</field>
             <field name="arch" type="xml">
                 <form string="Industry">
-                    <group col="4">
-                        <field name="name"/>
-                        <field name="full_name"/>
-                        <field name="active"/>
-                    </group>
+                    <sheet>
+                        <group col="4">
+                            <field name="name"/>
+                            <field name="full_name"/>
+                            <field name="active"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>