diff --git a/languages/mailtrain.pot b/languages/mailtrain.pot
index ccd9bb0e..4f142a5c 100644
--- a/languages/mailtrain.pot
+++ b/languages/mailtrain.pot
@@ -8,7 +8,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2017-03-10 12:12+0000\n"
+"POT-Creation-Date: 2017-03-11 12:28+0000\n"
 
 #: views/archive/layout.hbs:1
 #: views/layout.hbs:1
@@ -168,7 +168,7 @@ msgid "Bounce time"
 msgstr ""
 
 #: views/campaigns/campaigns.hbs:3
-#: views/campaigns/create-triggered.hbs:24
+#: views/campaigns/create-triggered.hbs:25
 #: views/campaigns/create.hbs:3
 #: views/campaigns/create.hbs:4
 #: views/campaigns/create.hbs:27
@@ -355,7 +355,7 @@ msgstr ""
 
 #: views/campaigns/create-rss.hbs:11
 #: views/campaigns/create-triggered.hbs:10
-#: views/campaigns/create-triggered.hbs:13
+#: views/campaigns/create-triggered.hbs:14
 #: views/campaigns/create.hbs:10
 #: views/campaigns/create.hbs:14
 #: views/campaigns/edit-rss.hbs:13
@@ -410,7 +410,7 @@ msgid ""
 msgstr ""
 
 #: views/campaigns/create-rss.hbs:15
-#: views/campaigns/create-triggered.hbs:17
+#: views/campaigns/create-triggered.hbs:18
 #: views/campaigns/create.hbs:18
 #: views/campaigns/edit-rss.hbs:18
 #: views/campaigns/edit-triggered.hbs:16
@@ -420,16 +420,17 @@ msgid "Email \"from name\""
 msgstr ""
 
 #: views/campaigns/create-rss.hbs:16
-#: views/campaigns/create-triggered.hbs:18
+#: views/campaigns/create-triggered.hbs:19
 #: views/campaigns/create.hbs:19
 #: views/campaigns/edit-rss.hbs:19
+#: views/campaigns/edit-triggered.hbs:17
 #: views/campaigns/edit.hbs:18
 #: views/settings.hbs:23
 msgid "This is the name your emails will come from"
 msgstr ""
 
 #: views/campaigns/create-rss.hbs:17
-#: views/campaigns/create-triggered.hbs:19
+#: views/campaigns/create-triggered.hbs:20
 #: views/campaigns/create.hbs:20
 #: views/campaigns/edit-rss.hbs:20
 #: views/campaigns/edit-triggered.hbs:18
@@ -439,7 +440,7 @@ msgid "Email \"from\" address"
 msgstr ""
 
 #: views/campaigns/create-rss.hbs:18
-#: views/campaigns/create-triggered.hbs:20
+#: views/campaigns/create-triggered.hbs:21
 #: views/campaigns/edit-rss.hbs:21
 #: views/campaigns/edit-triggered.hbs:19
 #: views/settings.hbs:25
@@ -447,7 +448,7 @@ msgid "This is the address people will send replies to"
 msgstr ""
 
 #: views/campaigns/create-rss.hbs:19
-#: views/campaigns/create-triggered.hbs:23
+#: views/campaigns/create-triggered.hbs:24
 #: views/campaigns/create.hbs:26
 #: views/campaigns/edit-rss.hbs:22
 #: views/campaigns/edit-triggered.hbs:22
@@ -470,17 +471,22 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#: views/campaigns/create-triggered.hbs:14
+#: views/campaigns/create-triggered.hbs:13
+#: views/campaigns/create.hbs:13
+msgid "Select a template:"
+msgstr ""
+
+#: views/campaigns/create-triggered.hbs:15
 #: views/campaigns/create.hbs:15
 msgid "Selecting a template creates a campaign specific copy from it"
 msgstr ""
 
