diff --git a/mail_as_letter/report/mail_as_letter_qweb.xml b/mail_as_letter/report/mail_as_letter_qweb.xml
index 0c0eda3a..0a58b8d9 100644
--- a/mail_as_letter/report/mail_as_letter_qweb.xml
+++ b/mail_as_letter/report/mail_as_letter_qweb.xml
@@ -17,12 +17,12 @@
         <div class="page">
           <div class="oe_structure"/>
             <t t-foreach="o.partner_ids" t-as="p">
-              <p>
+              <div class="col-xs-5 col-xs-offset-7">
                 <address t-field="o.partner_ids"
                          t-field-options='{"widget": "contact", 
                                            "fields": ["address", "name"],
                                            "no_marker": true}' />
-              </p>
+              </div>
             </t>
             <br/>
             <p>
diff --git a/mail_as_letter/wizards/mail_compose_message.xml b/mail_as_letter/wizards/mail_compose_message.xml
index e18cae8e..bfdab74f 100644
--- a/mail_as_letter/wizards/mail_compose_message.xml
+++ b/mail_as_letter/wizards/mail_compose_message.xml
@@ -10,13 +10,13 @@
         <field name="model">mail.compose.message</field>
         <field name="inherit_id" ref="mail.email_compose_message_wizard_form"/>
         <field name="arch" type="xml">
-            <button name="save_as_template">
+            <button name="send_mail_action" position="after">
                 <field name="partner_count" attrs="{'invisible': True}"/>
                 <button icon="fa-file-pdf-o"
                         type="object"
                         name="download_pdf"
-                        string="Print PDF"
-                        class="pull-right btn-default"
+                        string="Download Letter"
+                        class="btn-default"
                         help="Save as a PDF file"
                         attrs="{'invisible': [('partner_count', '!=', 1)]}"/>
             </button>