diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml
index 3d0774f1f..f5ca71492 100644
--- a/.idea/jsLibraryMappings.xml
+++ b/.idea/jsLibraryMappings.xml
@@ -2,5 +2,6 @@
 <project version="4">
   <component name="JavaScriptLibraryMappings">
     <file url="file://$PROJECT_DIR$" libraries="{Sonarr node_modules}" />
+    <includedPredefinedLibrary name="ECMAScript 6" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/UI/Activity/Queue/QueueLayout.js b/src/UI/Activity/Queue/QueueLayout.js
index 585c27766..462c6a568 100644
--- a/src/UI/Activity/Queue/QueueLayout.js
+++ b/src/UI/Activity/Queue/QueueLayout.js
@@ -56,7 +56,7 @@ module.exports = Marionette.Layout.extend({
         },
         {
             name      : 'timeleft',
-            label     : 'Timeleft',
+            label     : 'Time Left',
             cell      : TimeleftCell,
             cellValue : 'this'
         },
diff --git a/src/UI/Calendar/calendar.less b/src/UI/Calendar/calendar.less
index 8d6eb947a..d836c6720 100644
--- a/src/UI/Calendar/calendar.less
+++ b/src/UI/Calendar/calendar.less
@@ -216,7 +216,7 @@
     width     : 500px;
 
     @media (max-width: @screen-xs-min) {
-      width : 400px;
+      width : 100%;
     }
   }
 
diff --git a/src/UI/Settings/UI/UiViewTemplate.hbs b/src/UI/Settings/UI/UiViewTemplate.hbs
index 2a572ba6c..5a3d46d27 100644
--- a/src/UI/Settings/UI/UiViewTemplate.hbs
+++ b/src/UI/Settings/UI/UiViewTemplate.hbs
@@ -22,10 +22,10 @@
 
             <div class="col-sm-4 col-sm-pull-1">
                 <select name="calendarWeekColumnHeader" class="form-control">
-                    <option value="ddd M/D">Tue 3/25</option>
-                    <option value="ddd MM/DD">Tue 03/25</option>
-                    <option value="ddd D/M">Tue 25/3</option>
-                    <option value="ddd DD/MM">Tue 25/03</option>
+                    <option value="ddd M/D">Tue 3/5</option>
+                    <option value="ddd MM/DD">Tue 03/05</option>
+                    <option value="ddd D/M">Tue 5/3</option>
+                    <option value="ddd DD/MM">Tue 05/03</option>
                 </select>
             </div>
         </div>
@@ -40,10 +40,10 @@
             <div class="col-sm-4">
                 <select name="shortDateFormat" class="form-control">
                     <option value="MMM D YYYY">Mar 5 2014</option>
-                    <option value="DD MMM YYYY">5 Mar 2014</option>
+                    <option value="DD MMM YYYY">05 Mar 2014</option>
                     <option value="MM/D/YYYY">03/5/2014</option>
                     <option value="MM/DD/YYYY">03/05/2014</option>
-                    <option value="DD/MM/YYYY">25/03/2014</option>
+                    <option value="DD/MM/YYYY">05/03/2014</option>
                     <option value="YYYY-MM-DD">2014-03-05</option>
                 </select>
             </div>
@@ -54,8 +54,8 @@
 
             <div class="col-sm-4">
                 <select name="longDateFormat" class="form-control">
-                    <option value="dddd, MMMM D YYYY">Tuesday, March 25, 2014</option>
-                    <option value="dddd, D MMMM YYYY">Tuesday, 25 March, 2014</option>
+                    <option value="dddd, MMMM D YYYY">Tuesday, March 5, 2014</option>
+                    <option value="dddd, D MMMM YYYY">Tuesday, 5 March, 2014</option>
                 </select>
             </div>
         </div>