diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 8fb8499aa6c..ee6fdfaeb08 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -6,30 +6,46 @@
             <field name="model">base.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="General Settings" version="7.0">
+                <form string="General Settings" version="7.0" class="oe_form_configuration">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
+                    <separator string="Company Settings"/>
                     <group>
-                        <group string="Company Settings">
-                            <field name="module_multi_company"/>
-                            <separator string="External Accesses" colspan="2"/>
-                            <field name="module_share"/>
-                            <field name="module_portal"/>
-                        </group>
-                        <group>
+                        <label for="id" string="Company"/>
+                        <div>
                             <div>
-                                You will also find several configuration options on your company data:
-                                address for the header and footer, overdue payments texts, etc.
+                                <field name="module_multi_company" class="oe_inline"/>
+                                <label for="module_multi_company"/>
                             </div>
-                            <button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute"/>
-                            <separator string="Others" colspan="2"/>
-                            <label for="id" string="Outgoing Mail Servers"/>
-                            <button type="action" name="%(base.action_ir_mail_server_list)d"
-                            string="Configure" icon="gtk-execute"/>
-                        </group>
+                            <div>
+                                <label string="You will also find several configuration options on your company data:
+                                    address for the header and footer, overdue payments texts, etc."/>
+                                <button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute" class="oe_inline oe_link"/>
+                            </div>
+                        </div>
+                    </group>
+                    <separator string="External Accesses"/>
+                    <group>
+                        <label for="id" string="External Accesses"/>
+                        <div>
+                            <div>
+                                <field name="module_share" class="oe_inline"/>
+                                <label for="module_share"/>
+                            </div>
+                            <div>
+                                <field name="module_portal" class="oe_inline"/>
+                                <label for="module_portal"/>
+                            </div>
+                        </div>
+                    </group>
+                    <separator string="Others"/>
+                    <group>
+                        <label for="id" string="Outgoing Mail Servers"/>
+                        <button type="action" name="%(base.action_ir_mail_server_list)d"
+                            string="Configure" icon="gtk-execute" class="oe_link"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index cf35654475d..520dd4dd94f 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -20,26 +20,56 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
+                    <separator string="Additional Features"/>
                     <group>
-                        <group string="Additional Features" name="left_column">
-                            <field name="module_hr_expense"/>
-                            <field name="module_hr_evaluation"/>
-                            <field name="module_hr_holidays"/>
-                            <field name="module_hr_recruitment"/>
-                            <field name="module_hr_contract"/>
-                            <label for="module_hr_payroll"/>
+                        <label for="id" string="Additional Features"/>
+                        <div>
                             <div>
-                                <field name="module_hr_payroll"/>
+                                <field name="module_hr_expense" class="oe_inline"/>
+                                <label for="module_hr_expense"/>
+                            </div>
+                            <div>
+                                <field name="module_hr_evaluation" class="oe_inline"/>
+                                <label for="module_hr_evaluation"/>
+                            </div>
+                            <div>
+                                <field name="module_hr_holidays" class="oe_inline"/>
+                                <label for="module_hr_holidays"/>
+                            </div>
+                            <div>
+                                <field name="module_hr_recruitment" class="oe_inline"/>
+                                <label for="module_hr_recruitment"/>
+                            </div>
+                            <div>
+                                <field name="module_hr_contract" class="oe_inline"/>
+                                <label for="module_hr_contract"/>
+                            </div>
+                            <div name="hr_payroll">
+                                <field name="module_hr_payroll" class="oe_inline"/>
+                                <label for="module_hr_payroll"/>
                                 <button name="%(open_payroll_modules)d" type="action"
                                     string="Install Country-Specific Payroll" icon="gtk-go-forward"
-                                    attrs="{'invisible': [('module_hr_payroll','=',False)]}"/>
+                                    attrs="{'invisible': [('module_hr_payroll','=',False)]}" class="oe_link"/>
                             </div>
