diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 53f556b77c2..cd75daa6c07 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -115,7 +115,7 @@
                                 <group name="bank" string="Information About the Bank">
                                     <field name="bank" on_change="onchange_bank_id(bank)"/>
                                     <field name="bank_name"/>
-                                    <field name="bank_bic" placeholder="[Identifier code]"/>
+                                    <field name="bank_bic" placeholder="e.g. GEBABEBB"/>
                                 </group>
                             </group>
                         </form>
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 5aead3d086d..a9e5949a3ca 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1034,7 +1034,7 @@ class calendar_event(osv.osv):
              ('confidential', 'Public for Employees')], 'Privacy', states={'done': [('readonly', True)]}),
         'location': fields.char('Location', size=264, help="Location of Event", states={'done': [('readonly', True)]}),
         'show_as': fields.selection([('free', 'Free'), ('busy', 'Busy')], \
-                                                'Show Time As', states={'done': [('readonly', True)]}),
+                                                'Show Time as', states={'done': [('readonly', True)]}),
         'base_calendar_url': fields.char('Caldav URL', size=264),
         'state': fields.selection([('tentative', 'Tentative'),
                         ('cancelled', 'Cancelled'),
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 46cfb098166..0340b4f11a6 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+
     <!-- Calendar Attendee Form View -->
+
     <record id="attendee_form_view_inherit" model="ir.ui.view">
             <field name="name">calendar.attendee.form.inherit</field>
             <field name="model">calendar.attendee</field>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index f00b524a204..80e373160be 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -248,21 +248,6 @@
             </field>
         </record>
 
-        <!-- TOFIX: set sequence into group instead of fix group in base.view_parter_form -->
-        <record id="base.view_crm_partner_info_History1" model="ir.ui.view">
-            <field name="name">res.partner.crm.history.inherit1</field>
-            <field name="model">res.partner</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//page[@name='page_history']" position="attributes">
-                    <attribute name="invisible">False</attribute>
-                </xpath>
-                <xpath expr="//group[@name='grp_claim']" position="attributes">
-                   <attribute name="invisible">False</attribute>
-                </xpath>
-            </field>
-        </record>
         <record id="view_claim_partner_info_form1" model="ir.ui.view">
             <field name="name">res.partner.claim.info.form</field>
             <field name="model">res.partner</field>
@@ -270,15 +255,18 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="priority">20</field>
             <field name="arch" type="xml">
-                <data>
-                    <xpath expr="//group[@name='grp_claim']" position="inside">
+                <xpath expr="//page[@name='page_history']" position="attributes">
+                    <attribute name="invisible">False</attribute>
+                </xpath>
+                <xpath expr="//page[@name='page_history']" position="inside">
+                    <group name="grp_claim" string="Claim">
                         <field name="claims_ids" colspan="4" nolabel="1">
                             <tree string="Partners Claim" editable="bottom">
                                 <field name="name"/>
                             </tree>
                         </field>
-                    </xpath>
-                </data>
+                    </group>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/event/res_partner_view.xml b/addons/event/res_partner_view.xml
index 44a3d4613ec..c8760c0b07f 100644
--- a/addons/event/res_partner_view.xml
+++ b/addons/event/res_partner_view.xml
@@ -3,9 +3,9 @@
     <data>
 
          <!--  Partners inherited form -->
-        <!-- TOFIX: set sequence into group instead of fix group in base.view_parter_form -->
-        <record id="view_speaker_partner_info_form" model="ir.ui.view">
-            <field name="name">res.partner.speaker.info.inherit</field>
+
+       <record id="view_event_partner_info_form" model="ir.ui.view">
+            <field name="name">res.partner.event.info.inherit</field>
             <field name="model">res.partner</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
@@ -14,43 +14,31 @@
                     <field name="speaker"/>
                 </field>
                 <xpath expr="//page[@name='page_history']" position="attributes">
-                   <attribute name="invisible">False</attribute>
+                    <attribute name="invisible">False</attribute>
                 </xpath>
-                <xpath expr="//group[@name='grp_event']" position="attributes">
-                   <attribute name="invisible">False</attribute>
+                <xpath expr="//page[@name='page_history']" position="inside">
+                    <group name="grp_event" string="Event">
+                        <field name="event_ids" colspan="4" nolabel="1">
+                            <tree string="Events">
+                                <field name="name" string="Event"/>
+                                <field name="main_speaker_id"/>
+                            </tree>
+                        </field>
+                    </group>
+                    <group name="grp_registration" string="Registration">
+                        <field name="event_registration_ids" colspan="4" nolabel="1">
+                            <tree string="Events Registration">
+                                <field name="event_begin_date" string="Date"/>
+                                <field name="event_id" />
+                                <field name="nb_register"/>
+                                <field name="state"/>
+                                <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
+                                <button name="button_reg_close" string="Close Registration" states="open" type="object" icon="gtk-close"/>
+                                <button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                            </tree>
+                        </field>
+                    </group>
                 </xpath>
-                <xpath expr="//group[@name='grp_registration']" position="attributes">
-                   <attribute name="invisible">False</attribute>
-                </xpath>
-            </field>
-       </record>
-       <record id="view_event_partner_info_form" model="ir.ui.view">
-            <field name="name">res.partner.event.info.inherit</field>
-            <field name="model">res.partner</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="arch" type="xml">
-                <group name="grp_event" position="inside">
-                    <field name="event_ids" colspan="4" nolabel="1">
-                        <tree string="Events">
-                            <field name="name" string="Event"/>
-                            <field name="main_speaker_id"/>
-                        </tree>
-                    </field>
-                   </group>
-                   <group name="grp_registration" position="inside">
-                    <field name="event_registration_ids" colspan="4" nolabel="1">
-                        <tree string="Events Registration">
-                            <field name="event_begin_date" string="Date"/>
-                            <field name="event_id" />
-                            <field name="nb_register"/>
-                            <field name="state"/>
-                            <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
-                            <button name="button_reg_close" string="Close Registration" states="open" type="object" icon="gtk-close"/>
-                            <button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                        </tree>
-                    </field>
-               </group>
             </field>
        </record>
 
diff --git a/addons/l10n_fr_rib/bank_view.xml b/addons/l10n_fr_rib/bank_view.xml
index 38c51df58e0..627c2eacf04 100644
--- a/addons/l10n_fr_rib/bank_view.xml
+++ b/addons/l10n_fr_rib/bank_view.xml
@@ -9,7 +9,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//page[@string='Accounting']/field[@name='bank_ids']/form/field[@name='acc_number']" position="before">
+                    <xpath expr="//field[@name='bank_ids']/form/field[@name='acc_number']" position="before">
                         <newline />
                         <field name="bank_code" />
                         <field name="office" />
@@ -17,7 +17,7 @@
                         <field name="key" />
                         <newline />
                     </xpath>
-                    <xpath expr="//page[@string='Accounting']/field[@name='bank_ids']/tree/field[@name='acc_number']" position="after">
+                    <xpath expr="//field[@name='bank_ids']/tree/field[@name='acc_number']" position="after">
                         <field name="rib_acc_number"/>
                     </xpath>
                 </data>
diff --git a/addons/marketing_campaign/res_partner_view.xml b/addons/marketing_campaign/res_partner_view.xml
index 2b1b9dc09dd..ee619f041e8 100644
--- a/addons/marketing_campaign/res_partner_view.xml
+++ b/addons/marketing_campaign/res_partner_view.xml
@@ -2,31 +2,21 @@
 <openerp>
     <data>
 
-         <!--  Partners inherited form -->
-        <!-- TOFIX: set sequence into group instead of fix group in base.view_parter_form -->
-        <record id="base.view_crm_partner_info_History2" model="ir.ui.view">
-           <field name="name">res.partner.crm.history.inherit2</field>
-           <field name="model">res.partner</field>
-           <field name="type">form</field>
-           <field name="inherit_id" ref="base.view_partner_form"/>
-           <field name="arch" type="xml">
-                <xpath expr="//page[@name='page_history']" position="attributes">
-                   <attribute name="invisible">False</attribute>
-                </xpath>
-                <xpath expr="//group[@name='grp_campaign']" position="attributes">
-                   <attribute name="invisible">False</attribute>
-                </xpath>
-           </field>
-          </record>    
+         <!--  Partners inherited form -->  
         <record id="view_workitem_partner_info_form" model="ir.ui.view">
             <field name="name">res.partner.workitem.info.inherit</field>
             <field name="model">res.partner</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                    <group name="grp_campaign" position="inside">
-                            <field name="workitem_ids" colspan="4" nolabel="1"/>
+                <xpath expr="//page[@name='page_history']" position="attributes">
+                   <attribute name="invisible">False</attribute>
+                </xpath>
+                <xpath expr="//page[@name='page_history']" position="inside">
+                    <group name="grp_campaign" string="Campaign">
+                        <field name="workitem_ids" colspan="4" nolabel="1"/>
                     </group>
+                </xpath>
             </field>
        </record>
    </data>
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 71d9bca3a71..9c566a69bde 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -242,10 +242,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)]}" class="oe_inline oe_right"/>
-                                <field name="membership_state" class="oe_inline"/>
+                                <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/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index 052b49c5294..04e5dca32de 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -27,7 +27,7 @@
                     </xpath>
                     <separator string="title" position="attributes">
                         <attribute name="string"></attribute>
