diff --git a/templates/CRM/AddressFormat/Page/Address.tpl b/templates/CRM/AddressFormat/Page/Address.tpl
index 9024693..c753090 100644
--- a/templates/CRM/AddressFormat/Page/Address.tpl
+++ b/templates/CRM/AddressFormat/Page/Address.tpl
@@ -5,6 +5,11 @@
       <p>{ts}CiviCRM lets you store multiple postal addFormatress formats, so you can set it to the preferred format of your country{/ts}</p>
     </div>
 
+    <div class="action-link">
+      {crmButton q="action=add&reset=1" id="newFAddressType"  icon="plus-circle"}{ts}Add Address Format{/ts}{/crmButton}
+      {crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="times"}{ts}Done{/ts}{/crmButton}
+    </div>
+
   <div class="crm-content-block crm-block">
     {if $rows}
       <div id="ltype">
@@ -21,7 +26,7 @@
               {foreach from=$rows item=row}
                 <tr id="address_formats-{$row.id}" class="crm-entity {cycle values="odd-row,even-row"} {$row.class}">
                   <td>{$row.name}</td>
-                  <td class="crm-editable" data-field="format" data-type="textarea">{$row.format}</td>
+                  <td class="crm-editable" data-field="format" data-type="textarea">{$row.format|nl2br}</td>
                   <td>{$row.action|replace:'xx':$row.id}</td>
                 </tr>
               {/foreach}