-                        </group>
-                        <group string="Timesheets" name="right_column">
-                            <field name="module_hr_attendance" on_change="onchange_hr_attendance(module_hr_attendance)"/>
-                            <field name="module_hr_timesheet" on_change="onchange_hr_timesheet(module_hr_timesheet)"/>
-                            <field name="module_hr_timesheet_sheet"/>
-                        </group>
+                        </div>
+                    </group>
+                    <separator string="Timesheets"/>
+                    <group name="timesheet_grp">
+                        <label for="id" string="Timesheet Features"/>
+                        <div>
+                            <div>
+                                <field name="module_hr_attendance" on_change="onchange_hr_attendance(module_hr_attendance)" class="oe_inline"/>
+                                <label for="module_hr_attendance"/>
+                            </div>
+                            <div>
+                                <field name="module_hr_timesheet" on_change="onchange_hr_timesheet(module_hr_timesheet)" class="oe_inline"/>
+                                <label for="module_hr_timesheet"/>
+                            </div>
+                            <div name="hr_timesheet">
+                                <field name="module_hr_timesheet_sheet" class="oe_inline"/>
+                                <label for="module_hr_timesheet_sheet"/>
+                            </div>
+                        </div>
                     </group>
                 </form>
             </field>
diff --git a/addons/hr_payroll/res_config_view.xml b/addons/hr_payroll/res_config_view.xml
index c62281892e8..23b4adde536 100644
--- a/addons/hr_payroll/res_config_view.xml
+++ b/addons/hr_payroll/res_config_view.xml
@@ -7,9 +7,11 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
             <field name="arch" type="xml">
-                <!-- put after the element <div><field name="module_hr_payroll" class="oe_inline"/> ...</div> -->
-                <xpath expr="//group[@name='left_column']" position="inside">
-                    <field name="module_hr_payroll_account"/>
+                <xpath expr="//div[@name='hr_payroll']" position="after">
+                    <div>
+                        <field name="module_hr_payroll_account" class="oe_inline"/>
+                        <label for="module_hr_payroll_account"/>
+                    </div>
                 </xpath>
             </field>
         </record>
diff --git a/addons/hr_recruitment/res_config_view.xml b/addons/hr_recruitment/res_config_view.xml
index 60d6d8d152d..442eca839d6 100644
--- a/addons/hr_recruitment/res_config_view.xml
+++ b/addons/hr_recruitment/res_config_view.xml
@@ -7,15 +7,23 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
             <field name="arch" type="xml">
-                <group name="right_column" position="inside">
-                    <separator string="Recruitment" colspan="2"/>
-                    <field name="module_document_ftp"/>
-                    <label for="fetchmail_applicants"/>
-                    <div>
-                        <field name="fetchmail_applicants"/>
-                        <button name="configure_fetchmail_applicants" type="object" string="Configure" icon="gtk-go-forward"
-                            attrs="{'invisible': [('fetchmail_applicants','=',False)]}"/>
-                    </div>
+                <group name="timesheet_grp" position="after">
+                    <separator string="Recruitment"/>
+                    <group>
+                        <label for="id" string="Recruitment Features"/>
+                        <div>
+                            <div>
+                                <field name="module_document_ftp" class="oe_inline"/>
+                                <label for="module_document_ftp"/>
+                            </div>
+                            <div>
+                                <field name="fetchmail_applicants" class="oe_inline"/>
+                                <label for="fetchmail_applicants"/>
+                                <button name="configure_fetchmail_applicants" type="object" string="Configure" icon="gtk-go-forward"
+                                    attrs="{'invisible': [('fetchmail_applicants','=',False)]}" class="oe_link"/>
+                            </div>
+                        </div>
+                    </group>
                 </group>
             </field>
         </record>
diff --git a/addons/hr_timesheet_sheet/res_config_view.xml b/addons/hr_timesheet_sheet/res_config_view.xml
index 61ebee2412b..1dcc721e697 100644
--- a/addons/hr_timesheet_sheet/res_config_view.xml
+++ b/addons/hr_timesheet_sheet/res_config_view.xml
@@ -7,10 +7,16 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
             <field name="arch" type="xml">