-                      </separator>
+                    </separator>
                 </data>
             </field>
         </record>
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml
index 8433824c268..1adb4fa5eda 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.xml
+++ b/addons/plugin_thunderbird/plugin_thunderbird.xml
@@ -33,8 +33,7 @@
                     </xpath>
                     <separator string="title" position="attributes">
                         <attribute name="string"></attribute>
-                      </separator>
-
+                    </separator>
                 </data>
             </field>
         </record>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 7610222d166..4fe51dc67f6 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -313,9 +313,14 @@
             <field name="arch" type="xml">
                 <form string="Product Categories" version="7.0">
                     <sheet>
+                        <div class="oe_title">
+                            <label for="name" class="oe_edit_only"/>
+                            <h1>
+                                <field name="name"/>
+                            </h1>
+                        </div>
                         <group>
                             <group>
-                                <field name="name"/>
                                 <field name="parent_id"/>
                             </group>
                             <group>
diff --git a/addons/project/res_partner_view.xml b/addons/project/res_partner_view.xml
index 3c2dde07376..09170c43434 100644
--- a/addons/project/res_partner_view.xml
+++ b/addons/project/res_partner_view.xml
@@ -3,39 +3,29 @@
     <data>
 
          <!--  Partners inherited form -->
-         <!-- TOFIX: set sequence into group instead of fix group in base.view_parter_form -->
-         <record id="base.view_crm_partner_info_History" model="ir.ui.view">
-            <field name="name">res.partner.crm.history.inherit1</field>
-            <field name="model">res.partner</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//page[@name='page_history']" position="attributes">
-                   <attribute name="invisible">False</attribute>
-                </xpath>
-                <xpath expr="//group[@name='grp_task']" position="attributes">
-                   <attribute name="invisible">False</attribute>
-                </xpath>
-             </field>
-          </record>
         <record id="view_task_partner_info_form" model="ir.ui.view">
             <field name="name">res.partner.task.info.inherit</field>
             <field name="model">res.partner</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                   <group name="grp_task" position="inside">
