diff --git a/addons/account/wizard/account_invoice_state_view.xml b/addons/account/wizard/account_invoice_state_view.xml
index 82141bd2161..47752ee6666 100644
--- a/addons/account/wizard/account_invoice_state_view.xml
+++ b/addons/account/wizard/account_invoice_state_view.xml
@@ -10,7 +10,9 @@
 	                <header>
 	                    <button icon="terp-camera_test" string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1" class="oe_form_button_active_flow"/>
 	                </header>
-	                <separator string="Confirm Draft Invoices" colspan="4"/>
+	                <group>
+	                    <separator string="Confirm Draft Invoices" colspan="4"/>
+	                </group>
 	            </form>
             </field>
         </record>
@@ -30,7 +32,9 @@
 	                <header>
 	                    <button icon="gtk-cancel" string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1" class="oe_form_button_active_flow"/>
 	                </header>
-	                <separator string="Cancel Selected Invoices" colspan="4"/>
+	                <group>
+	                    <separator string="Cancel Selected Invoices" colspan="4"/>
+	                </group>    
 	            </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_journal_select_view.xml b/addons/account/wizard/account_journal_select_view.xml
index 7e3c06f067c..1b9097bbc15 100644
--- a/addons/account/wizard/account_journal_select_view.xml
+++ b/addons/account/wizard/account_journal_select_view.xml
@@ -11,7 +11,9 @@
 	                <header>
 	                    <button icon="terp-gtk-go-back-rtl" string="Open Entries" name="action_open_window" type="object" class="oe_form_button_active_flow"/>
 	                </header>
-	                <label string="Are you sure you want to open Journal Entries?"/>
+	                <group>
+	                    <label string="Are you sure you want to open Journal Entries?"/>
+	                </group>
 	            </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_move_line_select_view.xml b/addons/account/wizard/account_move_line_select_view.xml
index 7b5897685d0..737d838463f 100644
--- a/addons/account/wizard/account_move_line_select_view.xml
+++ b/addons/account/wizard/account_move_line_select_view.xml
@@ -11,7 +11,9 @@
                     <header>
                         <button icon="terp-gtk-go-back-rtl" string="Open Entries" name="open_window" type="object" default_focus="1" class="oe_form_button_active_flow"/>
                     </header>
-                    <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!"/>
+                    </group>    
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_state_open_view.xml b/addons/account/wizard/account_state_open_view.xml
index 9034b5372f4..a08d64bbf80 100644
--- a/addons/account/wizard/account_state_open_view.xml
+++ b/addons/account/wizard/account_state_open_view.xml
@@ -11,8 +11,10 @@
                     <header>
                         <button name="change_inv_state" string="Yes" type="object" icon="terp-camera_test" class="oe_form_button_active_flow"/>
                     </header>
-                    <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 ?"/>
+                        <label string="(Invoice should be unreconciled if you want to open it)"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_unreconcile_view.xml b/addons/account/wizard/account_unreconcile_view.xml
index 3f15b67f59a..c25c7eea63b 100644
--- a/addons/account/wizard/account_unreconcile_view.xml
+++ b/addons/account/wizard/account_unreconcile_view.xml
@@ -11,8 +11,10 @@
                 <header>
                     <button icon="gtk-ok" string="Unreconcile" name="trans_unrec" type="object" default_focus="1" class="oe_form_button_active_flow"/>
                 </header>
-                <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"/>
+                </group>    
             </form>
             </field>
         </record>
@@ -44,8 +46,10 @@
                 <header>
                     <button icon="gtk-ok" string="Unreconcile" name="trans_unrec_reconcile" type="object" default_focus="1" class="oe_form_button_active_flow"/>
                 </header>
-                <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"/>
+                </group>    
             </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml
index a6ef4b9ede2..0860691f2c8 100644
--- a/addons/account/wizard/account_use_model_view.xml
+++ b/addons/account/wizard/account_use_model_view.xml
@@ -41,7 +41,9 @@
                     <header>
                         <button icon="gtk-execute" string="Ok" name="create_entries" type="object" default_focus='1' class="oe_form_button_active_flow"/>
                     </header>