-                <field name="module_hr_timesheet_sheet" position="after">
-                    <field name="timesheet_range" attrs="{'invisible': [('module_hr_timesheet_sheet','=',False)], 'required': [('module_hr_timesheet_sheet','=',True)]}"/>
-                    <field name="timesheet_max_difference" attrs="{'invisible': [('module_hr_timesheet_sheet','=',False)], 'required': [('module_hr_timesheet_sheet','=',True)]}"/>
-                </field>
+                <xpath expr="//div[@name='hr_timesheet']" position="after">
+                    <div>
+                        <label for="timesheet_range" attrs="{'invisible': [('module_hr_timesheet_sheet','=',False)]}"/>
+                        <field name="timesheet_range" attrs="{'invisible': [('module_hr_timesheet_sheet','=',False)], 'required': [('module_hr_timesheet_sheet','=',True)]}" class="oe_inline"/>
+                    </div>
+                    <div>
+                        <label for="timesheet_max_difference" attrs="{'invisible': [('module_hr_timesheet_sheet','=',False)]}"/>
+                        <field name="timesheet_max_difference" attrs="{'invisible': [('module_hr_timesheet_sheet','=',False)], 'required': [('module_hr_timesheet_sheet','=',True)]}" class="oe_inline"/>
+                    </div>
+                </xpath>
             </field>
         </record>
     </data>
diff --git a/addons/knowledge/res_config_view.xml b/addons/knowledge/res_config_view.xml
index ec4d91683f1..7eaa6bac786 100644
--- a/addons/knowledge/res_config_view.xml
+++ b/addons/knowledge/res_config_view.xml
@@ -1,3 +1,4 @@
+
 <openerp>
     <data>
 
@@ -6,27 +7,47 @@
             <field name="model">knowledge.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Configure Knowledge" version="7.0">
+                <form string="Configure Knowledge" class= "oe_form_configuration" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                         or 
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
+                    <separator string="Wiki"/>
                     <group>
-                        <group string="Wiki">
-                            <field name="module_wiki_faq"/>
-                            <field name="module_wiki_quality_manual"/>
-                        </group>
-                        <group string="Documents">
-                            <field name="module_document"/>
-                            <field name="module_document_ftp"/>
-                            <field name="module_document_webdav"/>
-                        </group>
+                        <label for="id" string="Wiki Settings"/>
+                        <div>
+                            <div>
+                                <field name="module_wiki_faq" class="oe_inline"/>
+                                <label for="module_wiki_faq"/>
+                            </div>
+                            <div>
+                                <field name="module_wiki_quality_manual" class="oe_inline"/>
+                                <label for="module_wiki_quality_manual"/>
+                            </div>        
+                        </div>                           
+                    </group>
+                    <separator string="Documents"/>
+                    <group>
+                        <label for="id" string="Document Settings"/>
+                        <div>
+                            <div>
+                                <field name="module_document" class="oe_inline"/>
+                                <label for="module_document"/>    
+                            </div>    
+                            <div>
+                                <field name="module_document_ftp" class="oe_inline"/>
+                                <label for="module_document_ftp"/>
+                            </div>
+                            <div>
+                                <field name="module_document_webdav" class="oe_inline"/>
+                                <label for="module_document_webdav"/>    
+                            </div>
+                        </div>        
                     </group>
                 </form>
             </field>
         </record>
-
         <record id="action_knowledge_configuration" model="ir.actions.act_window">
             <field name="name">Configure Knowledge</field>
             <field name="res_model">knowledge.config.settings</field>
diff --git a/addons/marketing/res_config_view.xml b/addons/marketing/res_config_view.xml
index c2c7cb543c0..4f7772731a1 100644
--- a/addons/marketing/res_config_view.xml
+++ b/addons/marketing/res_config_view.xml
@@ -6,17 +6,30 @@
             <field name="model">marketing.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Configure Marketing" version="7.0">
+                <form string="Configure Marketing" class="oe_form_configuration" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
 
                     </header>
