diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index d733478bd37..e5a6ed18535 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -151,7 +151,7 @@
                         <button name="invoice_open" states="draft,proforma2" string="Validate" class="oe_highlight"/>
                         <button name="%(action_account_invoice_refund)d" type='action' string='Ask Refund' states='open,paid' />
                         <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/>
-                        <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" />
+                        <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
                         <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
                     </span>
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
@@ -283,7 +283,7 @@
                         <button name="invoice_proforma2" states="draft" string="PRO-FORMA" groups="account.group_proforma_invoices"/>
                         <button name="%(action_account_invoice_refund)d" type='action' string='Refund Invoice' states='paid'/>
                         <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/>
-                        <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object"  />
+                        <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object"/>
                         <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
                         <!--button name="%(account_invoices)d" string="Print Invoice" type="action" states="open,paid,proforma,sale,proforma2"/-->
                     </span>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 75f5db0be83..95031898bae 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1284,10 +1284,10 @@
                         <field name="partner_id" invisible="1"/>
                         <field name="amount" invisible="1"/>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="Journal Items">
                             <field name="balance" invisible="1"/>
-                            <field colspan="4" name="line_id" widget="one2many_list"
+                            <field name="line_id" widget="one2many_list"
                               on_change="onchange_line_id(line_id)"
                               context="{'balance': balance , 'journal': journal_id }">
                                 <form string="Journal Item" version="7.0">
diff --git a/addons/account/wizard/account_invoice_state_view.xml b/addons/account/wizard/account_invoice_state_view.xml
index 509efc408ec..d50899fea9e 100644
--- a/addons/account/wizard/account_invoice_state_view.xml
+++ b/addons/account/wizard/account_invoice_state_view.xml
@@ -12,9 +12,7 @@
 	                    or
 	                    <button string="Cancel" class="oe_link" special="cancel"/>
 	                </header>
-	                <group>
-	                    <separator string="Confirm Draft Invoices" colspan="4"/>
-	                </group>
+	                <separator string="Confirm Draft Invoices"/>
 	            </form>
             </field>
         </record>
@@ -36,9 +34,7 @@
 	                    or
 	                    <button string="Cancel" class="oe_link" special="cancel"/>
 	                </header>
-	                <group>
-	                    <separator string="Cancel Selected Invoices" colspan="4"/>
-	                </group>    
+	                <separator string="Cancel Selected Invoices"/>
 	            </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_journal_select_view.xml b/addons/account/wizard/account_journal_select_view.xml
index e140abee2b2..7d187f95d65 100644
--- a/addons/account/wizard/account_journal_select_view.xml
+++ b/addons/account/wizard/account_journal_select_view.xml
@@ -13,9 +13,7 @@
 	                    or
 	                    <button string="Cancel" class="oe_link" special="cancel"/>
 	                </header>
-	                <group>
-	                    <label string="Are you sure you want to open Journal Entries?"/>
-	                </group>
+                    <label string="Are you sure you want to open Journal Entries?"/>
 	            </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
index 0357f7041bd..8fb1a32d962 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -111,14 +111,12 @@ class account_move_journal(osv.osv_memory):
                     or
                     <button string="Cancel" class="oe_link" special="cancel"/>
                 </header>
-                <group string="%s" colspan="4">
+                <group string="%s">
                     <field name="target_move" />
                 </group>