-                    <label string = "Are you sure you want to create entries?"/>
+                    <group>
+                        <label string = "Are you sure you want to create entries?"/>
+                    </group>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml
index 6f10f9ad693..43b409e8721 100644
--- a/addons/account/wizard/account_validate_move_view.xml
+++ b/addons/account/wizard/account_validate_move_view.xml
@@ -49,8 +49,10 @@
 	                <header>
 	                    <button icon="terp-camera_test" string="Approve" name="validate_move_lines" type="object" default_focus="1" class="oe_form_button_active_flow"/>
 	                </header>
-	                <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." colspan="2"/>
+	                </group>    
 	            </form>
             </field>
         </record>
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 0c4f446e322..b376538def8 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
@@ -10,7 +10,9 @@
                 <header>
                     <button string="Ok" icon='gtk-execute' type="object" name="activate" default_focus="1" class="oe_form_button_active_flow"/>
                 </header>
-                <label string="Save This Distribution as a Model"/>
+                <group>
+                    <label string="Save This Distribution as a Model"/>
+                </group>
             </form>
             </field>
         </record>
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 e451787c3f6..e271c20025e 100644
--- a/addons/account_payment/wizard/account_payment_create_order_view.xml
+++ b/addons/account_payment/wizard/account_payment_create_order_view.xml
@@ -27,8 +27,10 @@
                     <header>
                         <button name="create_payment" string="_Add to payment order" colspan="1" type="object" icon="gtk-execute" class="oe_form_button_active_flow"/>
                     </header>
-                    <separator string="Entries"/>
-                    <field name="entries"/>
+                    <group>
+                        <separator string="Entries"/>
+                        <field name="entries"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/account_payment/wizard/account_payment_pay_view.xml b/addons/account_payment/wizard/account_payment_pay_view.xml
index 7fcc4f9eabc..50a984b9dde 100644
--- a/addons/account_payment/wizard/account_payment_pay_view.xml
+++ b/addons/account_payment/wizard/account_payment_pay_view.xml
@@ -11,7 +11,9 @@
                     <header>
                         <button name="launch_wizard" string="Yes" type="object" icon="gtk-ok" default_focus="1" class="oe_form_button_active_flow"/>
                     </header>
-                    <separator string="Are you sure you want to make payment?"/>
+                    <group>
+                        <separator string="Are you sure you want to make payment?"/>
+                    </group>    
                 </form>
             </field>
         </record>
diff --git a/addons/account_payment/wizard/account_payment_populate_statement_view.xml b/addons/account_payment/wizard/account_payment_populate_statement_view.xml
index 4b2bd93a2e9..bf6ec3351b9 100644
--- a/addons/account_payment/wizard/account_payment_populate_statement_view.xml
+++ b/addons/account_payment/wizard/account_payment_populate_statement_view.xml
@@ -11,7 +11,9 @@
                     <header>
                         <button name="populate_statement" string="ADD" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
                     </header>
-                    <field name="lines"/>
+                    <group>
+                        <field name="lines"/>
+                    </group>
                 </form>
              </field>
         </record>
diff --git a/addons/audittrail/wizard/audittrail_view_log_view.xml b/addons/audittrail/wizard/audittrail_view_log_view.xml
index 757a6618db6..999815147d4 100644
--- a/addons/audittrail/wizard/audittrail_view_log_view.xml
+++ b/addons/audittrail/wizard/audittrail_view_log_view.xml
@@ -11,7 +11,7 @@
             <field name="arch" type="xml">
                 <form string="Audit Logs" version="7.0">
                     <header>
-                        <button icon="gtk-open" string="Open Logs" name="log_open_window" type="object" class="oe_form_button_active_flow" />
+                        <button icon="gtk-open" string="Open Logs" name="log_open_window" type="object" class="oe_form_button_active_flow"/>
                     </header>
                     <group col="4">
                          <field name="from"/>
diff --git a/addons/crm/wizard/crm_add_note_view.xml b/addons/crm/wizard/crm_add_note_view.xml
index 4b7f2635781..658a66a15ad 100644
--- a/addons/crm/wizard/crm_add_note_view.xml
+++ b/addons/crm/wizard/crm_add_note_view.xml
@@ -13,8 +13,10 @@
                     <header>
                         <button name="action_add" type="object" string="_Add" icon="gtk-ok" class="oe_form_button_active_flow"/>
                     </header>
