diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml
index d3f4dc1a274..5affabdd862 100644
--- a/addons/account/wizard/account_chart_view.xml
+++ b/addons/account/wizard/account_chart_view.xml
@@ -7,12 +7,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account charts" version="7.0">
-                    <group colspan="4">
-                        <field name="fiscalyear" on_change="onchange_fiscalyear(fiscalyear)"/>
-                        <label align="0.7" string="(If you do not select Fiscal year it will take all open fiscal years)"/>
-                    </group>
-                    <group>
-                        <field name="target_move"/>
+                    <group col="4">
+                        <label for="fiscalyear"/>
+                        <div> 
+                            <field name="fiscalyear" on_change="onchange_fiscalyear(fiscalyear)" class="oe_inline"/>
+                            <label align="0.7" string="(If you do not select Fiscal year it will take all open fiscal years)" class="oe_inline"/>
+                        </div><newline/>
+                        <field name="target_move"/><newline/>
                         <label for="period_from" string="Periods"/>
                         <div>
                             <field name="period_from" class="oe_inline"/>-
diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
index 429c0b52373..bc794fdcdd1 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -105,18 +105,18 @@ class account_move_journal(osv.osv_memory):
             open_string = _("Open")
             view = """<?xml version="1.0" encoding="utf-8"?>
             <form string="Standard entries" version="7.0">
-                <header>
-                    <button string="%s" name="action_open_window" default_focus="1" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel"/>
-                </header>
                 <group>
                     <field name="target_move"/>
                 </group>
                 <label width="300" string="%s"/>
                 <newline/>
                 <label width="300" string="%s"/>
-            </form>""" % (open_string, journal_string, period_string)
+                <footer>
+                    <button string="%s" name="action_open_window" default_focus="1" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel"/>
+                </footer>
+            </form>""" % (journal_string, period_string, open_string)
     
             view = etree.fromstring(view.encode('utf8'))
             xarch, xfields = self._view_look_dom_arch(cr, uid, view, view_id, context=context)
diff --git a/addons/account/wizard/account_tax_chart_view.xml b/addons/account/wizard/account_tax_chart_view.xml
index bcbab1d26ff..d922fcf6191 100644
--- a/addons/account/wizard/account_tax_chart_view.xml
+++ b/addons/account/wizard/account_tax_chart_view.xml
@@ -8,9 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account tax charts" version="7.0">
-                    <group>
+                    <group col="4">
+                        <label for="period_id"/>
+                        <div>
+                            <field name="period_id" class="oe_inline"/>
+                            <label string="(If you do not select period it will take all open periods)" class="oe_inline"/>
+                        </div><newline/>
                         <field name="target_move"/>
-                    </group>
+	                </group>
                     <footer>
                         <button string="Open Charts" name="account_tax_chart_open_window" type="object" class="oe_highlight"/>
                         or
diff --git a/addons/account_accountant/account_accountant_data.xml b/addons/account_accountant/account_accountant_data.xml
index 3d665e680c3..330da2520c2 100644
--- a/addons/account_accountant/account_accountant_data.xml
+++ b/addons/account_accountant/account_accountant_data.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
-        <!-- rename root menu "Accounting" -->
-        <record id="account.menu_finance" model="ir.ui.menu">
-            <field name="name">Accounting</field>
-        </record>
-
 <!--
         It's easier for new users to not activate this (ex: they misconfigure
         header and footer.)
diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index e491b858286..61d2ce89ac9 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -215,7 +215,7 @@ class account_asset_asset(osv.osv):
         'account_move_line_ids': fields.one2many('account.move.line', 'asset_id', 'Entries', readonly=True, states={'draft':[('readonly',False)]}),
         'name': fields.char('Asset Name', size=64, required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'code': fields.char('Reference', size=32, readonly=True, states={'draft':[('readonly',False)]}),
-        'purchase_value': fields.float('Gross Value ', required=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'purchase_value': fields.float('Gross Value', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'currency_id': fields.many2one('res.currency','Currency',required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'company_id': fields.many2one('res.company', 'Company', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'note': fields.text('Note'),
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 712e759eb11..86ae9276870 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -88,18 +88,16 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
                 </header>
                 <sheet>
-                    <div class="oe_title">
-                        <label for="name" class="oe_edit_only"/>
-                        <h1>
-                            <field name="name" class="oe_inline"/> -
-                            <field name="code"  class="oe_inline"  placeholder="Reference"/>
-                            <button name="open_entries" string="Entries" type="object" class="oe_inline"/>
-                        </h1>
-                       <label for="category_id" class="oe_edit_only"/>
-                       <h2>
+                    <label for="name" class="oe_edit_only"/>
+                    <h1>
+                       <field name="name" class="oe_inline"/> -
+                       <field name="code"  class="oe_inline"  placeholder="Reference"/>
+                       <button name="open_entries" string="Entries" type="object" class="oe_inline"/>
+                    </h1>
+                    <label for="category_id" class="oe_edit_only"/>
+                    <h2>
                         <field name="category_id" on_change="onchange_category_id(category_id)"/>
-                      </h2>
-                    </div>
+                    </h2>
                     <group>
                         <group>
                             <field name="parent_id"/>
@@ -113,65 +111,64 @@
                     </group>
                     <notebook colspan="4">
                         <page string="General">
-                        <group>
-                            <group>
-                                <field name="purchase_value"/>
-                                <field name="salvage_value"/>
-                                <field name="value_residual"/>
-                            </group>
-                            <group>
-                                <field name="method"/>
-                                <field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')], 'required':[('method','=','degressive')]}"/>
-                                <field name="prorata" attrs="{'invisible': [('method_time','=','end')]}"/>
-                            </group>
-                        </group>
-                        <group>
-                            <group>
-                                <field name="method_time" on_change="onchange_method_time(method_time)"/>
-                                <field name="method_number" attrs="{'invisible':[('method_time','=','end')], 'required':[('method_time','=','number')]}"/>
-                                <field name="method_period"/>
-                                <field name="method_end" attrs="{'required': [('method_time','=','end')], 'invisible':[('method_time','=','number')]}"/>
-                                <button name="%(action_asset_modify)d" states="open" string="Change Duration" type="action" icon="terp-stock_effects-object-colorize" colspan="2"/>
-                            </group>
-                        </group>
+	                        <group>
+	                            <group>
+	                                <field name="purchase_value"/>
+	                                <field name="salvage_value"/>
+	                                <field name="value_residual"/>
+	                            </group>
+	                            <group>
+	                                <field name="method"/>
+	                                <field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')], 'required':[('method','=','degressive')]}"/>
+	                                <field name="prorata" attrs="{'invisible': [('method_time','=','end')]}"/>
+	                            </group>
+	                        </group>
+	                        <group>
+	                            <group>
+	                                <field name="method_time" on_change="onchange_method_time(method_time)"/>
+	                                <field name="method_number" attrs="{'invisible':[('method_time','=','end')], 'required':[('method_time','=','number')]}"/>
+	                                <field name="method_period"/>
+	                                <field name="method_end" attrs="{'required': [('method_time','=','end')], 'invisible':[('method_time','=','number')]}"/>
+	                                <button name="%(action_asset_modify)d" states="open" string="Change Duration" type="action" icon="terp-stock_effects-object-colorize" colspan="2"/>
+	                            </group>
+	                        </group>
                         </page>
                         <page string="Depreciation Board">
                             <field name="depreciation_line_ids" mode="tree,graph">
-                               <tree string="Depreciation Lines" colors="blue:(move_check == False);black:(move_check == True)">
-                                  <field name="depreciation_date"/>
-                                  <field name="sequence" invisible="1"/>
-                                  <field name="depreciated_value" readonly="1"/>
-                                  <field name="amount"/>
-                                  <field name="remaining_value" readonly="1"/>
-                                  <field name="move_check"/>
-                                  <field name="parent_state" invisible="1"/>
-                                  <button name="create_move" attrs="{'invisible':['|',('move_check','!=',False),('parent_state','!=','open')]}" icon="gtk-execute" string="Create Move" type="object"/>
-                               </tree>
-                               <form string="Depriciation Lines"> 
-                                   <group>
-                                       <group>
-                                           <field name="asset_id" invisible="1"/>
-                                           <field name="parent_state" invisible="1"/>
-                                           <field name="name"/>
-                                           <field name="amount"/>
-                                           <field name="move_id"/>
-                                           <field name="move_check"/>
-                                           <field name="parent_state" invisible="1"/>
-                                       </group>
-                                       <group>
-                                           <field name="sequence"/>
-                                           <field name="depreciation_date"/>
-                                           <field name="depreciated_value" readonly="1"/>
+                                <tree string="Depreciation Lines" colors="blue:(move_check == False);black:(move_check == True)">
+                                    <field name="depreciation_date"/>
+                                    <field name="sequence" invisible="1"/>
+                                    <field name="depreciated_value" readonly="1"/>
+                                    <field name="amount"/>
+                                    <field name="remaining_value" readonly="1"/>
+                                    <field name="move_check"/>
+                                    <field name="parent_state" invisible="1"/>
+                                    <button name="create_move" attrs="{'invisible':['|',('move_check','!=',False),('parent_state','!=','open')]}" icon="gtk-execute" string="Create Move" type="object"/>
+                                </tree>
+                                <form string="Depriciation Lines"> 
+                                    <group>
+                                        <group>
+                                            <field name="asset_id" invisible="1"/>
+                                            <field name="parent_state" invisible="1"/>
+                                            <field name="name"/>
+                                            <field name="amount"/>
+                                            <field name="move_id"/>
+                                            <field name="move_check"/>
+                                            <field name="parent_state" invisible="1"/>
+                                        </group>
+                                        <group>
+                                            <field name="sequence"/>
+                                            <field name="depreciation_date"/>
+                                            <field name="depreciated_value" readonly="1"/>
                                            <field name="remaining_value" readonly="1"/>
-                                       </group>
-                                   </group>
-                               </form>
-                               <graph type="bar">
-                                  <field name="name"/>
-                                  <field name="amount"/>
-                                  <field name="depreciated_value"/>
-                               </graph>
-                             
+                                        </group>
+                                    </group>
+                                </form>
+                                <graph type="bar">
+                                    <field name="name"/>
+                                    <field name="amount"/>
+                                    <field name="depreciated_value"/>
+                                </graph>
                             </field>
                             <button type="object" name="compute_depreciation_board" string="Compute" icon="terp-stock_format-scientific" colspan="2" attrs="{'invisible':[('state','=','close')]}"/>
                         </page>
@@ -183,8 +180,8 @@
                             <field name="note"/>
                         </page>
                     </notebook>
-              </sheet>
-           </form>
+                </sheet>
+            </form>
        </field>
     </record>
     
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 4d4b9b6e760..60522168fb4 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -51,29 +51,28 @@
                   </header>
                   <sheet string="Accounting Voucher">
                     <div class="oe_title">
-                     <label for="number" class="oe_edit_only"/>
-                     <h1>
-                        <field name="number"   class="oe_inline"/>
-                        <span attr="{'invisible': [('type','=',False)]}" class="oe_inline"> ( </span>
-                        <field name="type" required="1"  class="oe_inline"/>
-                        <span attr="{'invisible': [('type','=',False)]}" class="oe_inline"> ) </span>
-                     </h1>
-                   </div>  
-                  <group>
-                  <group>
-                     <field name="partner_id" required="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
-                     <field name="date" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id)"/>
-                     <field name="journal_id" widget="selection" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
-                  </group>
-                  <group>
-                     <field name="currency_id"/>
-                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                     <field name="reference"/>
-                     <field name="name"/>
-                  </group>
-                  </group>
-                   <field name="account_id" widget="selection" invisible="True"/>
-
+	                   <label for="number" class="oe_edit_only"/>
+	                   <h1>
+	                       <field name="number"   class="oe_inline"/>
+	                       <span attr="{'invisible': [('type','=',False)]}" class="oe_inline"> ( </span>
+	                       <field name="type" required="1"  class="oe_inline"/>
+	                       <span attr="{'invisible': [('type','=',False)]}" class="oe_inline"> ) </span>
+	                   </h1>
+                    </div>  
+                    <group>
+                        <group>
+	                       <field name="partner_id" required="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
+	                       <field name="date" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id)"/>
+	                       <field name="journal_id" widget="selection" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
+                        </group>
+                        <group>
+                            <field name="currency_id"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                            <field name="reference"/>
+                            <field name="name"/>
+                        </group>
+                    </group>
+                    <field name="account_id" widget="selection" invisible="True"/>
                     <notebook colspan="4">
                         <page string="Voucher Entry">
                             <field name="line_ids" on_change="onchange_price(line_ids, tax_id, partner_id)" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}">
@@ -86,21 +85,21 @@
                                 </tree>
                             </field>
                             <group>
-                               <group>
-                                  <field name="narration" colspan="2" nolabel="1"  placeholder="Add an internal note"/>
-                               </group>
-                               <group class="oe_subtotal_footer oe_right" attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}" >
-                                   <group>
-                                       <label for="tax_id"/>
-                                       <field name="tax_id" nolabel="1" on_change="onchange_price(line_ids, tax_id, partner_id)" widget="selection"/>
-                                       <button type="object" colspan="2" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
-                                   </group>
-                                   <group>
-                                            <field name="amount_untaxed"/>
-                                            <field name="tax_amount" readonly="1" />
-                                            <field name="amount"  class="oe_subtotal_footer_separator" readonly="1"/>
-                                   </group>
-                               </group>
+                                <group>
+                                    <field name="narration" colspan="2" nolabel="1"  placeholder="Add an internal note"/>
+                                </group>
+                                <group class="oe_subtotal_footer oe_right" attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}" >
+                                    <group>
+                                        <label for="tax_id"/>
+                                        <field name="tax_id" nolabel="1" on_change="onchange_price(line_ids, tax_id, partner_id)" widget="selection"/>
+                                        <button type="object" colspan="2" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
+                                    </group>
+                                    <group>
+                                        <field name="amount_untaxed"/>
+                                        <field name="tax_amount" readonly="1" />
+                                        <field name="amount"  class="oe_subtotal_footer_separator" readonly="1"/>
+                                    </group>
+                                </group>
                             </group>
                         </page>
                         <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
@@ -109,26 +108,26 @@
                                 <field name="audit"/>
                             </group>
                             <field name="move_ids" readonly="1">
-                               <tree string="Journal Items">
-                                   <field name="move_id"/>
-                                   <field name="ref"/>
-                                   <field name="date"/>
-                                   <field name="statement_id"/>
-                                   <field name="partner_id"/>
-                                   <field name="account_id"/>
-                                   <field name="name"/>
-                                   <field name="debit"/>
-                                   <field name="credit"/>
-                                   <field name="state"/>
-                                   <field name="reconcile_id"/>
-                               </tree>
+                                <tree string="Journal Items">
+                                    <field name="move_id"/>
+                                    <field name="ref"/>
+                                    <field name="date"/>
+                                    <field name="statement_id"/>
+                                    <field name="partner_id"/>
+                                    <field name="account_id"/>
+                                    <field name="name"/>
+                                    <field name="debit"/>
+                                    <field name="credit"/>
+                                    <field name="state"/>
+                                    <field name="reconcile_id"/>
+                                </tree>
                             </field>
                         </page>
                     </notebook>
                   </sheet>
-                    <footer>
-                        <field name="message_ids" widget="mail_thread"/>
-                    </footer>
+                  <footer>
+                       <field name="message_ids" widget="mail_thread"/>
+                  </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index e944e62e699..fcf1694dd4c 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -179,9 +179,9 @@
                           <field name="pre_line" invisible="1"/>
                           <field name="type" invisible="1"/>
                           <field name="currency_id" invisible="1" colspan="4"/>
-                        </group>
-                    </group>
-                    <notebook>
+                       </group>
+                   </group>
+                   <notebook>
                         <page string="Payment Information">
                             <field name="line_dr_ids" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}">
                                 <tree string="Supplier Invoices and Outstanding transactions" editable="bottom" colors="gray:amount==0">
@@ -239,9 +239,7 @@
                                         <field name="analytic_id"
                                                groups="analytic.group_analytic_accounting"/>
                                     </group>
-	                                
                                 </group>
-                                
                             </group>
                         </page>
                         <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
@@ -269,10 +267,10 @@
                             </field>
                         </page>
                     </notebook>
-                    </sheet>
-                    <footer>
-                        <field name="message_ids" widget="mail_thread"/>
-                    </footer>
+                </sheet>
+                <footer>
+                    <field name="message_ids" widget="mail_thread"/>
+                </footer>
                 </form>
             </field>
         </record>
@@ -445,7 +443,6 @@
                     <footer>
                         <field name="message_ids" widget="mail_thread"/>
                     </footer>
-
                 </form>
             </field>
         </record>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index aa132b5ee6d..962eb49d61d 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -170,10 +170,10 @@
                             </field>
                         </page>
                     </notebook>
-                    </sheet>
-                    <footer>
-                        <field name="message_ids" widget="mail_thread"/>
-                    </footer>
+                </sheet>
+                <footer>
+                    <field name="message_ids" widget="mail_thread"/>
+                </footer>
                 </form>
             </field>
         </record>