diff --git a/openerp/addons/base/module/wizard/base_export_language_view.xml b/openerp/addons/base/module/wizard/base_export_language_view.xml
index d2370e4cea1..9d39bd97f41 100644
--- a/openerp/addons/base/module/wizard/base_export_language_view.xml
+++ b/openerp/addons/base/module/wizard/base_export_language_view.xml
@@ -10,7 +10,7 @@
                 <form string="Export Translations" version="7.0">
                     <header>
                         <button name="act_getfile" string="_Export" type="object" states="choose" class="oe_highlight_on_dirty"/>
-                        or
+                        <label string="or" states="choose"/>
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group col="8">
diff --git a/openerp/addons/base/module/wizard/base_language_install_view.xml b/openerp/addons/base/module/wizard/base_language_install_view.xml
index 0af0981b41f..68495bd42a6 100644
--- a/openerp/addons/base/module/wizard/base_language_install_view.xml
+++ b/openerp/addons/base/module/wizard/base_language_install_view.xml
@@ -7,11 +7,11 @@
             <field name="model">base.language.install</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Load Official Translation" version="7.0">
+                <form string="Load a Translation" version="7.0">
                     <header>
-                        <button name="lang_install" string="Load" type="object" states="init" class="oe_highlight_on_dirty" />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
+                        <button name="lang_install" string="Load" type="object" states="init" class="oe_highlight_on_dirty"/>
+                        <label string="or" states="init"/>
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
                     <group colspan="4" col="8">
                         <group colspan="1">
diff --git a/openerp/addons/base/module/wizard/base_module_import_view.xml b/openerp/addons/base/module/wizard/base_module_import_view.xml
index 8410210b2c7..6406129ffc6 100644
--- a/openerp/addons/base/module/wizard/base_module_import_view.xml
+++ b/openerp/addons/base/module/wizard/base_module_import_view.xml
@@ -10,9 +10,9 @@
                 <form string="Import module" version="7.0">
                     <header>
                         <button name="importzip" string="Import module" type="object" states="init" class="oe_highlight_on_dirty"/>
-                        or
+                        <label string="or" states="init"/>
                         <button name="action_module_open" string="Open Modules" type="object" states="done" class="oe_highlight_on_dirty"/>
-                        or
+                        <label string="or" states="done"/>
                         <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
                     <group col="8">
diff --git a/openerp/addons/base/module/wizard/base_module_update_view.xml b/openerp/addons/base/module/wizard/base_module_update_view.xml
index 8e0c21fc22b..d66e2896b19 100644
--- a/openerp/addons/base/module/wizard/base_module_update_view.xml
+++ b/openerp/addons/base/module/wizard/base_module_update_view.xml
@@ -10,9 +10,9 @@
                 <form string="Update Module List" version="7.0">
                     <header>
                         <button name="update_module" string="Update" type="object" states="init" class="oe_highlight_on_dirty"/>
-                        or
+                        <label string="or" states="init"/>
                         <button name="action_module_open" string="Open Modules" type="object" states="done" class="oe_highlight_on_dirty"/>
-                        or
+                        <label string="or" states="done"/>
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group col="8">
diff --git a/openerp/addons/base/module/wizard/base_module_upgrade.py b/openerp/addons/base/module/wizard/base_module_upgrade.py
index 5fb98734031..ef9c24b878d 100644
--- a/openerp/addons/base/module/wizard/base_module_upgrade.py
+++ b/openerp/addons/base/module/wizard/base_module_upgrade.py
@@ -55,7 +55,7 @@ class base_module_upgrade(osv.osv_memory):
                                 <group>
                                     <separator string="System update completed" colspan="4"/>
                                     <label align="0.0" string="The selected modules have been updated / installed !" colspan="4"/>
-                                    <label align="0.0" string="We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)." colspan="4"/>
+                                    <label align="0.0" string="We suggest to reload the page to see the new menus." colspan="4"/>
                                 </group>
                              </form>'''
 
diff --git a/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml b/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml
index 53042072c5c..25d5aeded77 100644
--- a/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml
+++ b/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml
@@ -24,29 +24,29 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Publisher Warranty Contract" version="7.0">
+                  <header>
+                    <button name="check_validity" string="Validate" type="object"
+                        attrs="{'invisible':[('state','in',['valid', 'terminated', 'canceled'])]}"/>
+                    <button name="check_validity" string="Refresh Validation Dates" type="object"
+                        attrs="{'invisible':[('state','in',['unvalidated'])]}"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                  </header>
                   <sheet>
-                    <group col="3" colspan="4">
-                        <group col="2">
+                    <group col="3">
+                        <group>
                             <field name="name"/>
                         </group>
-                        <group col="2">
+                        <group>
                             <field name="date_start"/>
                             <field name="date_stop"/>
                             <field name="check_support"/>
                         </group>
-                        <group col="2">
+                        <group>
                             <field name="state"/>
                             <field name="kind"/>
                             <field name="check_opw"/>
                         </group>
-                        <group col="2" colspan="3">
-                            <button name="check_validity" string="Validate" type="object"
-                            attrs="{'invisible':[('state','in',['valid', 'terminated', 'canceled'])]}"/>
-                            <button name="check_validity" string="Refresh Validation Dates" type="object"
-                            attrs="{'invisible':[('state','in',['unvalidated'])]}"/>
-                            or
-                            <button string="Cancel" class="oe_link" special="cancel" />
-                        </group>
                     </group>
                   </sheet>
                 </form>
@@ -97,7 +97,7 @@
                 <form string="Register a Contract" version="7.0">
                     <header>
                         <button name="action_validate" string="Register" type="object" states="draft" class="oe_highlight_on_dirty"  />
-                        or
+                        <label string="or" states="draft"/>
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group colspan="4" col="8">
diff --git a/openerp/addons/base/res/res_config.xml b/openerp/addons/base/res/res_config.xml
index 2ff50b9b49d..c897201dc10 100644
--- a/openerp/addons/base/res/res_config.xml
+++ b/openerp/addons/base/res/res_config.xml
@@ -7,11 +7,9 @@
       <field name="arch" type="xml">
           <form version="7.0">
              <header>
-               <button name="action_next" type="object"
-                       string="Apply" class="oe_highlight_on_dirty"  />
-                or
-               <button name="action_skip" type="object" special="cancel"
-                       string="Cancel" class="oe_link"/>
+               <button name="action_next" type="object" string="Apply" class="oe_highlight_on_dirty"/>
+               or
+               <button name="action_skip" type="object" special="cancel" string="Cancel" class="oe_link"/>
              </header>
              <group string="res_config_contents"/>
           </form>
@@ -25,8 +23,7 @@
       <field name="arch" type="xml">
         <form string="Next Configuration Step" version="7.0">
             <header>
-                <button name="action_next" type="object"
-                        string="Continue" class="oe_highlight_on_dirty"/>
+                <button name="action_next" type="object" string="Continue" class="oe_highlight_on_dirty"/>
                 or
                 <button string="Cancel" class="oe_link" special="cancel" />
             </header>
@@ -48,9 +45,7 @@
                 or
                 <button string="Cancel" class="oe_link" special="cancel" />
             </header>
-            <group>
-                <separator string="title" colspan="4"/>
-            </group>
+            <separator string="title" colspan="4"/>
         </form>
       </field>
     </record>