-                    <separator string="Add Note"/>
-                    <field name="body"/>
+                    <group>
+                        <separator string="Add Note"/>
+                        <field name="body"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/crm/wizard/crm_lead_to_partner_view.xml b/addons/crm/wizard/crm_lead_to_partner_view.xml
index d7a49f85609..0c836db044f 100644
--- a/addons/crm/wizard/crm_lead_to_partner_view.xml
+++ b/addons/crm/wizard/crm_lead_to_partner_view.xml
@@ -12,8 +12,8 @@
                   <header>
                       <button name="make_partner" string="Continue" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
                   </header>
-                  <separator string="Create a Partner"/>
                   <group col="4">
+                      <separator string="Create a Partner"/>
                       <field name="action"/>
                       <field name="partner_id" attrs="{'required': [('action', '=', 'exist')], 'invisible':[('action','!=','exist')]}"/>
                   </group>
diff --git a/addons/crm/wizard/crm_merge_opportunities_view.xml b/addons/crm/wizard/crm_merge_opportunities_view.xml
index c78e8f8b49a..fb5332c3a2b 100644
--- a/addons/crm/wizard/crm_merge_opportunities_view.xml
+++ b/addons/crm/wizard/crm_merge_opportunities_view.xml
@@ -13,7 +13,9 @@
                     <header>
                         <button name="action_merge" type="object" string="_Merge" icon="gtk-ok" class="oe_form_button_active_flow"/>
                     </header>
-                    <separator string="Select Opportunities"/>
+                    <group>
+                        <separator string="Select Opportunities"/>
+                    </group>
                     <field name="opportunity_ids">
                         <tree>
                             <field name="name" />
diff --git a/addons/crm/wizard/crm_phonecall_to_partner_view.xml b/addons/crm/wizard/crm_phonecall_to_partner_view.xml
index 87eed040be6..b0a5dbbf581 100644
--- a/addons/crm/wizard/crm_phonecall_to_partner_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_partner_view.xml
@@ -12,8 +12,10 @@
                 <header>
                     <button name="open_create_partner" string="Create Partner" type="object" icon="gtk-ok" groups="base.group_partner_manager"/>
                 </header>
-                <label string="Are you sure you want to create a partner based on this Phonecall ?"/>
-                <label string="You may have to verify that this partner does not exist already."/>
+                <group>
+                    <label string="Are you sure you want to create a partner based on this Phonecall ?"/>
+                    <label string="You may have to verify that this partner does not exist already."/>
+                </group>
             </form>
         </field>
        </record>
diff --git a/addons/event/wizard/event_confirm_view.xml b/addons/event/wizard/event_confirm_view.xml
index b25e04eae1a..1768f10e2c9 100644
--- a/addons/event/wizard/event_confirm_view.xml
+++ b/addons/event/wizard/event_confirm_view.xml
@@ -11,7 +11,9 @@
                   <header>
                       <button icon="gtk-ok" name="confirm" string="Confirm Anyway" type="object" class="oe_form_button_active_flow"/>
                   </header>
-                  <label string="Warning: This Event has not reached its Minimum Registration Limit. Are you sure you want to confirm it?"/>
+                  <group>
+                    <label string="Warning: This Event has not reached its Minimum Registration Limit. Are you sure you want to confirm it?"/>
+                  </group>
             </form>
             </field>
         </record>
diff --git a/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml b/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
index 59c32fd1fd5..c891ad993a8 100644
--- a/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
@@ -10,8 +10,10 @@
                 <header>
                     <button name="print_report" string="Print" type="object"  icon="gtk-print" class="oe_form_button_active_flow"/>
                 </header>
-                <field name="init_date"/>
-                <field name="end_date"/>
+                <group>
+                    <field name="init_date"/>
+                    <field name="end_date"/>
+                </group>    
             </form>
             </field>
         </record>
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
index ecb6b43073f..35da95c3fc2 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
@@ -11,9 +11,11 @@
                         <button icon="terp-gtk-jump-to-ltr" string="Sign in" name="si_check" type="object" class="oe_form_button_active_flow"/>
                         <button icon="terp-gtk-jump-to-rtl" string="Sign out" name="so_check" type="object" class="oe_form_button_active_flow"/>
                     </header>
