diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css
index cc8e0d5b37..b1e09245d2 100644
--- a/dashboard-ui/css/librarybrowser.css
+++ b/dashboard-ui/css/librarybrowser.css
@@ -677,10 +677,6 @@ a.itemTag:hover {
     text-align: center;
 }
 
-.timelineItemsContainer {
-    text-align: left;
-}
-
 @media all and (min-width: 1200px) {
 
     .scenePosterViewItem img {
diff --git a/dashboard-ui/edititemmetadata.html b/dashboard-ui/edititemmetadata.html
index 0cb30feecf..8f277bef61 100644
--- a/dashboard-ui/edititemmetadata.html
+++ b/dashboard-ui/edititemmetadata.html
@@ -36,6 +36,9 @@
                                 <label for="chkRecursive">Refresh child items</label>
                                 <input type="checkbox" id="chkRecursive" name="chkRecursive" data-mini="true" checked="checked" data-inline="true" />
                             </div>
+                            <div id="fldDelete" style="vertical-align: bottom;">
+                                <button id="btnDelete" type="button" data-icon="delete" data-mini="true" data-theme="a" data-inline="true">Delete</button>
+                            </div>
                             <div style="margin: .5em 0 1em;">
                                 <div class="fieldDescription">A refresh will cause internet metadata to be re-downloaded (if enabled, and dependent on metadata settings).</div>
                             </div>
diff --git a/dashboard-ui/library.html b/dashboard-ui/library.html
index ce912120e8..ae669b3b1e 100644
--- a/dashboard-ui/library.html
+++ b/dashboard-ui/library.html
@@ -53,10 +53,10 @@
                         <select id="selectCollectionType" name="selectCollectionType"></select>
                     </p>
 
-                    <p class="collectionTypeFieldDescription fieldDescription">
+                    <p class="collectionTypeFieldDescription">
                         Anything unlisted should be classified as general or mixed content.
                     </p>
-                    <p class="collectionTypeFieldDescription fieldDescription">
+                    <p class="collectionTypeFieldDescription">
                         * Requires the use of a plugin, e.g. GameBrowser or MB Photos.
                     </p>
 
diff --git a/dashboard-ui/scripts/extensions.js b/dashboard-ui/scripts/extensions.js
index f0ad426bc2..e62c4ad4df 100644
--- a/dashboard-ui/scripts/extensions.js
+++ b/dashboard-ui/scripts/extensions.js
@@ -9,15 +9,6 @@
     return true;
 }
 
-if (!window.WebSocket) {
-
-    alert("This browser does not support web sockets. For a better experience, try a newer browser such as Chrome (android, desktop), Firefox, IE10, Safari (iOS) or Opera.");
-}
-
-if (!IsStorageEnabled()) {
-    alert("This browser does not support local storage or is running in private mode. For a better experience, try a newer browser such as Chrome (android, desktop), Firefox, IE10, Safari (iOS) or Opera.");
-}
-
 // Array Remove - By John Resig (MIT Licensed)
 Array.prototype.remove = function (from, to) {
     var rest = this.slice((to || from) + 1 || this.length);
diff --git a/dashboard-ui/scripts/medialibrarypage.js b/dashboard-ui/scripts/medialibrarypage.js
index 1e797cf426..f86ffe445e 100644
--- a/dashboard-ui/scripts/medialibrarypage.js
+++ b/dashboard-ui/scripts/medialibrarypage.js
@@ -204,11 +204,13 @@
 
         if (showCollectionType) {
             $('#fldCollectionType', popup).show();
+            $('#selectCollectionType', popup).attr('required', 'required').selectmenu('refresh');
         } else {
             $('#fldCollectionType', popup).hide();
+            $('#selectCollectionType', popup).removeAttr('required').selectmenu('refresh');
         }
 
-        $('#selectCollectionType', popup).html(MediaLibraryPage.getCollectionTypeOptionsHtml()).selectmenu('refresh');
+        $('#selectCollectionType', popup).html(MediaLibraryPage.getCollectionTypeOptionsHtml()).val('').selectmenu('refresh');
 
         popup.on("popupafteropen", function () {
             $('#textEntryForm input:first', this).focus();
@@ -222,7 +224,15 @@
             if (callback) {
 
                 if (showCollectionType) {
-                    callback($('#txtValue', popup).val(), $('#selectCollectionType', popup).val());
+
+                    var collectionType = $('#selectCollectionType', popup).val();
+                    
+                    // The server expects an empty value for mixed
+                    if (collectionType == 'mixed') {
+                        collectionType = '';
+                    }
+
+                    callback($('#txtValue', popup).val(), collectionType);
                 } else {
                     callback($('#txtValue', popup).val());
                 }
@@ -246,19 +256,19 @@
 
         return [
 
-            { name: "General or mixed content", value: "" },
-            { name: "Adult videos", value: "adultvideos" },
+            { name: "", value: "" },
+            { name: "Movies", value: "movies" },
+            { name: "Music", value: "music" },
+            { name: "TV shows", value: "tvshows" },
             { name: "Books*", value: "books" },
             { name: "Box sets", value: "boxsets" },
             { name: "Games*", value: "games" },
             { name: "Home videos", value: "homevideos" },
-            { name: "Movies", value: "movies" },
-            { name: "Music", value: "music" },
             { name: "Music videos", value: "musicvideos" },
             { name: "Photos*", value: "photos" },
             { name: "Trailers", value: "trailers" },
-            { name: "TV shows", value: "tvshows" }
-
+            { name: "Adult videos", value: "adultvideos" },
+            { name: "General or mixed content", value: "mixed" }
         ];
 
     },
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 05b0483d76..4668857235 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -1113,10 +1113,18 @@ var Dashboard = {
 
         return parts.join(':');
     }
-
-
 };
 
+if (!window.WebSocket) {
+
+    alert("This browser does not support web sockets. For a better experience, try a newer browser such as Chrome (android, desktop), Firefox, IE10, Safari (iOS) or Opera.");
+}
+
+if (!IsStorageEnabled()) {
+    alert("This browser does not support local storage or is running in private mode. For a better experience, try a newer browser such as Chrome (android, desktop), Firefox, IE10, Safari (iOS) or Opera.");
+}
+
+
 var ApiClient = MediaBrowser.ApiClient.create("Dashboard", window.dashboardVersion);
 
 $(ApiClient).on("websocketmessage", Dashboard.onWebSocketMessageReceived);
diff --git a/dashboard-ui/thirdparty/html5slider.js b/dashboard-ui/thirdparty/html5slider.js
index f13475f393..0bce9a3b17 100644
--- a/dashboard-ui/thirdparty/html5slider.js
+++ b/dashboard-ui/thirdparty/html5slider.js
@@ -25,6 +25,10 @@ THE SOFTWARE.
 
 (function() {
 
+    if (navigator.userAgent.toLowerCase().indexOf('firefox') == -1) {
+        return;
+    }
+    
 // test for native support
 var test = document.createElement('input');
 try {
diff --git a/dashboard-ui/wizardlibrary.html b/dashboard-ui/wizardlibrary.html
index 39a0f314e1..f2d50f2203 100644
--- a/dashboard-ui/wizardlibrary.html
+++ b/dashboard-ui/wizardlibrary.html
@@ -43,10 +43,10 @@
                                 <select id="selectCollectionType" name="selectCollectionType"></select>
                             </p>
 
-                            <p class="collectionTypeFieldDescription fieldDescription">
+                            <p class="collectionTypeFieldDescription">
                                 Anything unlisted should be classified as general or mixed content.
                             </p>
-                            <p class="collectionTypeFieldDescription fieldDescription">
+                            <p class="collectionTypeFieldDescription">
                                 * Requires the use of a plugin, e.g. GameBrowser or MB Photos.
                             </p>