diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 48d6320fbc3..c29371e4c44 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1628,6 +1628,7 @@
                         <field name="name"/>
                         <field name="active"/>
                     </group>
+                    <label for="note"/>
                     <field name="note" placeholder="Payment term explanation for the customer..."/>
                     <separator string="Computation"/>
                     <field name="line_ids"/>
@@ -2443,7 +2444,7 @@
                         <field name="sign"/>
                         <field name="style_overwrite"/>
                     </group>
-                    <notebook>
+                    <notebook attrs="{'invisible': [('type','not in',['accounts','account_type'])]}">
                         <page string="Report">
                             <group>
                                 <field name="display_detail" attrs="{'invisible': [('type','not in',['accounts','account_type'])]}"/>
diff --git a/addons/account_followup/__openerp__.py b/addons/account_followup/__openerp__.py
index 61e9ea2d4ae..f85ecc4ee90 100644
--- a/addons/account_followup/__openerp__.py
+++ b/addons/account_followup/__openerp__.py
@@ -29,7 +29,7 @@ Module to automate letters for unpaid invoices, with multi-level recalls.
 
 You can define your multiple levels of recall through the menu:
 ---------------------------------------------------------------
-    Configuration / Follow-Up Levels
+    Configuration / Follow-up / Follow-up Levels
     
 Once it is defined, you can automatically print recalls every day through simply clicking on the menu:
 ------------------------------------------------------------------------------------------------------
@@ -55,6 +55,7 @@ Note that if you want to check the follow-up level for a given partner/account e
         'account_followup_view.xml',
         'account_followup_customers.xml',
         'wizard/account_followup_print_view.xml',
+        'res_config_view.xml',
         'views/report_followup.xml',
         'account_followup_reports.xml'
     ],
diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py
index eae361913ad..820a179efdb 100644
--- a/addons/account_followup/account_followup.py
+++ b/addons/account_followup/account_followup.py
@@ -30,7 +30,7 @@ class followup(osv.osv):
     _columns = {
         'followup_line': fields.one2many('account_followup.followup.line', 'followup_id', 'Follow-up'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
-        'name': fields.related('company_id', 'name', string = "Name"),
+        'name': fields.related('company_id', 'name', string = "Name", readonly=True, type="char"),
     }
     _defaults = {
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'account_followup.followup', context=c),
@@ -479,4 +479,20 @@ class res_partner(osv.osv):
                                                     fnct_search=_payment_earliest_date_search),
         }
 
+
+class account_config_settings(osv.TransientModel):
+    _name = 'account.config.settings'
+    _inherit = 'account.config.settings'
+    
+    def open_followup_level_form(self, cr, uid, ids, context=None):
+        res_ids = self.pool.get('account_followup.followup').search(cr, uid, [], context=context)
+        
+        return {
+                 'type': 'ir.actions.act_window',
+                 'name': 'Payment Follow-ups',
+                 'res_model': 'account_followup.followup',
+                 'res_id': res_ids and res_ids[0] or False,
+                 'view_mode': 'form,tree',
+         }
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index 57f71566db0..94b4f6dce9a 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -71,7 +71,9 @@
             <field name="model">account_followup.followup</field>
             <field name="arch" type="xml">
                 <form string="Follow-up" version="7.0">
-                    <h1><field name="company_id" widget="selection" class="oe_inline"/></h1>
+                    <h1><field name="name"/></h1>
+                    <label for="company_id" groups="base.group_multi_company"/>
+                    <field name="company_id" widget="selection" class="oe_inline" groups="base.group_multi_company"/>
                     <p class="oe_grey">
                         To remind customers of paying their invoices, you can
                         define different actions depending on how severely
@@ -113,6 +115,7 @@
             <field name="res_model">account_followup.followup</field>
             <field name="search_view_id" ref="view_account_followup_filter"/>
             <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
                 Click to define follow-up levels and their related actions.
@@ -130,8 +133,11 @@
              parent="menu_finance_followup"
              sequence="0"
              id="menu_manual_reconcile_followup"/>
+       
+       <menuitem id="account_followup_main_menu" parent="account.menu_finance_configuration" name="Follow-up"/>
 
-        <menuitem action="action_account_followup_definition_form" id="account_followup_menu" parent="account.menu_finance_configuration" name="Follow-up Levels"/>
+
+        <menuitem action="action_account_followup_definition_form" id="account_followup_menu" parent="account_followup_main_menu" name="Follow-up Levels"/>
 
         <record id="account_move_line_partner_tree" model="ir.ui.view">
             <field name="name">account.move.line.partner.tree</field>