-                    <group string="Campaigns">
-                        <field name="module_marketing_campaign"/>
-                        <field name="module_marketing_campaign_crm_demo"/>
-                        <field name="module_crm_profiling"/>
+                    <separator string="Campaigns"/>
+                    <group>
+                        <label for="id" string="Campaigns Settings"/>
+                        <div>
+                            <div>
+                                <field name="module_marketing_campaign" class="oe_inline"/>
+                                <label for="module_marketing_campaign"/>
+                            </div>
+                            <div>
+                                <field name="module_marketing_campaign_crm_demo" class="oe_inline"/>
+                                <label for="module_marketing_campaign_crm_demo"/>
+                            </div>    
+                            <div>
+                                <field name="module_crm_profiling" class="oe_inline"/>
+                                <label for="module_crm_profiling"/>
+                            </div>   
+                        </div>     
                     </group>
                 </form>
             </field>
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index 8d81a3d2d0a..1e6f9ae63f8 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -1,38 +1,79 @@
 <openerp>
     <data>
-
         <record id="view_mrp_config" model="ir.ui.view">
             <field name="name">mrp settings</field>
             <field name="model">mrp.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Configure Manufacturing" version="7.0">
+                <form string="Configure Manufacturing" class= "oe_form_configuration" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
+                    <separator string="Manufacturing Order"/>
                     <group>
-                        <group string="Manufacturing Order">
-                            <field name="module_mrp_operations"/>
-                            <field name="module_stock_planning"/>
-                            <field name="module_mrp_subproduct"/>
-                            <field name="module_mrp_repair"/>
-                            <separator string="Logistics" colspan="2"/>
-                            <field name="module_mrp_jit"/>
-                            <field name="module_stock_no_autopicking"/>
-                        </group>
-                        <group string="Products">
-                            <field name="module_product_manufacturer"/>
-                            <separator string="Bill Of Material" colspan="2"/>
-                            <field name="group_mrp_routings"/>
-                            <field name="group_mrp_properties"/>
-                        </group>
+                        <label for="id" string="Order Settings"/>
+                        <div>
+                            <div>
+                                <field name="module_mrp_operations" class="oe_inline"/>
+                                <label for="module_mrp_operations" />
+                            </div>
+                            <div>
+                                <field name="module_stock_planning" class="oe_inline"/>
+                                <label for="module_stock_planning"/>
+                            </div>    
+                            <div>
+                                <field name="module_mrp_subproduct" class="oe_inline"/>
+                                <label for="module_mrp_subproduct"/>                          
+                            </div>
+                            <div>
+                                <field name="module_mrp_repair" class="oe_inline"/>
+                                <label for="module_mrp_repair"/>
+                            </div>                            
+                        </div>
+                    </group>
+                    <separator string="Logistics" />
+                    <group >
+                        <label for="id" string="Logistics Settings"/>   
+                        <div>
+                            <div>
+                                <field name="module_mrp_jit" class="oe_inline"/>
+                               <label for="module_mrp_jit" string="Real-Time"/>
+                            </div>
+                            <div>
+                                 <field name="module_stock_no_autopicking" class="oe_inline"/>
+                                 <label for="module_stock_no_autopicking" />
+                            </div>
+                        </div>    
+                    </group>
+                    <separator string="Products"/>
+                    <group >
+                        <label for="id" string="Product Settings"/>   
+                        <div>
+                            <div>
+                                <field name="module_product_manufacturer" class="oe_inline"/>
+                                <label for="module_product_manufacturer"/>
+                            </div>
+                        </div>    
+                    </group>                           
+                    <separator string="Bill Of Material" />
+                    <group >
+                        <label for="id" string="BOM Settings"/>   
+                        <div>
+                            <div>
+                                <field name="group_mrp_routings" class="oe_inline"/>
+                                <label for="group_mrp_routings"/>
+                            </div>
+                            <div>
+                                <field name="group_mrp_properties" class="oe_inline"/>
+                                <label for="group_mrp_properties" />
+                            </div>
+                        </div>
                     </group>
                 </form>
             </field>
         </record>
-
         <record id="action_mrp_configuration" model="ir.actions.act_window">
             <field name="name">Configure Manufacturing</field>
             <field name="type">ir.actions.act_window</field>
diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index 6248efde5d2..5e24ecc4d99 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -6,30 +6,68 @@
             <field name="type">form</field>
             <field name="priority" eval="20"/>
             <field name="arch" type="xml">
-                <form string="Configure Project" version="7.0">
+                <form string="Configure Project" version="7.0" class="oe_form_configuration">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
+                    <separator string="Project and Planing"/>
                     <group>
-                        <group>
-                            <separator string="Project" colspan="2"/>
-                            <field name="module_project_mrp"/>
-                            <field name="module_project_timesheet"/>
-                            <field name="module_pad"/>
-                            <field name="group_tasks_work_on_tasks"/>
-                            <field name="group_time_work_estimation_tasks"/>
-                            <field name="group_manage_delegation_task"/>
-                            <field name="time_unit" domain="[('category_id.name','=','Working Time')]"/>
-                        </group>
-                        <group name="project_left_column">
-                            <separator string="Planing" colspan="2"/>
-                            <field name="module_project_long_term"/>
-                            <separator string="Helpdesk and Support" colspan="2"/>
-                            <field name="module_project_issue"/>
-                            <field name="module_project_issue_sheet"/>
-                        </group>
+                        <label for="id" string="Project"/>
+                        <div>
+                            <div>
+                                <field name="module_project_mrp" class="oe_inline"/>
+                                <label for="module_project_mrp"/>
+                            </div>
+                            <div>
+                                <field name="module_project_timesheet" class="oe_inline"/>
+                                <label for="module_project_timesheet"/>
+                            </div>
+                            <div>
+                                <field name="module_pad" class="oe_inline"/>
+                                <label for="module_pad"/>
+                            </div>
+                            <div>
+                                <field name="group_tasks_work_on_tasks" class="oe_inline"/>
+                                <label for="group_tasks_work_on_tasks" />
+                            </div>
+                            <div>
+                                <field name="group_time_work_estimation_tasks" class="oe_inline"/>
+                                <label for="group_time_work_estimation_tasks"/>
+                            </div>
+                            <div>
+                                <field name="group_manage_delegation_task" class="oe_inline"/>
+                                <label for="group_manage_delegation_task"/>
+                            </div>
+                            <div>
+                                <label for="time_unit"/>
+                                <field name="time_unit" class="oe_inline" domain="[('category_id.name','=','Working Time')]"/>
+                            </div>
+                        </div>
+                    </group>
+                    <group>    
+                        <label for="id" string="Planing"/>
+                        <div>
+                            <div>
+                                <field name="module_project_long_term" class="oe_inline"/>
+                                <label for="module_project_long_term"/>
+                            </div>
+                        </div>
+                    </group>
+                    <separator string="Helpdesk and Support"/>
+                    <group>
+                        <label for="id" string="Helpdesk and Support"/>
+                        <div>
+                            <div>
+                                <field name="module_project_issue" class="oe_inline"/>
+                                <label for="module_project_issue"/>
+                            </div>
+                            <div name="module_project_issue_sheet">
+                                <field name="module_project_issue_sheet" class="oe_inline"/>
+                                <label for="module_project_issue_sheet"/>
+                            </div>
+                        </div>
                     </group>
                 </form>
             </field>
diff --git a/addons/project_issue/res_config_view.xml b/addons/project_issue/res_config_view.xml
index 81426e2b8a4..bddabf0c7e8 100644
--- a/addons/project_issue/res_config_view.xml
+++ b/addons/project_issue/res_config_view.xml
@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
         <record id="view_config_settings" model="ir.ui.view">
             <field name="name">Project Application</field>
             <field name="model">project.config.settings</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="project.view_config_settings"/>
             <field name="arch" type="xml">
-                <field name="module_project_issue_sheet" position="after">
-                    <label for="fetchmail_issue"/>
+                <div name="module_project_issue_sheet" position="after">
                     <div>
