diff --git a/addons/account/company.py b/addons/account/company.py
index c7836e0128b..82a60beb461 100644
--- a/addons/account/company.py
+++ b/addons/account/company.py
@@ -36,9 +36,9 @@ class res_company(osv.osv):
     }
 
     _defaults = {
-        'overdue_msg': 'Please note that the following payments are now due. If your payment \
-                        has been sent, kindly forward your payment details. If payment will be \
-                        delayed further, please contact us to discuss. \
+        'overdue_msg': 'Please note that the following payments are now due.\
+                         \nIf your payment has been sent, kindly forward your payment details.\
+                         \nIf payment will be delayed further, please contact us to discuss.\
                         \nWould your payment have been carried out after this mail was sent, please consider the present one as void.'
     }
 
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 321e4c2addd..be6c4509557 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -202,14 +202,17 @@
             <field name="name">res.company.sheet</field>
             <field name="model">res.company</field>
             <field name="type">form</field>
+            <field name="priority">18</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <page string="Configuration" position="inside">
-                    <separator string="Timesheets" colspan="4"/>
-                    <field name="timesheet_range"/>
-                    <field name="timesheet_max_difference"/>
+                <xpath expr="/form/notebook/page/group[@name='accounting']" position="after">
+                    <group col="2" colspan="2" name="hr_timesheet" sequence="25"> 
+                        <separator string="Timesheets" colspan="4"/>
+                        <field name="timesheet_range"/>
+                        <field name="timesheet_max_difference"/>
                     <newline/>
-                </page>
+                    </group>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/mrp/company_view.xml b/addons/mrp/company_view.xml
index f5f06518565..3c33a332977 100644
--- a/addons/mrp/company_view.xml
+++ b/addons/mrp/company_view.xml
@@ -6,12 +6,12 @@
             <field name="name">res.company.mrp.config</field>
             <field name="model">res.company</field>
             <field name="type">form</field>
-            <field name="priority">22</field>
+            <field name="priority">24</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <page string="Configuration" position="inside">
+                <xpath expr="/form/notebook/page/group[@name='mrp']" position="after">
                     <field name="manufacturing_lead"/>
-                </page>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/pad/company_pad.xml b/addons/pad/company_pad.xml
index 754776715d7..0ee80937d18 100644
--- a/addons/pad/company_pad.xml
+++ b/addons/pad/company_pad.xml
@@ -6,9 +6,12 @@
       <field name="type">form</field>
       <field name="inherit_id" ref="base.view_company_form"/>
       <field name="arch" type="xml">
-        <xpath expr="//page[@string='Configuration']" position="inside">
-          <separator string="Pad" colspan="4"/>
-          <field name="pad_index"/>
+        <xpath expr="/form/notebook/page/group[@name='mrp']" position="after">
+            <newline/>
+            <group col="2" colspan="2" name="pad" sequence="100"> 
+                  <separator string="Pad" colspan="4"/>
+                  <field name="pad_index"/>
+             </group>
         </xpath>
       </field>
     </record>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 1435f6cc2b6..8bf7155096c 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -637,13 +637,16 @@
             <field name="name">view.company.form.pos</field>
             <field name="model">res.company</field>
             <field name="type">form</field>
+            <field name="priority">25</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <field name="currency_id" position="after">
-                    <separator string="Point of Sale" colspan="4"/>
-                    <field  name="company_discount" />
-                    <field  name="max_diff" />
-                </field>
+                <xpath expr="/form/notebook/page/group[@name='accounting']" position="after" >
+                   <group col="2" colspan="2" name="pos" sequence="5"> 
+                     <separator string="Point of Sale" colspan="2" />
+                     <field name="company_discount" colspan="2" />
+                     <field name="max_diff" />
+                   </group>
+                </xpath>
             </field>
            </record>
 
diff --git a/addons/procurement/company_view.xml b/addons/procurement/company_view.xml
index 4d14f69edde..a5319c43640 100644
--- a/addons/procurement/company_view.xml
+++ b/addons/procurement/company_view.xml
@@ -6,14 +6,14 @@
             <field name="name">res.company.mrp.config</field>
             <field name="model">res.company</field>
             <field name="type">form</field>
-            <field name="priority">17</field>
+            <field name="priority">25</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <page string="Configuration" position="inside">
+                <xpath expr="/form/notebook/page/group[@name='mrp']" position="after">
                     <separator string="MRP &amp; Logistics Scheduler" colspan="4"/>
-                    <field name="schedule_range"/>
-                </page>
-            </field>
+                       <field name="schedule_range"/>
+                </xpath>
+          </field>
        </record>
     
     </data>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 85cde448c6d..cafe538e12a 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -528,13 +528,16 @@
             <field name="name">res.company.task.config</field>
             <field name="model">res.company</field>
             <field name="type">form</field>
+            <field name="priority">22</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <page string="Configuration" position="inside">
-                    <separator string="Project Management" colspan="4"/>
+                <xpath expr="/form/notebook/page/group[@name='accounting']" position="after">
+                    <group col="2" colspan="2" name="project" sequence="15"> 
+                    <separator string="Project Management" colspan="2"/>
                     <field name="project_time_mode_id"/>
                     <newline/>
-                </page>
+                     </group>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/purchase/company_view.xml b/addons/purchase/company_view.xml
index d9d2fb9f9ee..04e48af29d9 100644
--- a/addons/purchase/company_view.xml
+++ b/addons/purchase/company_view.xml
@@ -6,12 +6,12 @@
             <field name="name">res.company.mrp.config</field>
             <field name="model">res.company</field>
             <field name="type">form</field>
-            <field name="priority">19</field>
+            <field name="priority">22</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <page string="Configuration" position="inside">
+               <xpath expr="/form/notebook/page/group[@name='mrp']" position="after">
                     <field name="po_lead"/>
-                </page>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/sale/company_view.xml b/addons/sale/company_view.xml
index 96ff91e8e90..567bf50948f 100644
--- a/addons/sale/company_view.xml
+++ b/addons/sale/company_view.xml
@@ -5,12 +5,12 @@
             <field name="name">res.company.mrp.config</field>
             <field name="model">res.company</field>
             <field name="type">form</field>
-            <field name="priority">24</field>
+            <field name="priority">20</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <page string="Configuration" position="inside">
+                <xpath expr="/form/notebook/page/group[@name='mrp']" position="after">
                     <field name="security_lead"/>
-                </page>
+                </xpath>
             </field>
         </record>
     </data>