-                    <field name="task_ids" colspan="4" nolabel="1">
-                        <tree string="Tasks" editable="bottom">
-                            <field name="name"/>
-                            <field name="user_id"/>
-                            <field name="date_deadline"/>
-                            <field name="state" invisible="1"/>
-                            <button name="do_open" states="pending,draft,done,cancelled" string="Start Task" type="object" icon="gtk-media-play" help="For changing to open state" invisible="context.get('set_visible',False)"/>
-                            <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/>
-                        </tree>
-                    </field>
-                  </group>
+                <xpath expr="//page[@name='page_history']" position="attributes">
+                    <attribute name="invisible">False</attribute>
+                </xpath>
+                <xpath expr="//page[@name='page_history']" position="inside">
+                    <group name="grp_task" string="Tasks">
+                        <field name="task_ids" colspan="4" nolabel="1">
+                            <tree string="Tasks" editable="bottom">
+                                <field name="name"/>
+                                <field name="user_id"/>
+                                <field name="date_deadline"/>
+                                <field name="state" invisible="1"/>
+                                <button name="do_open" states="pending,draft,done,cancelled" string="Start Task" type="object" icon="gtk-media-play" help="For changing to open state" invisible="context.get('set_visible',False)"/>
+                                <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/>
+                            </tree>
+                        </field>
+                      </group>
+                </xpath>
             </field>
        </record>
        
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 668c48e1bf6..053f0e1765a 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -874,7 +874,7 @@
                             </group>
                         </page>
                         <page string="Notes">
-                            <field name="note" placeholder="Add an internal note"/>
+                            <field name="note" placeholder="Add an internal note..."/>
                         </page>
                     </notebook>
                 </sheet>