diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index 71856dcf703..751b4027941 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -100,8 +100,18 @@
             <field name="model">payment.order</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Payment order">
-                    <group col="6" colspan="4">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="open" states="draft" string="Confirm Payments"  icon="gtk-apply"/>
+                    <button name="set_done" states="open" string="Make Payments" type="object" icon="gtk-execute"/>
+                    <button name="set_to_draft" states="cancel" string="Set to draft" type="object" icon="gtk-convert"/>
+                    <button name="cancel" states="draft,open" string="Cancel" icon="gtk-cancel"/>
+                <div class="oe_right">
+                    <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
+                </div>
+                </div>
+                <sheet string="Payment order" layout="auto">
+                    <group col="6" colspan="4" class="oe_form_header">
                       <field name="reference"/>
                       <field name="mode" widget='selection'/>
                       <field name="user_id"/>
@@ -162,13 +172,7 @@
                     </field>
                     <field name="date_created"/>
                     <field name="date_done"/>
-                    <field name="state" readonly="1" select="1"/>
-                    <group col="4" colspan="2">
-                         <button name="cancel" states="draft,open" string="Cancel" icon="gtk-cancel"/>
-                         <button name="open" states="draft" string="Confirm Payments"  icon="gtk-apply"/>
-                         <button name="set_done" states="open" string="Make Payments" type="object" icon="gtk-execute"/>
-                         <button name="set_to_draft" states="cancel" string="Set to draft" type="object" icon="gtk-convert"/>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>