-                <group colspan="4" >
-                    <label width="300" string="%s"/>
-                    <newline/>
-                    <label width="300" string="%s"/>
-                </group>
+                <label width="300" string="%s"/>
+                <newline/>
+                <label width="300" string="%s"/>
             </form>""" % (open_string, separator_string, journal_string, period_string)
     
             view = etree.fromstring(view.encode('utf8'))
diff --git a/addons/account/wizard/account_move_line_select_view.xml b/addons/account/wizard/account_move_line_select_view.xml
index 7a8c1d081e0..ea8d8a643b8 100644
--- a/addons/account/wizard/account_move_line_select_view.xml
+++ b/addons/account/wizard/account_move_line_select_view.xml
@@ -13,9 +13,7 @@
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
-                    <group>
-                        <label string="Are you sure you want to open Account move line entries!"/>
-                    </group>    
+                    <label string="Are you sure you want to open Account move line entries?"/>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_period_close_view.xml b/addons/account/wizard/account_period_close_view.xml
index 4a9ec943fa9..7ca918341ab 100644
--- a/addons/account/wizard/account_period_close_view.xml
+++ b/addons/account/wizard/account_period_close_view.xml
@@ -13,8 +13,7 @@
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
-                    <separator string="Are you sure?" colspan="4"/>
-                    <group>
+                    <group string="Are you sure?">
                         <field name="sure"/>
                     </group>
                </form>
diff --git a/addons/account/wizard/account_report_aged_partner_balance_view.xml b/addons/account/wizard/account_report_aged_partner_balance_view.xml
index dd6b49f13c4..050a43bb9b4 100644
--- a/addons/account/wizard/account_report_aged_partner_balance_view.xml
+++ b/addons/account/wizard/account_report_aged_partner_balance_view.xml
@@ -10,7 +10,7 @@
             <field name="arch" type="xml">
                 <form string="Report Options" version="7.0">
                     <header>
-                        <button name="check_report" string="Print" type="object" colspan="2" default_focus="1" class="oe_highlight_on_dirty"/>
+                        <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight_on_dirty"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
diff --git a/addons/account/wizard/account_report_common_view.xml b/addons/account/wizard/account_report_common_view.xml
index 2fa33b5ed04..9cc9fb56857 100644
--- a/addons/account/wizard/account_report_common_view.xml
+++ b/addons/account/wizard/account_report_common_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
             <form string="Report Options" version="7.0">
                 <header>
-                    <button name="check_report" string="Print" type="object" colspan="2" default_focus="1" class="oe_highlight_on_dirty"/>
+                    <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight_on_dirty"/>
                     or 
                     <button string="Cancel" class="oe_link" special="cancel" />
                 </header>
diff --git a/addons/account/wizard/account_state_open_view.xml b/addons/account/wizard/account_state_open_view.xml
index b30d35f67dd..6107b4ee217 100644
--- a/addons/account/wizard/account_state_open_view.xml
+++ b/addons/account/wizard/account_state_open_view.xml
@@ -13,10 +13,9 @@
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
-                    <group>
-                        <label string="Are you sure you want to open this invoice ?"/>
-                        <label string="(Invoice should be unreconciled if you want to open it)"/>
-                    </group>
+                    <label string="Are you sure you want to open this invoice ?"/>
+                    <newline/>
+                    <label string="(Invoice should be unreconciled if you want to open it)"/>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_unreconcile_view.xml b/addons/account/wizard/account_unreconcile_view.xml
index 452c80f1049..35310e7da3f 100644
--- a/addons/account/wizard/account_unreconcile_view.xml
+++ b/addons/account/wizard/account_unreconcile_view.xml
@@ -13,10 +13,8 @@
                     or                    
                     <button string="Cancel" class="oe_link" special="cancel"/>
                 </header>
-                <group>
-                    <separator string="Unreconciliate Transactions"/>
-                    <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disabled"/>
-                </group>    
+                <separator string="Unreconciliate Transactions"/>
+                <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disabled"/>
             </form>
             </field>
         </record>
@@ -48,10 +46,8 @@
                 <header>
                     <button icon="gtk-ok" string="Unreconcile" name="trans_unrec_reconcile" type="object" default_focus="1" class="oe_highlight_on_dirty"  />
                 </header>
-                <group>
-                    <separator string="Unreconciliation Transactions"/>
-                    <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"/>
-                </group>    
+                <separator string="Unreconciliation Transactions"/>
+                <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"/>
             </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml
index 06bc5d6e9c5..01bade43c8b 100644
--- a/addons/account/wizard/account_use_model_view.xml
+++ b/addons/account/wizard/account_use_model_view.xml
@@ -45,9 +45,7 @@
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
-                    <group>
-                        <label string = "Are you sure you want to create entries?"/>
-                    </group>
+                    <label string = "Are you sure you want to create entries?"/>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml
index f63d6ef5b4f..d28e8bf5edc 100644
--- a/addons/account/wizard/account_validate_move_view.xml
+++ b/addons/account/wizard/account_validate_move_view.xml
@@ -53,10 +53,8 @@
 	                    or
 	                    <button string="Cancel" class="oe_link" special="cancel"/>
 	                </header>
-	                <group>
-	                    <separator string="Post Journal Entries"/>
-	                    <label string="All selected journal entries will be validated and posted. It means you won't be able to modify their accounting fields anymore." colspan="2"/>
-	                </group>    
+                    <separator string="Post Journal Entries"/>
+	                <label string="All selected journal entries will be validated and posted. It means you won't be able to modify their accounting fields anymore."/>
 	            </form>
             </field>
         </record>
diff --git a/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml b/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
index 3bc1820665d..0be36d9beee 100644
--- a/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
+++ b/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
             <form string="Crossovered Analytic" version="7.0">
                 <header>
-                    <button name="print_report" string="Print" colspan="1" type="object" class="oe_highlight_on_dirty"/>
+                    <button name="print_report" string="Print" type="object" class="oe_highlight_on_dirty"/>
                     or
                     <button string="Cancel" class="oe_link" special="cancel"/>
                 </header>
diff --git a/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml b/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml
index c99b7ad4490..b0e851d9d08 100644
--- a/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml
+++ b/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml
@@ -12,9 +12,7 @@
                     or
                     <button string="Cancel" class="oe_link" special="cancel"/>
                 </header>
-                <group>
-                    <label string="Save This Distribution as a Model"/>
-                </group>
+                <label string="Save This Distribution as a Model"/>
             </form>
             </field>
         </record>
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index e7236da86c6..30fb77b55a2 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -108,7 +108,7 @@
                 <header>
                     <button name="open" states="draft" string="Confirm Payments" class="oe_highlight"/>
                     <button name="set_done" states="open" string="Make Payments" type="object" class="oe_highlight"/>
-                    <button name="set_to_draft" states="cancel" string="Set to draft" type="object" />
+                    <button name="set_to_draft" states="cancel" string="Set to draft" type="object"/>
                     <button name="cancel" states="draft,open" string="Cancel"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
                 </header>
@@ -237,7 +237,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_payment_order_search"/>
-            <field name="help">A payment order is a payment request from your company to pay a supplier invoice or a customer `credit note. Here you can register all payment orders that should be done, keep track of all payment orders and mention the invoice reference and the partner the payment should be done for.</field>
+            <field name="help">A payment order is a payment request from your company to pay a supplier invoice or a customer credit note. Here you can register all payment orders that should be done, keep track of all payment orders and mention the invoice reference and the partner the payment should be done for.</field>
         </record>
 
         <menuitem action="action_payment_order_tree" id="menu_action_payment_order_form" parent="menu_main_payment" sequence="3"/>
diff --git a/addons/account_payment/wizard/account_payment_create_order_view.xml b/addons/account_payment/wizard/account_payment_create_order_view.xml
index 879b6d7b3b9..3b9f1744ca0 100644
--- a/addons/account_payment/wizard/account_payment_create_order_view.xml
+++ b/addons/account_payment/wizard/account_payment_create_order_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
             <form string="Search Payment lines" version="7.0">
                 <header>
-                    <button name="search_entries" string="Search" colspan="1" type="object" class="oe_highlight_on_dirty"/>
+                    <button name="search_entries" string="Search" type="object" class="oe_highlight_on_dirty"/>
                     or
                     <button string="Cancel" class="oe_link" special="cancel"/>
                 </header>
@@ -31,8 +31,7 @@
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
-                    <group>
-                        <separator string="Entries"/>
+                    <group string="Entries">
                         <field name="entries"/>
                     </group>
                 </form>
diff --git a/addons/account_payment/wizard/account_payment_pay_view.xml b/addons/account_payment/wizard/account_payment_pay_view.xml
index e76291abbf1..a785c752ce6 100644
--- a/addons/account_payment/wizard/account_payment_pay_view.xml
+++ b/addons/account_payment/wizard/account_payment_pay_view.xml
@@ -13,9 +13,7 @@
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
-                    <group>
-                        <separator string="Are you sure you want to make payment?"/>
-                    </group>    
+                    <separator string="Are you sure you want to make payment?"/>
                 </form>
             </field>
         </record>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 91e0bad848c..5bda06622b1 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -145,8 +145,8 @@
                 <header>
                     <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)" class="oe_highlight"/>
                     <button name="cancel_voucher" string="Cancel" states="draft,proforma"  invisible="context.get('line_type', False)"/>
-                    <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?" />
-                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" invisible="context.get('line_type', False)" />
+                    <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/>
+                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" invisible="context.get('line_type', False)"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </header>
                 <sheet string="Bill Payment">
@@ -302,8 +302,8 @@
                 <header>
                     <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)" class="oe_highlight"/>
                     <button name="cancel_voucher" string="Cancel" states="draft,proforma"  invisible="context.get('line_type', False)"/>
-                    <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?" />
-                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" invisible="context.get('line_type', False)" />
+                    <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/>
+                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" invisible="context.get('line_type', False)"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </header>
                 <sheet>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 8499e7feab2..e5919d9089e 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -84,7 +84,7 @@
                     <button name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id':partner_id, 'reference':reference, 'amount':amount}" type="action" string="Pay" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}" class="oe_highlight"/>
                     <button name="cancel_voucher" string="Cancel" states="draft,proforma" />
                     <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to confirm this record ?"/>
-                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" />
+                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </header>
                 <sheet string="Sales Receipt" layout="auto">
@@ -228,7 +228,7 @@
                     <button name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}" class="oe_highlight"/>
                     <button name="cancel_voucher" string="Cancel" states="draft,proforma" />
                     <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to confirm this record ?"/>
-                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" />
+                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </header>
                 <sheet string="Supplier Voucher">
diff --git a/addons/account_voucher/wizard/account_statement_from_invoice_view.xml b/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
index 9bef1f20c4f..fc5f80cb1d9 100644
--- a/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
+++ b/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
@@ -12,9 +12,8 @@
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
-                    <group colspan="4" >
+                    <group>
                         <field name="date"/>
-                        <newline/>
                         <field name="journal_ids"  domain="[('type','in',['sale','purchase','cash'])]"/>
                     </group>
                </form>
@@ -41,10 +40,8 @@
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
-                    <group colspan="4" expand="1">
-                        <separator string="Payable and Receivables" colspan="4"/>
-                        <field height="300" width="700" name="line_ids" colspan="4" nolabel="1" domain="[('account_id.type','in',['receivable','payable']),('reconcile_id','=',False), ('reconcile_partial_id','=',False), ('state', '=', 'valid')]"/>
-                    </group>
+                    <separator string="Payable and Receivables"/>
+                    <field height="300" width="700" name="line_ids" domain="[('account_id.type','in',['receivable','payable']),('reconcile_id','=',False), ('reconcile_partial_id','=',False), ('state', '=', 'valid')]"/>
                </form>
             </field>
         </record>