diff --git a/addons/account_followup/res_config_view.xml b/addons/account_followup/res_config_view.xml
new file mode 100644
index 00000000000..25e15aca562
--- /dev/null
+++ b/addons/account_followup/res_config_view.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_account_config_settings_inherit" model="ir.ui.view">
+            <field name="name">account settings</field>
+            <field name="model">account.config.settings</field>
+            <field name="inherit_id" ref="account.view_account_config_settings"/>
+            <field name="arch" type="xml">
+               <xpath expr="//label[@for='module_account_followup']" position="after">
+                    <button type="object" name="open_followup_level_form" string="Configure your follow-up levels" class="oe_link"/>
+                </xpath>         
+            </field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 1ad729d9c09..743391d1522 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -43,9 +43,8 @@
                                 <field name="free_if_more_than" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
                                 <field name="amount" attrs="{'required':[('free_if_more_than','&lt;&gt;',False)], 'invisible':[('free_if_more_than','=',False)]}"/>
                             </div>
+                            <field name="use_detailed_pricelist"/>
                         </group>
-                        <newline/>
-                        <field name="use_detailed_pricelist"/>
                     </group>
                     <field name="pricelist_ids" attrs="{'invisible':[('use_detailed_pricelist','=',False)]}" mode="tree">
                         <tree string="Delivery grids">
@@ -142,7 +141,7 @@
                         </page>
                         <page string="Destination">
                             <group string="Countries">
-                                <field name="country_ids"/>
+                                <field name="country_ids" nolabel="1"/>
                             </group>
                             <group string="States">
                                 <field colspan="2" name="state_ids" nolabel="1"/>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 33f737aa66e..457d8f33a07 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -203,7 +203,7 @@
         </record>
 
         <record id="hr_expense_product" model="ir.actions.act_window">
-            <field name="name">Products</field>
+            <field name="name">Expense Categories</field>
             <field name="res_model">product.product</field>
             <field name="view_type">form</field>
             <field name="view_mode">kanban,tree,form</field>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 4410784c63c..564edf57c02 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -500,11 +500,15 @@
             <field name="name">hr.contribution.register.form</field>
             <field name="model">hr.contribution.register</field>
             <field name="arch" type="xml">
-                <form string="Contribution">
-                    <field name="name"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    <separator string="Description"/>
-                    <field name="note" nolabel="1"/>
+                <form string="Contribution" version="7.0">
+                    <group>
+                        <field name="name"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection" class="oe_inline"/>
+                    </group>
+                    <newline/>
+                    <group>
+                    <separator string="Description"/><newline/>
+                    <field name="note" nolabel="1"/></group>
                 </form>
             </field>
         </record>
diff --git a/addons/l10n_fr_rib/bank_view.xml b/addons/l10n_fr_rib/bank_view.xml
index 414ad51954a..4bc697b6173 100644
--- a/addons/l10n_fr_rib/bank_view.xml
+++ b/addons/l10n_fr_rib/bank_view.xml
@@ -21,12 +21,12 @@
             <field name="model">res.partner.bank</field>
             <field name="inherit_id" ref="base.view_partner_bank_form" />
             <field name="arch" type="xml">
-                <field name="acc_number" position="before">
-                    <field name="bank_code" />
-                    <field name="office" />
+                <field name="acc_number" position="after">
+                    <field name="bank_code" attrs="{'invisible':[('state','!=','rib')]}"/>
+                    <field name="office" attrs="{'invisible':[('state','!=','rib')]}"/>
                     <newline />
-                    <field name="rib_acc_number" />
-                    <field name="key" />
+                    <field name="rib_acc_number" attrs="{'invisible':[('state','!=','rib')]}"/>
+                    <field name="key" attrs="{'invisible':[('state','!=','rib')]}"/>
                     <newline />
                 </field>
             </field>
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index c5fa52afe29..cb7ad61e928 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -427,10 +427,14 @@
                     </header>
                     <sheet>
                         <group>
-                            <field name='name'/>
-                            <field name='category_id'/>
-                            <field name='supplier'/>
-                            <field name='price'/>
+                            <group>
+                                <field name='name'/>
+                                <field name='category_id'/>
+                            </group>
+                            <group>
+                                <field name='supplier'/>
+                                <field name='price'/>
+                            </group>
                         </group>
                         <label for='description'/>
                         <field name='description'/>