-#: views/campaigns/create-triggered.hbs:15
+#: views/campaigns/create-triggered.hbs:16
 #: views/campaigns/create.hbs:16
 msgid "Or alternatively use an URL as the message content source:"
 msgstr ""
 
-#: views/campaigns/create-triggered.hbs:16
+#: views/campaigns/create-triggered.hbs:17
 #: views/campaigns/create.hbs:17
 #: views/campaigns/edit-triggered.hbs:25
 #: views/campaigns/edit.hbs:28
@@ -489,7 +495,7 @@ msgid ""
 "POST body. Use this if you want to generate the HTML message yourself"
 msgstr ""
 
-#: views/campaigns/create-triggered.hbs:21
+#: views/campaigns/create-triggered.hbs:22
 #: views/campaigns/create.hbs:24
 #: views/campaigns/edit-triggered.hbs:20
 #: views/campaigns/edit.hbs:23
@@ -497,7 +503,7 @@ msgstr ""
 msgid "Email \"subject line\""
 msgstr ""
 
-#: views/campaigns/create-triggered.hbs:22
+#: views/campaigns/create-triggered.hbs:23
 #: views/campaigns/create.hbs:25
 #: views/campaigns/edit-triggered.hbs:21
 #: views/campaigns/edit.hbs:24
@@ -505,10 +511,6 @@ msgstr ""
 msgid "Keep it relevant and non-spammy"
 msgstr ""
 
-#: views/campaigns/create.hbs:13
-msgid "Select a template:"
-msgstr ""
-
 #: views/campaigns/create.hbs:21
 #: views/campaigns/edit.hbs:20
 msgid ""
@@ -590,10 +592,6 @@ msgstr ""
 msgid "General"
 msgstr ""
 
-#: views/campaigns/edit-triggered.hbs:17
-msgid "his is the name your emails will come from"
-msgstr ""
-
 #: views/campaigns/edit-triggered.hbs:23
 #: views/campaigns/edit.hbs:26
 msgid "Template Settings"
@@ -2230,7 +2228,7 @@ msgstr ""
 
 #: views/settings.hbs:62
 msgid ""
-"he number of messages to send through a single connection before the "
+"The number of messages to send through a single connection before the "
 "connection is closed and reopened (defaults to 100)"
 msgstr ""
 
@@ -2732,11 +2730,12 @@ msgid "New Password"
 msgstr ""
 
 #: views/users/account.hbs:16
+#: views/users/reset.hbs:8
 msgid "Confirm Password"
 msgstr ""
 
 #: views/users/account.hbs:17
-#: views/users/reset.hbs:8
+#: views/users/reset.hbs:9
 msgid "Confirm New Password"
 msgstr ""
 
@@ -3461,7 +3460,7 @@ msgstr ""
 #: routes/archive.js:31
 #: routes/archive.js:43
 #: routes/archive.js:55
-#: app.js:217
+#: app.js:220
 msgid "Not Found"
 msgstr ""
 
diff --git a/views/campaigns/create-triggered.hbs b/views/campaigns/create-triggered.hbs
index ab4a7088..8fdafbe5 100644
--- a/views/campaigns/create-triggered.hbs
+++ b/views/campaigns/create-triggered.hbs
@@ -56,7 +56,7 @@
         <div class="col-sm-10">
 
             <p class="form-control-static">