-                    <separator colspan="4" string="Sign in / Sign out"/>
-                    <label colspan="4" nolabel="1" string="If you need your staff to sign in when they arrive at work and sign out again at the end of the day, OpenERP allows you to manage this with this tool. If each employee has been linked to a system user, then they can encode their time with this action button."/>
-                    <newline/>
+                    <group>
+                        <separator colspan="4" string="Sign in / Sign out"/>
+                        <label colspan="4" nolabel="1" string="If you need your staff to sign in when they arrive at work and sign out again at the end of the day, OpenERP allows you to manage this with this tool. If each employee has been linked to a system user, then they can encode their time with this action button."/>
+                        <newline/>
+                    </group>
                     <group colspan="4" >
                     <field name="name" />
                     <field name="state" />
diff --git a/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.xml b/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.xml
index 52084828e61..750126a40c1 100644
--- a/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.xml
+++ b/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.xml
@@ -11,7 +11,9 @@
                     <header>
                         <button icon="gtk-execute" string="Generate" name="compute_sheet" type="object" class="oe_form_button_active_flow"/>
                     </header>
-                    <label colspan="4" nolabel="1" string="This wizard will generate payslips for all selected employee(s) based on the dates and credit note specified on Payslips Run." />
+                    <group>
+                        <label colspan="4" nolabel="1" string="This wizard will generate payslips for all selected employee(s) based on the dates and credit note specified on Payslips Run." />
+                    </group>
                     <group colspan="4" >
                         <separator string="Employees" colspan="4"/>
                         <newline/>
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.xml b/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.xml
index c4c8ae4fa0b..caa45270ebf 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.xml
+++ b/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.xml
@@ -12,7 +12,9 @@
                     <button name="case_close" string="No" icon='gtk-no' type="object" class="oe_form_button_active_flow"/>
                     <button name="case_close_with_emp" string="Yes" colspan="1" type="object" icon="terp-camera_test" class="oe_form_button_active_flow"/>
                 </header>
-                <label string="Would you like to create an employee ?" colspan="4" />
+                <group>
+                    <label string="Would you like to create an employee ?" colspan="4" />
+                </group>
             </form>
             </field>
         </record>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
index 97e269984be..2a33ad5a0ae 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
@@ -10,8 +10,10 @@
                     <header>
                         <button icon="gtk-ok" string="Sign in / Sign out" name="check_state" type="object" class="oe_form_button_active_flow"/>
                     </header>
-                    <separator colspan="4" string="Sign In/Out by Project"/>
-                    <label colspan="4" nolabel="1" string="Employees can encode their time spent on the different projects they are assigned on. A  project is an analytic account and the time spent on a project generates costs on the analytic account. This feature allows to record at the same time the attendance and the timesheet."/>
+                    <group>
+                        <separator colspan="4" string="Sign In/Out by Project"/>
+                        <label colspan="4" nolabel="1" string="Employees can encode their time spent on the different projects they are assigned on. A  project is an analytic account and the time spent on a project generates costs on the analytic account. This feature allows to record at the same time the attendance and the timesheet."/>
+                    </group>
                </form>
             </field>
         </record>
diff --git a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
index 0633c953cd4..44d09c033e5 100644
--- a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
+++ b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
@@ -10,7 +10,9 @@
                <header>
                     <button  icon="terp-camera_test" name="open_timesheet" string="Open" type="object" class="oe_form_button_active_flow"/>
                </header>
-               <separator string="It will open your current timesheet"/>
+               <group>
+                    <separator string="It will open your current timesheet"/>
+               </group>
            </form>
         </field>
     </record>
diff --git a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml
index 99b1badd1ac..3da428a785d 100644
--- a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml
+++ b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml
@@ -10,7 +10,9 @@
           <header>
             <button name="get_partner" string="View Customers" type="object" icon="terp-partner" class="oe_form_button_active_flow"/>
           </header>
