diff --git a/www/admin/app-admin.less b/www/admin/app-admin.less
index 4e75ff7a9..9dad7812d 100644
--- a/www/admin/app-admin.less
+++ b/www/admin/app-admin.less
@@ -37,12 +37,12 @@
         }
     }
 
-    .cp-admin-setlimit-form, .cp-admin-broadcast-form {
-        label {
+    .cp-sidebarlayout-element {
+        label:not(> label) {
             font-weight: normal !important;
         }
         input {
-            max-width: 400px;
+            max-width: 25rem;
         }
         nav {
             display: flex;
diff --git a/www/common/notifications.js b/www/common/notifications.js
index 45ad6d976..414d7e5cd 100644
--- a/www/common/notifications.js
+++ b/www/common/notifications.js
@@ -498,6 +498,7 @@ define([
         if (!toShow) { return defaultDismiss(common, data)(); }
 
         var slice = toShow.length > 200;
+        var unsafe = toShow;
         toShow = Util.fixHTML(toShow);
 
         content.getFormatText = function () {
@@ -510,7 +511,7 @@ define([
             content.handler = function () {
                 var content = h('div', [
                     h('h4', Messages.broadcast_newCustom),
-                    h('div.cp-admin-message', toShow)
+                    h('div.cp-admin-message', unsafe) // Use unsafe string, hyperscript is safe
                 ]);
                 UI.alert(content);
             };
diff --git a/www/common/outer/x2t.js b/www/common/outer/x2t.js
index 326c1a026..55ceb869c 100644
--- a/www/common/outer/x2t.js
+++ b/www/common/outer/x2t.js
@@ -130,7 +130,6 @@ define([
             var ext = s.pop() || 'bin';
             var name = s.join('');
             var replacement = '';
-            console.error(name);
             var sanitized = name
                 .replace(illegalRe, replacement)
                 .replace(controlRe, replacement)
diff --git a/www/lib/calendar/date-picker.js b/www/lib/calendar/date-picker.js
index 887384a6b..e0d96b112 100644
--- a/www/lib/calendar/date-picker.js
+++ b/www/lib/calendar/date-picker.js
@@ -30,17 +30,22 @@ define([
             enableTime: true,
             time_24hr: is24h,
             dateFormat: dateFormat,
-            minDate: start.date
+            minDate: start.date,
+            onChange: function () {
+                    duration = parseDate(e.value) - parseDate(s.value);
+            }
         });
         endPickr.setDate(end.date);
 
         var s = $(start.input)[0];
+        var duration = end.date - start.date;
         var startPickr = Flatpickr(s, {
             enableTime: true,
             time_24hr: is24h,
             dateFormat: dateFormat,
             onChange: function () {
                 endPickr.set('minDate', parseDate(s.value));
+                endPickr.setDate(parseDate(s.value).getTime() + duration);
             }
         });
         startPickr.setDate(start.date);