diff --git a/sale_order.py b/sale_order.py
index 5417df2..4575b70 100644
--- a/sale_order.py
+++ b/sale_order.py
@@ -60,11 +60,6 @@ class SaleOrder (Workflow, ModelView, ModelSQL):
             ('draft', 'confirmed'),
         ))
 
-    @classmethod
-    @ModelView.button
-    def draft(cls, orders):
-        pass
-
     @classmethod
     @ModelView.button
     @Workflow.transition('confirmed')
diff --git a/sale_order.xml b/sale_order.xml
index 3eeb624..9fe61b5 100644
--- a/sale_order.xml
+++ b/sale_order.xml
@@ -39,20 +39,16 @@ this repository contains the full copyright notices and license terms. -->
       <field name="view" ref="sale_order_view_form"/>
       <field name="act_window" ref="act_sale_order"/>
     </record>
-  
-    <record model="ir.sequence.type" id="sequence_type_order">
-      <field name="name">Order</field>
-    </record>
-    <record model="ir.sequence" id="sequence_sale_order">
-      <field name="name">Sale Order Number Sequence</field>
-      <field name="sequence_type" ref="sequence_type_order"/>
-      <field name="prefix">SO</field>
-      <field name="padding">5</field>
-    </record>
+
     <record model="ir.model.button" id="confirm_order_draft">
 	    <field name="name">draft</field>
 	    <field name="string">Draft</field>
 	    <field name="model">sale.order</field>
+	  </record>
+    <record model="ir.model.button" id="confirm_order_button">
+	    <field name="name">confirm</field>
+	    <field name="string">Confirm</field>
+	    <field name="model">sale.order</field>
 	</record>
   <record model="ir.action.act_window.domain" id="act_order_form_domain_draft">
       <field name="name">Draft</field>
@@ -61,13 +57,8 @@ this repository contains the full copyright notices and license terms. -->
           eval="[('state', '=', 'draft')]"
           pyson="1"/>
       <field name="count" eval="True"/>
-      <field name="act_window" ref="act_order_form"/>
+      <field name="act_window" ref="act_sale_order"/>
   </record>
-    <record model="ir.model.button" id="confirm_order_button">
-	    <field name="name">confirm</field>
-	    <field name="string">Confirm</field>
-	    <field name="model">sale.order</field>
-	</record>
   <record model="ir.action.act_window.domain" id="act_order_form_domain_confirm">
       <field name="name">Confirm</field>
       <field name="sequence" eval="10"/>
@@ -75,13 +66,22 @@ this repository contains the full copyright notices and license terms. -->
           eval="[('state', '=', 'confirmed')]"
           pyson="1"/>
       <field name="count" eval="True"/>
-      <field name="act_window" ref="act_order_form"/>
+      <field name="act_window" ref="act_sale_order"/>
   </record>
-    <menuitem
+  <menuitem
       name="Order"
       action="act_sale_order"
       sequence="80"
       id="menu_order"
       icon="tryton-folder"/>
-   </data>
+  <record model="ir.sequence.type" id="sequence_type_order">
+    <field name="name">Order</field>
+  </record>
+  <record model="ir.sequence" id="sequence_sale_order">
+    <field name="name">Sale Order Number Sequence</field>
+    <field name="sequence_type" ref="sequence_type_order"/>
+    <field name="prefix">SO</field>
+    <field name="padding">5</field>
+  </record>
+  </data>
 </tryton>
diff --git a/view/order_form.xml b/view/order_form.xml
index ae6a24d..6f32923 100644
--- a/view/order_form.xml
+++ b/view/order_form.xml
@@ -19,7 +19,6 @@ this repository contains the full copyright notices and license terms. -->
   <label name="total_order"/>
   <field name="total_order"/>
   <group col="-1" colspan="3" id="buttons">
-    <button name="draft" string="Draft" icon="tryton-go-previous"/>
     <button name="confirm" string="Confirm" icon="tryton-forward"/>
   </group>
-</form>
\ No newline at end of file
+</form>