-                        <field name="fetchmail_issue"/>
-                        <button name="configure_fetchmail_issue" type="object" string="Configure" icon="gtk-go-forward"
-                            attrs="{'invisible': [('fetchmail_issue','=',False)]}"/>
+                        <field name="fetchmail_issue" class="oe_inline"/>
+                        <label for="fetchmail_issue"/>
+                        <button name="configure_fetchmail_issue"
+                            type="object"
+                            string="Configure"
+                            icon="gtk-go-forward"
+                            attrs="{'invisible': [('fetchmail_issue','=',False)]}" class="oe_link"/>
                     </div>
-                </field>
+                </div>
             </field>
         </record>
-
     </data>
 </openerp>
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index 9cfcf4ea3d6..47816e47bf2 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -1,34 +1,64 @@
 <openerp>
     <data>
-
         <record id="view_purchase_configuration" model="ir.ui.view">
             <field name="name">purchase settings</field>
             <field name="model">purchase.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Configure Purchases" version="7.0">
+                <form string="Configure Purchases" class="oe_form_configuration" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
+                    <separator string="Purchase Order"/>
                     <group>
-                        <group>
-                            <separator string="Purchase Order" colspan="2"/>
-                            <field name="group_purchase_pricelist"/>
-                            <field name="group_uom"/>
-                            <field name="group_purchase_delivery_address"/>
-                            <field name="module_purchase_double_validation"/>
-                            <field name="module_purchase_requisition"/>
-                            <field name="module_warning"/>
-                            <field name="module_purchase_analytic_plans"/>
-                        </group>
-			<group>
-                            <separator string="Invoicing" colspan="2"/>
-                            <field name="default_invoice_method" class="oe_inline"/>
-                            <field name="decimal_precision" class="oe_inline"/>
-                        </group>
-                    </group>
+                        <label for="id" string="Order Setting"/>   
+                        <div>
+							<div>
+								<field name="group_purchase_pricelist" class="oe_inline"/>
+								<label for="group_purchase_pricelist"/>
+							</div>    
+							<div>
+								<field name="group_uom" class="oe_inline"/>
+								<label for="group_uom"/>
+							</div>                   
+							<div>
+								<field name="group_purchase_delivery_address" class="oe_inline"/>
+								<label for="group_purchase_delivery_address"/>
+							</div>    
+							<div name="module_purchase_double_validation">
+								<field name="module_purchase_double_validation" class="oe_inline"/>
+								<label for="module_purchase_double_validation"/>
+							</div>     
+							<div>
+								<field name="module_purchase_requisition" class="oe_inline"/>
+								<label for="module_purchase_requisition"/>
+							</div>
+							<div>    
+								<field name="module_warning" class="oe_inline"/>
+								<label for="module_warning"/>
+							</div>
+							<div>
+								<field name="module_purchase_analytic_plans" class="oe_inline"/>
+								<label for="module_purchase_analytic_plans"/>
+							</div>
+                        </div>    
+			        </group>
+			        <separator string="Invoicing"/>
+					<group>
+						<label for="id" string="Invoicing Setting"/>   
+						<div>
+							<div>
+								<label for="default_invoice_method"/>
+								<field name="default_invoice_method" class="oe_inline"/>
+							</div>
+							<div>
+								 <label for="decimal_precision"/>
+								 <field name="decimal_precision" class="oe_inline"/>
+							</div>
+						</div>            
+					</group>
                 </form>
             </field>
         </record>
diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.xml b/addons/purchase_double_validation/purchase_double_validation_installer.xml
index 426dcae859a..c9345694b77 100644
--- a/addons/purchase_double_validation/purchase_double_validation_installer.xml
+++ b/addons/purchase_double_validation/purchase_double_validation_installer.xml
@@ -7,11 +7,13 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="purchase.view_purchase_configuration"/>
             <field name="arch" type="xml">
-                <field name="module_purchase_double_validation" position="after">
-                    <field name="limit_amount" attrs="{'required': [('module_purchase_double_validation','=',True)]}"/>
-                </field>
+                <div name="module_purchase_double_validation" position="before">
+                    <div>
+                        <label for="limit_amount"/>
+                        <field name="limit_amount" attrs="{'required': [('module_purchase_double_validation','=',True)]}" class="oe_inline"/>
+                    </div>
+                </div>
             </field>
         </record>
-
     </data>
 </openerp>