-                Select a template:
+                {{#translate}}Select a template:{{/translate}}
             </p>
             <div>
                 <select class="form-control" id="template" name="template">
diff --git a/views/campaigns/edit-triggered.hbs b/views/campaigns/edit-triggered.hbs
index 5a7924b0..cdefe5fc 100644
--- a/views/campaigns/edit-triggered.hbs
+++ b/views/campaigns/edit-triggered.hbs
@@ -84,7 +84,7 @@
                     <div class="form-group">
                         <label for="from" class="col-sm-2 control-label">{{#translate}}Email "from name"{{/translate}}</label>
                         <div class="col-sm-10">
-                            <input type="text" class="form-control" name="from" id="from" value="{{from}}" placeholder="T{{#translate}}his is the name your emails will come from{{/translate}}" required>
+                            <input type="text" class="form-control" name="from" id="from" value="{{from}}" placeholder="{{#translate}}This is the name your emails will come from{{/translate}}" required>
                         </div>
                     </div>
                     <div class="form-group">
diff --git a/views/mosaico/editor.hbs b/views/mosaico/editor.hbs
index 1c882836..12c9f4f9 100644
--- a/views/mosaico/editor.hbs
+++ b/views/mosaico/editor.hbs
@@ -34,16 +34,6 @@
         padding: 5px 10px 5px 0;
         height: 2em;
     }
-    @media screen and (max-width: 1175px) {
-        a.ui-button[title='Download template'] {
-            display: none !important;
-        }
-    }
-    @media screen and (max-width: 1020px) {
-        #btnMergeReference {
-            display: none !important;
-        }
-    }
 </style>
 
 
diff --git a/views/settings.hbs b/views/settings.hbs
index 6f1a5574..1f4d345e 100644
--- a/views/settings.hbs
+++ b/views/settings.hbs
@@ -119,6 +119,7 @@
             <label for="default-homepage" class="col-sm-2 control-label">{{#translate}}Default homepage (URL){{/translate}}</label>
             <div class="col-sm-10">
                 <input type="url" class="form-control" name="default-homepage" id="default-homepage" value="{{defaultHomepage}}" placeholder="{{#translate}}URL to redirect the subscribed users to, eg. http://example.com/{{/translate}}">
+                <span class="help-block">&nbsp;</span>
             </div>
         </div>
 
@@ -287,7 +288,7 @@
 
         <div class="form-group">
             <label for="smtp-max-connections" class="col-sm-2 control-label">{{#translate}}Max connections{{/translate}}</label>
-            <div class="col-sm-6">
+            <div class="col-sm-10">
                 <input type="number" class="form-control" name="smtp-max-connections" id="smtp-max-connections" placeholder="{{#translate}}The count of max connections, eg. 10{{/translate}}" value="{{smtpMaxConnections}}">
                 <span class="help-block">{{#translate}}The count of maximum simultaneous connections to make against the SMTP server (defaults to 5). This limit is per sending process.{{/translate}}</span>
             </div>
@@ -295,15 +296,15 @@
 
         <div class="form-group">
             <label for="smtp-max-messages" class="col-sm-2 control-label">{{#translate}}Max messages{{/translate}}</label>
-            <div class="col-sm-6">
+            <div class="col-sm-10">
                 <input type="number" class="form-control" name="smtp-max-messages" id="smtp-max-messages" placeholder="{{#translate}}The count of max messages, eg. 100{{/translate}}" value="{{smtpMaxMessages}}">
-                <span class="help-block">T{{#translate}}he number of messages to send through a single connection before the connection is closed and reopened (defaults to 100){{/translate}}</span>
+                <span class="help-block">{{#translate}}The number of messages to send through a single connection before the connection is closed and reopened (defaults to 100){{/translate}}</span>
             </div>
         </div>
 
         <div class="form-group">
             <label for="smtp-throttling" class="col-sm-2 control-label">{{#translate}}Throttling{{/translate}}</label>
-            <div class="col-sm-6">
+            <div class="col-sm-10">
                 <input type="number" class="form-control" name="smtp-throttling" id="smtp-throttling" placeholder="{{#translate}}Messages per hour eg. 1000{{/translate}}" value="{{smtpThrottling}}">
                 <span class="help-block">{{#translate}}Maximum number of messages to send in an hour. Leave empty or zero for no throttling. If your provider uses a different speed limit (messages/minute or messages/second) then convert this limit into messages/hour (1m/s => 3600m/h). This limit is per sending process.{{/translate}}</span>
             </div>