diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 78cdea764f3..9dcd0957145 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -120,9 +120,9 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state == 'draft';black:state in ('proforma','proforma2','open');gray:state == 'cancel'" string="Invoice">
+                    <field name="partner_id" groups="base.group_user"/>
                     <field name="date_invoice"/>
                     <field name="number"/>
-                    <field name="partner_id" groups="base.group_user"/>
                     <field name="reference" invisible="1"/>
                     <field name="name" invisible="1"/>
                     <field name="journal_id" invisible="1"/>
@@ -306,27 +306,18 @@
                         <label string="Invoice " attrs="{'invisible': [('state','in',('draft','proforma','proforma2'))]}"/>
                         <field name="number" readonly="1" class="oe_inline"/>
                     </h1>
-                    <label string="Concerns" for="name" class="oe_edit_only"/>
-                    <h2>
-                        <field name="name" placeholder="Project XYZ"/>
-                    </h2>
                     <field name="type" invisible="1"/>
                     <group>
                         <group>
-
                             <field string="Customer" name="partner_id"
                                 on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)"
-                                groups="base.group_user" context="{'search_default_customer': 1}"
-                                domain="[('customer', '=', True)]"/>
+                                groups="base.group_user" context="{'search_default_customer':1, 'show_address': 1}"
+                                options='{"always_reload": true}'/>
                             <field name="fiscal_position" widget="selection" />
-                            <field name="payment_term" widget="selection"/>
-
                         </group>
                         <group>
 
                             <field name="date_invoice"/>
-                            <field name="period_id" domain="[('state', '=', 'draft')]"
-                                groups="account.group_account_user" widget="selection"/>
                             <field name="journal_id" groups="account.group_account_user"
                                 on_change="onchange_journal_id(journal_id, context)" widget="selection"/>
 
@@ -336,58 +327,70 @@
                             <label for="currency_id"/>
                             <div>
                                 <field name="currency_id" class="oe_inline"/>
+                                <!-- note fp: I don't think we need this feature ?
                                 <button name="%(action_account_change_currency)d" type="action"
                                   icon="terp-stock_effects-object-colorize"
                                   attrs="{'invisible':[('state','!=','draft')]}"
-                                  groups="account.group_account_user"/>
+                                  groups="account.group_account_user"/> -->
                             </div>
                         </group>
                     </group>
                     <field name="sent" invisible="1"/>
 
                     <notebook colspan="4">
-                        <page string="Invoice">
+                        <page string="Invoice Lines">
                             <field colspan="4" name="invoice_line" nolabel="1" widget="one2many_list" context="{'type': type}"/>
-                            <group>
+                            <group class="oe_subtotal_footer oe_right">
+                                <field name="amount_untaxed"/>
                                 <div>
-                                    <field name="tax_line" nolabel="1">
-                                        <tree editable="bottom" string="Taxes">
-                                            <field name="name"/>
-                                            <field name="account_id" groups="account.group_account_user"/>
-                                            <field name="base" on_change="base_change(base,parent.currency_id,parent.company_id,parent.date_invoice)" readonly="1"/>
-                                            <field name="amount" on_change="amount_change(amount,parent.currency_id,parent.company_id,parent.date_invoice)"/>
-                                            <field invisible="True" name="base_amount"/>
-                                            <field invisible="True" name="tax_amount"/>
-                                            <field name="factor_base" invisible="True"/>
-                                            <field name="factor_tax" invisible="True"/>
-                                        </tree>
-                                    </field>
-                                    <button name="button_reset_taxes" states="draft,proforma2" string="Compute Taxes"
-                                        type="object" groups="account.group_account_user" icon="terp-stock_format-scientific"
-                                        help="This action will erase taxes"/>
+                                    <label for="amount_tax"/>
+                                    <button name="button_reset_taxes" states="draft,proforma2"
+                                        string="(update)" class="oe_link oe_edit_only"
+                                        type="object" help="Recompute taxes and total"/>
                                 </div>
-                                <group class="oe_subtotal_footer">
-                                    <field name="amount_untaxed"/>
-                                    <field name="amount_tax"/>
-                                    <field name="amount_total" class="oe_subtotal_footer_separator"/>
-
-                                    <field name="residual" style="margin-top: 10px" groups="account.group_account_user"/>
-                                    <field name="reconciled" invisible="1"/>
-                                </group>
+                                <field name="amount_tax" nolabel="1"/>
+                                <field name="amount_total" class="oe_subtotal_footer_separator"/>
+                                <field name="residual" groups="account.group_account_user"/>
+                                <field name="reconciled" invisible="1"/>
                             </group>
+                            <group>
+                                    <field name="payment_term" class="oe_inline"/>
+                            </group>
+                            <div class="oe_clear">
+                                <label for="comment"/>
+                            </div>
+                            <field name="comment" class="oe_inline" placeholder="Additional notes..."/>
                         </page>
                         <page string="Other Info">
                             <group col="4">