-          <label string="This wizard will create an XML file for VAT details and total invoiced amounts per partner." colspan="4"/>
+          <group>
+            <label string="This wizard will create an XML file for VAT details and total invoiced amounts per partner." colspan="4"/>
+          </group>
           <newline/>
           <field name="year"/>
           <newline/>
diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml b/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
index 33e2590eac7..d57233aef43 100644
--- a/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
+++ b/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
@@ -12,7 +12,9 @@
                         <button name="create_xml" string="Create _XML" type="object" icon="gtk-execute" class="oe_form_button_active_flow"/>
                         <button name="preview" string="_Preview" type="object" icon="gtk-print"  class="oe_form_button_active_flow"/>
                     </header>
-                    <separator string="Intracom VAT Declaration"/>
+                    <group>
+                        <separator string="Intracom VAT Declaration"/>
+                    </group>   
                     <notebook colspan="4">
                         <page string="General Information">
                             <group>
diff --git a/addons/l10n_fr/wizard/fr_report_bilan_view.xml b/addons/l10n_fr/wizard/fr_report_bilan_view.xml
index 493f51b700f..3a6e6f8d43b 100644
--- a/addons/l10n_fr/wizard/fr_report_bilan_view.xml
+++ b/addons/l10n_fr/wizard/fr_report_bilan_view.xml
@@ -11,7 +11,9 @@
                    <header>
                         <button name="print_bilan_report" string="Print" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
                    </header>
-                   <field name="fiscalyear_id"/>
+                   <group>
+                        <field name="fiscalyear_id"/>
+                   </group>
                  </form>
             </field>
         </record>
diff --git a/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml b/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
index 84610b5df42..e868a1ba857 100644
--- a/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
+++ b/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
@@ -11,7 +11,9 @@
                     <header>
                         <button name="print_cdr_report" string="Print" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
                     </header>
-                    <field name="fiscalyear_id"/>
+                    <group>
+                        <field name="fiscalyear_id"/>
+                    </group>
                  </form>
             </field>
         </record>
diff --git a/addons/lunch/wizard/lunch_cashbox_clean_view.xml b/addons/lunch/wizard/lunch_cashbox_clean_view.xml
index 5d23d6353f9..586afd8ae3b 100644
--- a/addons/lunch/wizard/lunch_cashbox_clean_view.xml
+++ b/addons/lunch/wizard/lunch_cashbox_clean_view.xml
@@ -13,7 +13,9 @@
                     <header>
                         <button  icon="gtk-ok" name="set_to_zero" string="Set to Zero" type="object" class="oe_form_button_active_flow"/>
                     </header>
-                    <label string="Are you sure you want to reset this cashbox ?"/>
+                    <group>
+                        <label string="Are you sure you want to reset this cashbox ?"/>
+                    </group>
                </form>
             </field>
           </record>
diff --git a/addons/mrp/wizard/change_production_qty_view.xml b/addons/mrp/wizard/change_production_qty_view.xml
index 94e489ad25b..1d0ed0a467b 100644
--- a/addons/mrp/wizard/change_production_qty_view.xml
+++ b/addons/mrp/wizard/change_production_qty_view.xml
@@ -14,9 +14,11 @@
                         <button name="change_prod_qty" string="Approve"
                             colspan="1" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
                     </header>
-                    <separator string="Change Quantity" colspan="4"/>
-                    <newline/>
-                    <field name="product_qty"/>
+                    <group>
+                        <separator string="Change Quantity" colspan="4"/>
+                        <newline/>
+                        <field name="product_qty"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp/wizard/mrp_price_view.xml b/addons/mrp/wizard/mrp_price_view.xml
index a5dc2a64239..6dc0922537e 100644
--- a/addons/mrp/wizard/mrp_price_view.xml
+++ b/addons/mrp/wizard/mrp_price_view.xml
@@ -14,8 +14,10 @@
                             <button name="print_report" string="Print"
                             colspan="1" type="object" icon="gtk-print" class="oe_form_button_active_flow" />
                     </header>
