diff --git a/addons/account/product_view.xml b/addons/account/product_view.xml
index b965ac7fe3e..8591b28b173 100644
--- a/addons/account/product_view.xml
+++ b/addons/account/product_view.xml
@@ -51,12 +51,12 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="product.product_category_form_view"/>
             <field name="arch" type="xml">
-                <xpath expr="//group[@name='Accounting']" position="inside">
-                    <group string="Accounting Properties">
+                <data>
+                    <xpath expr="/form/sheet//group[@name='account_property']" position="inside">
                         <field name="property_account_income_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                         <field name="property_account_expense_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                    </group>
-                </xpath>
+                    </xpath>
+                </data>
             </field>
         </record>
 
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index fdcfba092e5..76bb0c24cb5 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -45,10 +45,10 @@
                             </group>
                         </group>
                         <group>
-                            <group string="Delagated From">
+                            <group string="Delegated From">
                                 <field name="parent_ids" readonly="1" nolabel="1" />
                             </group>
-                            <group string="Delagated To" >
+                            <group string="Delegated To" >
                                 <field name="child_ids" readonly="1" nolabel="1" />
                             </group>
                         </group>
diff --git a/addons/caldav/wizard/caldav_browse_view.xml b/addons/caldav/wizard/caldav_browse_view.xml
index 0e9f1eac10b..29f455d764f 100644
--- a/addons/caldav/wizard/caldav_browse_view.xml
+++ b/addons/caldav/wizard/caldav_browse_view.xml
@@ -74,10 +74,10 @@
                     </header>
                     <sheet>
                         <group>
-                            <field name="service"  colspan="2" readonly="1"/>
-                            <field name="collection"  colspan="2" invisible="1" />
-                            <field name="calendar"  colspan="2" domain="[('collection_id','=', collection)]" readonly="1"/>
-                            <field name="device"  colspan="2"/>
+                            <field name="service" readonly="1"/>
+                            <field name="collection" invisible="1" />
+                            <field name="calendar"  domain="[('collection_id','=', collection)]" readonly="1"/>
+                            <field name="device"/>
                         </group>
                     </sheet>
                 </form>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 6cbd83c6e4e..d3f351c5d9d 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -50,9 +50,9 @@
                     </div>
                     <group>
                         <h2>
-                            <field name="date" string="Start Date" required="1"
-                            class="oe_edit_only oe_inline"/>
-                            <label string="at" class="oe_edit_only oe_inline"/> <field name="location" class="oe_edit_only oe_inline" />
+                            <label for="date" string="Starting at"/>
+                            <field name="date" required="1" class="oe_inline"/>
+                            <label string="in" class="oe_inline" attrs="{'invisible': [('location', '=', False)]}"/> <field name="location" placeholder="Specify the location here" class="oe_inline"/>
                         </h2>
                     </group>
                     <group>
@@ -60,11 +60,11 @@
                             <label for="duration" string="Duration" />
                             <field name="duration" widget="float_time"
                                 on_change="onchange_dates(date,duration,False,allday)"
-                                class="oe_inline"/>
+                                class="oe_inline"/> ( 
                             <field name="date_deadline" 
                                 string="End Date" required="1"
                                 on_change="onchange_dates(date,False,date_deadline)"                            
-                                class="oe_inline"/> 
+                                class="oe_inline"/> )
                         </h2>
                     </group>
                 <group colspan="4" col="4">
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index bfc258a5b53..0c3750a66ac 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -100,7 +100,7 @@
                     <button type="action" string="Schedule a Call" 
                         name="%(crm.crm_case_categ_phone_create_partner)d" 
                         context="{'search_default_partner_id': [active_id], 'default_duration': 1.0, 'default_partner_id': active_id}" />
-                    <button type="action" string="Opportunity"
+                    <button type="action" string="Opportunities"
                         name="%(crm.crm_case_category_act_oppor11)d" context="{'search_default_partner_id': [active_id]}"/>
                 </xpath>
             </field>
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index d49d04d2aea..0f2ad6836c8 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -239,10 +239,13 @@
                 <notebook position="inside">
                     <page string="Membership">
                         <group>
-                            <group col="3">
+                            <group>
                                 <field name="free_member"/>
