diff --git a/addons/website_sale_quote/sale_quote_demo.xml b/addons/website_sale_quote/sale_quote_demo.xml
index 1095779cac8..da4c62511bc 100644
--- a/addons/website_sale_quote/sale_quote_demo.xml
+++ b/addons/website_sale_quote/sale_quote_demo.xml
@@ -291,7 +291,7 @@
 
         <record id="website_sale_order_line_1" model="sale.order.line">
             <field name="order_id" ref="website_sale_order_1"/>
-            <field name="name">Gold Partner</field>
+            <field name="name">Fuctional Training</field>
             <field name="product_id" ref="product_product_quote_1"/>
             <field name="product_uom_qty">1</field>
             <field name="product_uos_qty">1</field>
@@ -336,7 +336,7 @@
 
         <record id="website_sale_order_line_2" model="sale.order.line">
             <field name="order_id" ref="website_sale_order_1"/>
-            <field name="name">Functional Training</field>
+            <field name="name">Technical Training</field>
             <field name="product_id" ref="product_product_quote_2"/>
             <field name="product_uom_qty">1</field>
             <field name="product_uos_qty">1</field>
diff --git a/addons/website_sale_quote/sale_quote_view.xml b/addons/website_sale_quote/sale_quote_view.xml
index 11ab98d2339..4d522f45fec 100644
--- a/addons/website_sale_quote/sale_quote_view.xml
+++ b/addons/website_sale_quote/sale_quote_view.xml
@@ -6,6 +6,18 @@
             <field name="model">sale.order</field>
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
+                <xpath expr="//button[@name='action_quotation_send']" position="replace">
+                    <button name="action_quotation_send" string="Send by Email" type="object" class="oe_highlight" groups="base.group_user" attrs="{'invisible': ['|',('is_template', '=', True),('state','!=','draft')]}"/>
+                </xpath>
+                <xpath expr="//button[@string='Print'][@states='draft']" position="replace">
+                    <button name="print_quotation" string="Print" type="object" class="oe_highlight" groups="base.group_user" attrs="{'invisible': ['|',('is_template', '=', True),('state','!=','draft')]}"/>
+                </xpath>
+                <xpath expr="//button[@string='Confirm Sale'][@states='draft']" position="replace">
+                    <button name="action_button_confirm" string="Confirm Sale" type="object" groups="base.group_user" attrs="{'invisible': ['|',('is_template', '=', True),('state','!=','draft')]}"/>
+                </xpath>
+                <xpath expr="//button[@string='Cancel Quotation']" position="replace">
+                    <button name="cancel" string="Cancel Quotation" groups="base.group_user" attrs="{'invisible': ['|',('is_template', '=', True),('state','not in',('draft','sent'))]}"/>
+                </xpath>
                 <xpath expr="//header" position="after">
                     <div class="oe_form_box_info oe_text_center" attrs="{'invisible': ['|',('quote_url', '=', False),('template_id','=',False)]}">
                         <field name="quote_url" widget="url"/>
@@ -13,14 +25,13 @@
                 </xpath>
                 <xpath expr="//field[@name='client_order_ref']" position="after">
                     <field name="is_template"/>
-                    <field name="template_id" domain ="[('is_template','=',True)]" attrs="{'invisible': [('is_template', '=', True  )]}" on_change="onchange_template_id(template_id)"/>
+                    <field name="template_id" domain ="[('is_template','=',True)]" attrs="{'invisible': [('is_template', '=', True)]}" on_change="onchange_template_id(template_id)"/>
                 </xpath>
                 <xpath expr="//notebook" position="inside">
                     <page string="Introduction">
                         <field name="website_description"/>
                     </page>
                 </xpath>
-
             </field>
         </record>
     </data>