-                    <separator colspan="4" string="Print Cost Structure of Product." />
-                    <field name="number"/>
+                    <group>
+                        <separator colspan="4" string="Print Cost Structure of Product." />
+                        <field name="number"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp/wizard/mrp_product_produce_view.xml b/addons/mrp/wizard/mrp_product_produce_view.xml
index 825508000df..8f7f1a7edfc 100644
--- a/addons/mrp/wizard/mrp_product_produce_view.xml
+++ b/addons/mrp/wizard/mrp_product_produce_view.xml
@@ -15,9 +15,11 @@
                         <button name="do_produce" string="Confirm"
                             colspan="1" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
                     </header>
-                    <separator string="Produce" colspan="4"/>
-                    <field name="mode" colspan="4"/>
-                    <field name="product_qty" colspan="2"/>
+                    <group>
+                        <separator string="Produce" colspan="4"/>
+                        <field name="mode"/>
+                        <field name="product_qty" colspan="2"/>
+                    </group>    
                 </form>
             </field>
         </record>
diff --git a/addons/mrp/wizard/mrp_workcenter_load_view.xml b/addons/mrp/wizard/mrp_workcenter_load_view.xml
index 28b6a9c0e17..e26c07637ae 100644
--- a/addons/mrp/wizard/mrp_workcenter_load_view.xml
+++ b/addons/mrp/wizard/mrp_workcenter_load_view.xml
@@ -14,11 +14,13 @@
                         <button name="print_report" string="Print"
                             colspan="1" type="object" icon="gtk-print" class="oe_form_button_active_flow"/>
                     </header>
-                    <sheet layout="auto">
-                        <field name="time_unit"/>
-                        <newline/>
-                        <field name="measure_unit"/>
-                    </sheet>
+                    <group>
+                        <sheet layout="auto">
+                            <field name="time_unit"/>
+                            <newline/>
+                            <field name="measure_unit"/>
+                        </sheet>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml b/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
index 278b98b2aba..22bfadb3dd6 100644
--- a/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
+++ b/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
@@ -13,7 +13,10 @@
                     <header>
                         <button name="cancel_repair" string="Yes" type="object" icon="gtk-ok" class="oe_form_button_active_flow" />
                     </header>
-                    <label string="This operation will cancel the Repair process, but will not cancel it's Invoice. Do you want to continue?"/>
+                    <newline/>
+                    <group>
+                        <label string="This operation will cancel the Repair process, but will not cancel it's Invoice. Do you want to continue?"/>
+                    </group>
                 </form>
             </field>
         </record>         
diff --git a/addons/point_of_sale/wizard/pos_box_entries.xml b/addons/point_of_sale/wizard/pos_box_entries.xml
index 751aa4a3e67..02999486b6f 100644
--- a/addons/point_of_sale/wizard/pos_box_entries.xml
+++ b/addons/point_of_sale/wizard/pos_box_entries.xml
@@ -12,7 +12,9 @@
                     <header>
                         <button name="get_in" string="Put Money" type="object" icon="gtk-apply" class="oe_form_button_active_flow" />
                     </header>
-                    <separator string="Fill in this form if you put money in the cash register:"/>
+                    <group>
+                        <separator string="Fill in this form if you put money in the cash register:"/>
+                     </group>
                     <group col="4">
                         <field name="name"/>
                         <field name="product_id"/>
diff --git a/addons/point_of_sale/wizard/pos_discount.xml b/addons/point_of_sale/wizard/pos_discount.xml
index 3146b714ce4..6144b73667d 100644
--- a/addons/point_of_sale/wizard/pos_discount.xml
+++ b/addons/point_of_sale/wizard/pos_discount.xml
@@ -12,7 +12,9 @@
                     <header>
                         <button name="apply_discount" string="Apply Discount" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
                     </header>
-                    <field name="discount"/>
+                    <group>
+                        <field name="discount"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/point_of_sale/wizard/pos_receipt_view.xml b/addons/point_of_sale/wizard/pos_receipt_view.xml
index 9d9bd1c59b9..1ba5f5c0208 100644
--- a/addons/point_of_sale/wizard/pos_receipt_view.xml
+++ b/addons/point_of_sale/wizard/pos_receipt_view.xml
@@ -13,7 +13,9 @@
                     <header>
                       <button name="print_report" string="Print Receipt" type="object" icon="gtk-print" class="oe_form_button_active_flow"/>
                     </header>