-                                <button name="%(action_membership_invoice_view)d" type="action" string="Join Membership" attrs="{'readonly':[('free_member','=',True)]}"/>
-                                <field name="membership_state"/>
+                                <label for="membership_state"/>
+                                <div>
+                                    <field name="membership_state" class="oe_inline"/>
+                                    <button name="%(action_membership_invoice_view)d" type="action" string="Join Membership" attrs="{'readonly':[('free_member','=',True)]}" class="oe_inline oe_right"/>
+                                </div>
                             </group>
                             <group>
                                 <field name="associate_member" attrs="{'readonly':[('membership_state','!=', 'none')]}"/>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index edd846105a6..0fb0b0559f9 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -312,14 +312,26 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Product Categories" version="7.0">
-                    <group col="4">
-                        <field name="name"/>
-                        <field name="parent_id"/>
-                        <field name="sequence" invisible="1"/>
-                        <field name="type"/>
-                    </group>
-                    <group name="Accounting">
-                    </group>
+                    <sheet>
+                        <div class="oe_title">
+                            <h1>
+                                <label for="name" class="oe_edit_only"/>
+                                <field name="name"/>
+                            </h1>
+                        </div>
+                        <group>
+                                <group>
+                                    <field name="type"/>
+                                </group>
+                                <group>
+                                    <field name="parent_id"/>
+                                </group>
+                        </group>
+                        <group name="basic">
+                            <group name="account_property" string="Account Properties"/>
+                            <group name="account_stock_property" string="Account Stock Properties"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index eeec5f154fc..a98e9088402 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -153,22 +153,21 @@
                 </header>
                 <sheet>
                     <div class="oe_title">
-                    <label for="name" class="oe_edit_only"/>
-                    <h1><field name="name"/></h1>
-                    <label for="project_id" class="oe_edit_only"/>
-                    <h2>
-                        <field name="project_id" on_change="onchange_project(project_id)" colspan="3"/>
-                    </h2>
+                        <label for="name" class="oe_edit_only"/>
+                        <h1><field name="name"/></h1>
+                        <label for="project_id" class="oe_edit_only"/>
+                        <h2>
+                            <field name="project_id" on_change="onchange_project(project_id)" colspan="3"/>
+                        </h2>
                     </div>
                     <group>
                     <label for="date_start" string="Duration"/>
                     <div>
-                        <field name="date_start" nolabel="1" class="oe_inline"/>    -
-                        <field name="date_end" nolabel="1" class="oe_inline"/>
                         <div>
-                        <field name="duration" nolabel="1" class="oe_inline"/>
-                        <field name="product_uom" nolabel="1" class="oe_inline"/>
+                            <field name="duration" class="oe_inline"/>
+                            <field name="product_uom" class="oe_inline"/>
                         </div>
+                        <field name="date_start" class="oe_inline"/><label string=" - " class="oe_inline"/><field name="date_end" class="oe_inline"/>
                     </div>
                     </group>
                     <notebook>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index f47831f1940..bdb2d01467f 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -13,7 +13,7 @@
                     <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
                     <label for="warehouse_id" class="oe_edit_only"/>
-                    <h2><field name="warehouse_id" required="1" widget="selection"/></h2>
+                    <h2><field name="warehouse_id" required="1"/></h2>
                     <group>
                         <group>
                             <field name="payment_default_id"/>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 1641c7d1403..e28eb0644d0 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -21,14 +21,14 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="product.product_category_form_view"/>
             <field name="arch" type="xml">
-                <xpath expr="//group[@name='Accounting']" position="inside">
+                <form position="inside" version="7.0">
                     <group string="Accounting Stock Properties">
                         <field name="property_stock_account_input_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                         <field name="property_stock_account_output_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                         <field name="property_stock_valuation_account_id" domain="[('type','&lt;&gt;','view'), ('type','&lt;&gt;','consolidation')]"/>
                         <field name="property_stock_journal"/>
                     </group>
-                </xpath>
+                </form>
             </field>
         </record>
 
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 7418056d5ce..700585122d3 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -144,7 +144,7 @@
                         </group>
                         <notebook colspan="4">
                             <page string="Content">
-                            <field name="text_area" nolabel="1" colspan="4" select="1" widget="text_wiki" placeholder="Wiki Content"/>
+                            <field name="text_area" nolabel="1" colspan="4" widget="text_wiki" placeholder="Wiki Content"/>
                             </page>
                         </notebook>
                         <group col="2" colspan="2" groups="base.group_no_one">