-                                <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
-                                <newline/>
-                                <field name="date_due"/>
-                                <field name="user_id" groups="base.group_user"/>
-                                <newline/>
-                                <field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank_id"/>
-                                <field name="origin" placeholder="SO0032" groups="base.group_user"/>
-                                <field name="move_id" groups="account.group_account_user"/>
+                                <group>
+                                    <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
+                                    <field name="user_id" groups="base.group_user"/>
+                                    <field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank_id"/>
+                                    <field name="period_id" domain="[('state', '=', 'draft')]"
+                                        groups="account.group_account_manager"
+                                        string="Accounting Period"
+                                        placeholder="force period"/>
+                                    <field name="date_due"/>
+                                </group>
+                                <group>
+                                    <field name="origin" groups="base.group_user"/>
+                                    <field name="name" string="Customer Reference"/>
+                                    <field name="move_id" groups="account.group_account_user"/>
+                                </group>
                             </group>
-                            <field name="comment" placeholder="Add an additional information in the invoice..."/>
+                            <field name="tax_line">
+                                <tree editable="bottom" string="Taxes">
+                                    <field name="name"/>
+                                    <field name="account_id" groups="account.group_account_user"/>
+                                    <field name="base" on_change="base_change(base,parent.currency_id,parent.company_id,parent.date_invoice)" readonly="1"/>
+                                    <field name="amount" on_change="amount_change(amount,parent.currency_id,parent.company_id,parent.date_invoice)"/>
+                                    <field invisible="True" name="base_amount"/>
+                                    <field invisible="True" name="tax_amount"/>
+                                    <field name="factor_base" invisible="True"/>
+                                    <field name="factor_tax" invisible="True"/>
+                                </tree>
+                            </field>
                         </page>
                         <page string="Payments" groups="base.group_user">
                             <field name="payment_ids">
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 334c377b151..26d655a0e07 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -190,7 +190,7 @@
                                 <form string="Sales Order Lines" version="7.0">
                                     <header>
                                         <button name="%(action_view_sale_order_line_make_invoice)d" states="confirmed" string="Invoice" type="action" icon="terp-document-new"/>
-				        <field name="invoiced" invisible="1"/>
+                        <field name="invoiced" invisible="1"/>
                                         <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
                                     </header>
                                     <group>
@@ -237,14 +237,14 @@
                                             <field name="property_ids" widget="many2many_tags"/>
                                         </group>
                                     </group>
-				                    <label for="name"/>
+                                    <label for="name"/>
                                     <field name="name"/>
-				                    <div groups="base.group_no_one">
-				                        <label for="invoice_lines"/>
-				                        <field name="invoice_lines"/>
-				                        <label for="move_ids"/>
-				                        <field name="move_ids" widget="many2many"/>
-				                    </div>
+                                    <div groups="base.group_no_one">
+                                        <label for="invoice_lines"/>
+                                        <field name="invoice_lines"/>
+                                        <label for="move_ids"/>
+                                        <field name="move_ids" widget="many2many"/>
+                                    </div>
                                 </form>
                                 <tree string="Sales Order Lines">
                                     <field name="sequence"/>
@@ -266,9 +266,7 @@
                             <div class="oe_clear">
                                 <label for="note"/>
                             </div>
-                            <div>
-                                <field name="note" class="oe_inline"/>
-                            </div>
+                            <field name="note" class="oe_inline"/>
                         </page>
                         <page string="Other Information" groups="base.group_user">
                             <group>
diff --git a/addons/sale_margin/sale_margin_view.xml b/addons/sale_margin/sale_margin_view.xml
index c45cd228dec..4696eec6eb2 100644
--- a/addons/sale_margin/sale_margin_view.xml
+++ b/addons/sale_margin/sale_margin_view.xml
@@ -38,29 +38,5 @@
         </field>
     </record>
 
-    <record model="ir.ui.view" id="sale_margin_sale_order_tree">
-        <field name="name">sale.order.margin.view.tree</field>
-        <field name="type">tree</field>
-        <field name="model">sale.order</field>
-        <field name="inherit_id" ref="sale.view_order_tree"/>
-        <field name="arch" type="xml">
-            <field name="state" position="after">
-                <field name="margin" groups="base.group_user"/>
-            </field>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="sale_margin_sale_order_line_tree">
-        <field name="name">sale.order.margin.line.view.tree</field>
-        <field name="type">tree</field>
-        <field name="model">sale.order.line</field>
-        <field name="inherit_id" ref="sale.view_order_line_tree"/>
-        <field name="arch" type="xml">
-            <field name="price_subtotal" position="after">
-                <field name="margin" groups="base.group_user"/>
-            </field>
-        </field>
-    </record>
-
 </data>
 </openerp>