@@ -461,7 +465,7 @@
                     <sheet>
                         <group string="Schedule Date">
                             <group>
-                                <field name="alter_type"/>
+                                <field name="alter_type" class="oe_inline"/>
                                 <field name="specific_day" attrs="{'invisible': [('alter_type','!=','specific')], 'required':[('alter_type','=','specific')]}"/>
                             </group>
                         </group>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 6073d02fcc0..c17dea77735 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -679,7 +679,7 @@
                             <group>
                                 <group string="Products to Consume">
                                     <field name="move_lines" nolabel="1" options="{'reload_on_button': true}">
-                                        <tree colors="blue:state == 'draft';black:state in ('picking_except','confirmed','ready','in_production');gray:state in ('cancel','done') " string="Products to Consume">
+                                        <tree colors="blue:state == 'draft';black:state in ('ready','assigned','in_production');gray:state in ('cancel','done');red:state in ('confirmed','picking_except','waiting')" string="Products to Consume">
                                             <field name="product_id"/>
                                             <field name="product_qty"  string="Quantity"/>
                                             <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index 784a14228d5..8d725b3beee 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -12,15 +12,23 @@
             <field name="model">product.pricelist.version</field>
             <field name="arch" type="xml">
                 <form string="Pricelist Version" version="7.0">
-                    <group col="4">
-                        <field name="name"/>
-                        <field name="active"/>
-                        <field colspan="4" name="pricelist_id"/>
-                        <field name="date_start"/>
-                        <field name="date_end"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="pricelist_id"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        </group>
+                        <group>
+                            <field name="date_start"/>
+                            <field name="date_end"/>
+                            <field name="active"/>
+                        </group>
                     </group>
-                    <field name="items_id"/>
+                    <notebook>
+                    <page string="Item List">
+                        <field name="items_id"/>
+                    </page>
+                    </notebook>
                 </form>
             </field>
         </record>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index c547a611cd4..c5437ed3e33 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -585,10 +585,12 @@
             <field name="model">product.ul</field>
             <field name="arch" type="xml">
                 <form string="Packaging" version="7.0">
+                    <sheet>
                     <group>
                         <field name="name"/>
                         <field name="type"/>
                     </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index da3a6d132ee..9901fbdb1f1 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -37,15 +37,19 @@
                 <field name="state" widget="statusbar" statusbar_visible="draft,in_progress,done" statusbar_colors='{"in_progress":"blue"}'/>
             </header>
             <sheet>
-                <div class="oe_edit_only">
-                    <label for="name" class="oe_inline"/>
-                    <label for="origin" class="oe_inline"/>
+                <div class="pull-left">
+                    <label for="name" class="oe_edit_only oe_inline"/>
+                    <h1>
+                        <field name="name" class="oe_inline"/>
+                    </h1>
+                </div>
+                <div class="pull-left">
+                    <label for="origin" class="oe_edit_only oe_inline"/>
+                    <h1>
+                        <label string="," attrs="{'invisible':[('origin','=',False)]}"/>
+                        <field name="origin" class="oe_inline" placeholder="e.g. PO0025"/>
+                    </h1>
                 </div>
-                <h1>
-                    <field name="name" class="oe_inline"/>
-                    <label string="," attrs="{'invisible':[('origin','=',False)]}"/>
-                    <field name="origin" class="oe_inline" placeholder="e.g. PO0025"/>
-                </h1>
                 <group>
                     <group>
                         <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'purchase_requisition.group_purchase_requisition_user', 'purchase.group_purchase_user', 'account.group_account_invoice']}"/>
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 74f71ecfeea..752026005a3 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -216,7 +216,7 @@
                         </group>
                         <group>
                             <field name="calendar_id"/>
-                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company" attrs="{'invisible':[('calendar_id','=',False)]}"/>
                         </group>
                     </group>
                     <group>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index e96652c11aa..37a4c93c219 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1558,11 +1558,11 @@
             <field name="model">stock.incoterms</field>
             <field name="arch" type="xml">
                 <form string="Incoterms" version="7.0">
-                    <group>
+                    <sheet>
                         <field name="name"/>
                         <field name="code"/>
                         <field name="active"/>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -1691,10 +1691,10 @@
             <field name="model">stock.journal</field>
             <field name="arch" type="xml">
                 <form string="Stock Journal" version="7.0">
-                    <group>
+                    <sheet>
                         <field name="name"/>
                         <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'account.group_account_invoice', 'stock.group_stock_manager']}"/>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>