diff --git a/dashboard-ui/css/card.css b/dashboard-ui/css/card.css
index 1ebbb0c9eb..9305d1ebbe 100644
--- a/dashboard-ui/css/card.css
+++ b/dashboard-ui/css/card.css
@@ -51,6 +51,10 @@
     margin: 8px;
 }
 
+.mediumCardMargin .cardBox {
+    margin: 4px;
+}
+
 /*@media all and (max-width: 600px) {
 
     .cardBox {
diff --git a/dashboard-ui/livetvguide.html b/dashboard-ui/livetvguide.html
index 5c20c99ab7..a81187ca38 100644
--- a/dashboard-ui/livetvguide.html
+++ b/dashboard-ui/livetvguide.html
@@ -32,7 +32,7 @@
                 </div>
                 <div class="channelPaging"></div>
             </div>
-            <div class="guideRequiresUnlock readOnlyContent" style="margin:2em auto;text-align:center;display:none;">
+            <div class="guideRequiresUnlock readOnlyContent" style="margin:1em auto;text-align:center;display:none;padding:1em;">
                 <p class="unlockText"></p>
                 <button class="btn btnActionAccent btnUnlockGuide" data-role="none" type="button">
                     <span>
diff --git a/dashboard-ui/mypreferenceswebclient.html b/dashboard-ui/mypreferenceswebclient.html
index c89f135dd1..8233256baa 100644
--- a/dashboard-ui/mypreferenceswebclient.html
+++ b/dashboard-ui/mypreferenceswebclient.html
@@ -178,7 +178,8 @@
                                 <input type="checkbox" id="chkExternalVideoPlayer" />
                                 <label for="chkExternalVideoPlayer">${OptionEnableExternalVideoPlayers}</label>
                             </fieldset>
-                            <div style="padding: 0 2px;">${LabelExternalPlayersHelp}</div>
+                            <div style="padding: 0 2px;display:none;" class="labelGenericExternalPlayers">${LabelExternalPlayersHelp}</div>
+                            <div style="padding: 0 2px;display:none;" class="labelNativeExternalPlayers">${LabelNativeExternalPlayersHelp}</div>
                         </div>
                     </div>
                 </div>
diff --git a/dashboard-ui/scripts/librarylist.js b/dashboard-ui/scripts/librarylist.js
index 3fdefe3d60..30933ccd8c 100644
--- a/dashboard-ui/scripts/librarylist.js
+++ b/dashboard-ui/scripts/librarylist.js
@@ -784,12 +784,14 @@
             return;
         }
 
-        showItemsOverlay({
-            ids: [itemId],
-            context: context
-        });
+        if (AppSettings.enableItemPreviews()) {
+            showItemsOverlay({
+                ids: [itemId],
+                context: context
+            });
 
-        return false;
+            return false;
+        }
     }
 
     $.fn.createCardMenus = function (options) {
diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js
index 835c571088..e1e904eb8d 100644
--- a/dashboard-ui/scripts/mediaplayer-video.js
+++ b/dashboard-ui/scripts/mediaplayer-video.js
@@ -1109,7 +1109,7 @@
 
             // Can't autoplay in these browsers so we need to use the full controls
             if (requiresNativeControls) {
-                html += '<video class="itemVideo" id="itemVideo" preload="metadata" autoplay="autoplay" crossorigin="anonymous" controls="controls"' + posterCode + '>';
+                html += '<video class="itemVideo" id="itemVideo" preload="metadata" autoplay="autoplay" crossorigin="anonymous" controls="controls"' + posterCode + ' webkit-playsinline>';
             }
             else {
 
diff --git a/dashboard-ui/scripts/mypreferenceswebclient.js b/dashboard-ui/scripts/mypreferenceswebclient.js
index ffcd230ae1..76b6cf3c83 100644
--- a/dashboard-ui/scripts/mypreferenceswebclient.js
+++ b/dashboard-ui/scripts/mypreferenceswebclient.js
@@ -61,11 +61,7 @@
         return false;
     }
 
-    $(document).on('pageinit', "#webClientPreferencesPage", function () {
-
-        var page = this;
-
-    }).on('pagebeforeshow', "#webClientPreferencesPage", function () {
+    $(document).on('pageshowready', "#webClientPreferencesPage", function () {
 
         var page = this;
 
@@ -86,6 +82,14 @@
         } else {
             $('.homePageConfigurationSection', page).show();
         }
+
+        if (AppInfo.hasKnownExternalPlayerSupport) {
+            $('.labelNativeExternalPlayers', page).show();
+            $('.labelGenericExternalPlayers', page).hide();
+        } else {
+            $('.labelGenericExternalPlayers', page).show();
+            $('.labelNativeExternalPlayers', page).hide();
+        }
     });
 
     window.WebClientPreferencesPage = {
@@ -121,6 +125,14 @@
             }
 
             return store.getItem('externalplayers') == 'true';
+        },
+        enableItemPreviews: function (val) {
+
+            if (val != null) {
+                store.setItem('enableItemPreviews', val.toString());
+            }
+
+            return store.getItem('enableItemPreviews') != 'false';
         }
 
     };
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index cdc9639e45..8e4d276494 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -1386,7 +1386,7 @@ var Dashboard = {
             // The native app can handle a little bit more than safari
             if (Dashboard.isRunningInCordova()) {
 
-                quality -= 15;
+                quality -= 20;
 
                 if (isBackdrop) {
                     quality -= 20;
@@ -1549,12 +1549,13 @@ var AppInfo = {};
 
             if (isCordova) {
                 AppInfo.enableBottomTabs = true;
+                AppInfo.cardMargin = 'mediumCardMargin';
             } else {
                 AppInfo.enableDetailPageChapters = false;
                 AppInfo.enableDetailsMenuImages = false;
                 AppInfo.enableHeaderImages = false;
                 AppInfo.enableMovieHomeSuggestions = false;
-                AppInfo.enableLargeCardMargin = true;
+                AppInfo.cardMargin = 'largeCardMargin';
             }
         }
         else {
@@ -1577,6 +1578,7 @@ var AppInfo = {};
 
         if (isCordova) {
             AppInfo.enableAppLayouts = true;
+            AppInfo.hasKnownExternalPlayerSupport = true;
         }
         else {
             AppInfo.enableFooterNotifications = true;
@@ -1670,8 +1672,8 @@ var AppInfo = {};
             initFastClick();
         }
 
-        if (AppInfo.enableLargeCardMargin) {
-            $(document.body).addClass('largeCardMargin');
+        if (AppInfo.cardMargin) {
+            $(document.body).addClass(AppInfo.cardMargin);
         }
 
         if (!AppInfo.enableLatestChannelItems) {
diff --git a/dashboard-ui/thirdparty/cordova/registrationservices.js b/dashboard-ui/thirdparty/cordova/registrationservices.js
index 250c41e5b5..ff52699762 100644
--- a/dashboard-ui/thirdparty/cordova/registrationservices.js
+++ b/dashboard-ui/thirdparty/cordova/registrationservices.js
@@ -197,7 +197,7 @@
         $('.btnSignInSupporter', elem).on('click', function () {
 
             Dashboard.alert({
-                message: 'MessagePleaseSignInLocalNetwork',
+                message: Globalize.translate('MessagePleaseSignInLocalNetwork'),
                 callback: function () {
                     cancelInAppPurchase();
                     Dashboard.logout();
diff --git a/dashboard-ui/thirdparty/cordova/serverdiscovery.js b/dashboard-ui/thirdparty/cordova/serverdiscovery.js
index 4dcd4056a7..4f7581a71f 100644
--- a/dashboard-ui/thirdparty/cordova/serverdiscovery.js
+++ b/dashboard-ui/thirdparty/cordova/serverdiscovery.js
@@ -23,6 +23,15 @@
         return result;
     }
 
+    function closeSocket(socketId) {
+
+        try {
+            chrome.sockets.udp.close(socketId);
+        } catch (err) {
+
+        }
+    }
+
     function findServersInternal(timeoutMs) {
 
         var deferred = DeferredBuilder.Deferred();
@@ -54,7 +63,7 @@
 
                 if (socketId) {
                     chrome.sockets.udp.onReceive.removeListener(onReceive);
-                    chrome.sockets.udp.close(socketId);
+                    closeSocket(socketId);
                 }
 
             }, timeoutMs);
@@ -62,13 +71,13 @@
 
         function onReceive(info) {
 
-            console.log('ServerDiscovery message received');
+            try {
 
-            console.log(info);
+                console.log('ServerDiscovery message received');
 
-            if (info.socketId == socketId) {
+                console.log(info);
 
-                try {
+                if (info != null && info.socketId == socketId) {
                     var json = arrayBufferToString(info.data);
                     console.log('Server discovery json: ' + json);
                     var server = JSON.parse(json);
@@ -80,9 +89,10 @@
                     }
 
                     servers.push(server);
-                } catch (err) {
-                    console.log('Error receiving server info: ' + err);
                 }
+
+            } catch (err) {
+                console.log('Error receiving server info: ' + err);
             }
         }
 
@@ -105,24 +115,24 @@
 
             console.log('chrome.sockets.udp.bind');
 
-            chrome.sockets.udp.bind(createInfo.socketId, '0.0.0.0', 0, function (result) {
+            chrome.sockets.udp.bind(createInfo.socketId, '0.0.0.0', 0, function (bindResult) {
 
-                if (getResultCode(result) != 0) {
-                    console.log('bind fail: ' + result);
+                if (getResultCode(bindResult) != 0) {
+                    console.log('bind fail: ' + bindResult);
                     deferred.resolveWith(null, [servers]);
-                    chrome.sockets.udp.close(createInfo.socketId);
+                    closeSocket(createInfo.socketId);
                     return;
                 }
 
                 var data = stringToArrayBuffer('who is EmbyServer?');
 
                 console.log('chrome.sockets.udp.send');
-                chrome.sockets.udp.send(createInfo.socketId, data, '255.255.255.255', port, function (result) {
+                chrome.sockets.udp.send(createInfo.socketId, data, '255.255.255.255', port, function (sendResult) {
 
-                    if (getResultCode(result) != 0) {
-                        console.log('send fail: ' + result);
+                    if (getResultCode(sendResult) != 0) {
+                        console.log('send fail: ' + sendResult);
                         deferred.resolveWith(null, [servers]);
-                        chrome.sockets.udp.close(createInfo.socketId);
+                        closeSocket(createInfo.socketId);
 
                     } else {