diff --git a/invoice.xml b/invoice.xml
index 5b54e1df65..58023997e6 100644
--- a/invoice.xml
+++ b/invoice.xml
@@ -36,16 +36,14 @@ this repository contains the full copyright notices and license terms. -->
                     <label name="reference"/>
                     <field name="reference"/>
                     <notebook colspan="6">
-                        <page string="Invoice" id="invoice">
+                        <page string="Invoice" id="invoice" col="6">
                             <label name="invoice_date"/>
                             <field name="invoice_date"/>
                             <label name="payment_term"/>
                             <field name="payment_term"/>
-                            <label name="account"/>
-                            <field name="account"/>
                             <label name="currency"/>
                             <field name="currency"/>
-                            <field name="lines" colspan="4">
+                            <field name="lines" colspan="6">
                                 <tree string="Lines" sequence="sequence" fill="1">
                                     <field name="type"/>
                                     <field name="product" select="1"/>
@@ -61,56 +59,58 @@ this repository contains the full copyright notices and license terms. -->
                                     <field name="currency_digits" tree_invisible="1"/>
                                 </tree>
                             </field>
-                            <group col="1" colspan="2" id="taxes">
-                                <field name="taxes">
-                                    <tree string="Taxes" sequence="sequence">
-                                        <field name="description"/>
-                                        <field name="base"/>
-                                        <field name="amount"/>
-                                        <field name="sequence" tree_invisible="1"/>
-                                        <field name="manual" tree_invisible="1"/>
-                                        <field name="base_code" tree_invisible="1"/>
-                                        <field name="base_sign" tree_invisible="1"/>
-                                        <field name="tax_code" tree_invisible="1"/>
-                                        <field name="tax_sign" tree_invisible="1"/>
-                                        <field name="account" tree_invisible="1"/>
-                                    </tree>
-                                </field>
-                            </group>
-                            <group col="2" colspan="2" id="amount_state_buttons">
-                                <label name="untaxed_amount"/>
-                                <field name="untaxed_amount"/>
-                                <label name="tax_amount"/>
-                                <field name="tax_amount"/>
-                                <label name="total_amount"/>
-                                <field name="total_amount"/>
-                                <group col="4" colspan="2" id="reconciled_state">
-                                    <label name="reconciled"/>
-                                    <field name="reconciled" xexpand="0"/>
-                                    <label name="state"/>
-                                    <field name="state"/>
+                            <group col="2" colspan="6" id="taxes_amount_state_buttons">
+                                <group col="1" colspan="1" id="taxes">
+                                    <field name="taxes">
+                                        <tree string="Taxes" sequence="sequence" fill="1">
+                                            <field name="description"/>
+                                            <field name="base"/>
+                                            <field name="amount"/>
+                                            <field name="sequence" tree_invisible="1"/>
+                                            <field name="manual" tree_invisible="1"/>
+                                            <field name="base_code" tree_invisible="1"/>
+                                            <field name="base_sign" tree_invisible="1"/>
+                                            <field name="tax_code" tree_invisible="1"/>
+                                            <field name="tax_sign" tree_invisible="1"/>
+                                            <field name="account" tree_invisible="1"/>
+                                        </tree>
+                                    </field>
                                 </group>
-                                <group col="5" colspan="2" id="buttons">
-                                    <button name="cancel" string="_Cancel"
-                                        states="{'invisible': '''state not in ('draft', 'proforma') ''', 'readonly': ''' %(account.group_account)d not in groups '''}"
-                                        icon="tryton-cancel"/>
-                                    <button name="button_draft" string="_Reset to Draft"
-                                        type="object"
-                                        states="{'invisible': '''state != 'cancel' '''}"
-                                        icon="tryton-clear"/>
-                                    <button name="draft" string="_Draft"
-                                        states="{'invisible': '''state != 'proforma' '''}"
-                                        icon="tryton-go-previous"/>
-                                    <button name="proforma" string="Pro For_ma"
-                                        states="{'invisible': '''state != 'draft' '''}"
-                                        icon="tryton-go-next"/>
-                                    <button name="open" string="_Open"
-                                        states="{'invisible': '''state not in ('draft', 'proforma') ''', 'readonly': ''' %(account.group_account)d not in groups '''}"
-                                        icon="tryton-ok"/>
-                                    <button name="%(wizard_pay_invoice)d" string="_Pay"
-                                        type="action"
-                                        states="{'invisible': '''state != 'open' ''', 'readonly': ''' %(account.group_account)d not in groups '''}"
-                                        icon="tryton-go-next"/>
+                                <group col="2" colspan="1" id="amount_state_buttons">
+                                    <label name="untaxed_amount"/>
+                                    <field name="untaxed_amount"/>
+                                    <label name="tax_amount"/>
+                                    <field name="tax_amount"/>
+                                    <label name="total_amount"/>
+                                    <field name="total_amount"/>
+                                    <group col="4" colspan="2" id="reconciled_state">
+                                        <label name="reconciled"/>
+                                        <field name="reconciled" xexpand="0"/>
+                                        <label name="state"/>
+                                        <field name="state"/>
+                                    </group>
+                                    <group col="5" colspan="2" id="buttons">
+                                        <button name="cancel" string="_Cancel"
+                                            states="{'invisible': '''state not in ('draft', 'proforma') ''', 'readonly': ''' %(account.group_account)d not in groups '''}"
+                                            icon="tryton-cancel"/>
+                                        <button name="button_draft" string="_Reset to Draft"
+                                            type="object"
+                                            states="{'invisible': '''state != 'cancel' '''}"
+                                            icon="tryton-clear"/>
+                                        <button name="draft" string="_Draft"
+                                            states="{'invisible': '''state != 'proforma' '''}"
+                                            icon="tryton-go-previous"/>
+                                        <button name="proforma" string="Pro For_ma"
+                                            states="{'invisible': '''state != 'draft' '''}"
+                                            icon="tryton-go-next"/>
+                                        <button name="open" string="_Open"
+                                            states="{'invisible': '''state not in ('draft', 'proforma') ''', 'readonly': ''' %(account.group_account)d not in groups '''}"
+                                            icon="tryton-ok"/>
+                                        <button name="%(wizard_pay_invoice)d" string="_Pay"
+                                            type="action"
+                                            states="{'invisible': '''state != 'open' ''', 'readonly': ''' %(account.group_account)d not in groups '''}"
+                                            icon="tryton-go-next"/>
+                                    </group>
                                 </group>
                             </group>
                         </page>
@@ -119,6 +119,8 @@ this repository contains the full copyright notices and license terms. -->
                             <field name="company"/>
                             <label name="move"/>
                             <field name="move"/>
+                            <label name="account"/>
+                            <field name="account"/>
                             <label name="invoice_report"/>
                             <field name="invoice_report"/>
                             <separator name="comment" colspan="4"/>