diff --git a/addons/website_sale/views/views.xml b/addons/website_sale/views/views.xml
index 83fd25b7619..3c41056c0aa 100644
--- a/addons/website_sale/views/views.xml
+++ b/addons/website_sale/views/views.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
-
+<odoo>
     <record model="ir.ui.view" id="product_pricelist_view">
         <field name="name">product.pricelist.website.form</field>
         <field name="model">product.pricelist</field>
@@ -165,12 +163,9 @@
         <field name="model">res.country.group</field>
         <field name="inherit_id" ref="base.view_country_group_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//field[@name='country_ids']" position="after">
+            <group name="country_group" position="after">
                 <field name="website_pricelist_ids"/>
-            </xpath>
+            </group>
         </field>
     </record>
-
- </data>
-
-</openerp>
+</odoo>
diff --git a/openerp/addons/base/res/res_country_view.xml b/openerp/addons/base/res/res_country_view.xml
index ebe1f873bd7..ed1c74319e0 100644
--- a/openerp/addons/base/res/res_country_view.xml
+++ b/openerp/addons/base/res/res_country_view.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
         <!--
         Country
         -->
-
         <record id="view_country_tree" model="ir.ui.view">
             <field name="name">res.country.tree</field>
             <field name="model">res.country</field>
@@ -21,7 +19,7 @@
             <field name="name">res.country.form</field>
             <field name="model">res.country</field>
             <field name="arch" type="xml">
-                <form string="Country">
+                <form>
                     <field name="image" widget="image" class="oe_avatar"/>
                     <group>
                         <group>
@@ -35,8 +33,12 @@
                         </group>
                     </group>
                     <label for="state_ids"/>
-                    <field name="state_ids"/>
-                    
+                    <field name="state_ids">
+                        <tree editable="bottom">
+                            <field name="name"/>
+                            <field name="code"/>
+                        </tree>
+                    </field>
                 </form>
             </field>
         </record>
@@ -68,8 +70,13 @@
             <field name="model">res.country.group</field>
             <field name="arch" type="xml">
                 <form string="Country Group">
-                    <field name="name"/>
-                    <field name="country_ids" widget="many2many_tags"/>
+                    <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>
                 </form>
             </field>
         </record>
@@ -82,13 +89,9 @@
             <field name="help">Display and manage the list of all countries group. You can create or delete country group to make sure the ones you are working on will be maintained.</field>
         </record>
 
-
         <menuitem action="action_country_group" id="menu_country_group" name="Country Group" parent="menu_localisation" sequence="3" groups="base.group_no_one"/>
 
-        <!--
-          State
-        -->
-
+        <!-- State -->
         <record id="view_country_state_tree" model="ir.ui.view">
             <field name="name">res.country.state.tree</field>
             <field name="model">res.country.state</field>
@@ -124,7 +127,6 @@
             <field name="help">If you are working on the American market, you can manage the different federal states you are working on from here. Each state is attached to one country.</field>
         </record>
 
-          <menuitem action="action_country_state" id="menu_country_state_partner" parent="menu_localisation" sequence="2" groups="base.group_no_one"/>
-
+        <menuitem action="action_country_state" id="menu_country_state_partner" parent="menu_localisation" sequence="2" groups="base.group_no_one"/>
     </data>
 </openerp>