-                    <label string="Print the Receipt of the Sale"/>
+                    <group>
+                        <label string="Print the Receipt of the Sale"/>
+                    </group>    
                 </form>
               </field>
         </record>
diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml
index 486c207d751..47295d5caff 100644
--- a/addons/share/wizard/share_wizard_view.xml
+++ b/addons/share/wizard/share_wizard_view.xml
@@ -32,8 +32,10 @@
                     <header>
                         <button name="go_step_2" string="Share" type="object" icon="gtk-go-forward" class="oe_form_button_active_flow"/>
                     </header>
-                    <field name="user_type" invisible="1"/>
-                    <field name="invite" invisible="1"/>
+                    <group>
+                        <field name="user_type" invisible="1"/>
+                        <field name="invite" invisible="1"/>
+                    </group>    
                     <group>
                         <group name="emails_group" attrs="{'invisible':['|', ('user_type', '!=', 'emails'), ('invite', '=', True)]}" string="Share with these People (one e-mail per line)">
                             <field colspan="2" nolabel="1" name="new_users" attrs="{'required':[('user_type','=','emails'), ('invite', '!=', True)]}"/>
diff --git a/addons/survey/wizard/survey_print_statistics.xml b/addons/survey/wizard/survey_print_statistics.xml
index adec62db305..c6cbdd6d8cf 100644
--- a/addons/survey/wizard/survey_print_statistics.xml
+++ b/addons/survey/wizard/survey_print_statistics.xml
@@ -13,7 +13,9 @@
                     <header>
                         <button icon="gtk-print" name="action_next" string="Print" type="object" class="oe_form_button_active_flow"/>
                     </header>
-                    <field name="survey_ids"/>
+                    <group>
+                        <field name="survey_ids"/>
+                    </group>    
                 </form>
             </field>
         </record>
diff --git a/addons/wiki/wizard/wiki_create_menu_view.xml b/addons/wiki/wizard/wiki_create_menu_view.xml
index e49118233ef..26c76e9bdfa 100644
--- a/addons/wiki/wizard/wiki_create_menu_view.xml
+++ b/addons/wiki/wizard/wiki_create_menu_view.xml
@@ -13,9 +13,11 @@
                     <header>
                         <button name="wiki_menu_create" string="Create Menu" type="object" class="oe_form_button_active_flow"/>
                     </header>
-                    <separator string="Menu Information" colspan="4" />
-                    <field name="menu_name" />
-                    <field name="menu_parent_id" />
+                    <group>
+                        <separator string="Menu Information" colspan="4" />
+                        <field name="menu_name" />
+                        <field name="menu_parent_id" />
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/wiki/wizard/wiki_make_index_view.xml b/addons/wiki/wizard/wiki_make_index_view.xml
index 9013f1b1839..54a689637d1 100644
--- a/addons/wiki/wizard/wiki_make_index_view.xml
+++ b/addons/wiki/wizard/wiki_make_index_view.xml
@@ -13,8 +13,10 @@
                     <header>
                         <button name="wiki_do_index" string="Create Index" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
                     </header>
-	                <separator string="Menu Information" colspan="4"/>
-	                <label string="Want to create a Index on Selected Pages ? "/>
+                    <group>
+	                    <separator string="Menu Information" colspan="4"/>
+	                    <label string="Want to create a Index on Selected Pages ? "/>
+	                </group>
                 </form>
             </field>
         </record>
diff --git a/addons/wiki/wizard/wiki_wiki_page_open_view.xml b/addons/wiki/wizard/wiki_wiki_page_open_view.xml
index 3127e2429f0..9bf3b8994a8 100644
--- a/addons/wiki/wizard/wiki_wiki_page_open_view.xml
+++ b/addons/wiki/wizard/wiki_wiki_page_open_view.xml
@@ -13,8 +13,10 @@
                     <header>
                         <button name="open_wiki_page" string="Open Wiki Page" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
                     </header>
-                    <separator string="" colspan="6" />
-                    <label string="Want to open a wiki page? "/>
+                    <group>
+                        <separator string="" colspan="6" />
+                        <label string="Want to open a wiki page? "/>
+                    </group>    
              </form>
             </field>
         </record>