diff --git a/dashboard-ui/css/card.css b/dashboard-ui/css/card.css
index 73d6f2d78..e505e1414 100644
--- a/dashboard-ui/css/card.css
+++ b/dashboard-ui/css/card.css
@@ -416,10 +416,6 @@
 
 @media all and (min-width: 1920px) {
 
-    .squareCard {
-        width: 9.0909090909090909090909090909091%;
-    }
-
     .bannerCard {
         width: 25%;
     }
@@ -430,6 +426,14 @@
 }
 
 
+@media all and (min-width: 2300px) {
+
+    .squareCard {
+        width: 9.0909090909090909090909090909091%;
+    }
+}
+
+
 /** detailPage169 */
 .detailPage169Card .cardPadder {
     padding-bottom: 56.25%;
diff --git a/dashboard-ui/livetvnewrecording.html b/dashboard-ui/livetvnewrecording.html
index 72c5e8882..7d6b6a13c 100644
--- a/dashboard-ui/livetvnewrecording.html
+++ b/dashboard-ui/livetvnewrecording.html
@@ -81,8 +81,8 @@
                         <br />
                         <ul data-role="listview" class="ulForm">
                             <li>
-                                <label for="txtPrePaddingSeconds">${LabelPrePaddingMinutes}</label>
-                                <input type="number" id="txtPrePaddingSeconds" pattern="[0-9]*" required="required" min="0" step="1" />
+                                <label for="txtPrePaddingMinutes">${LabelPrePaddingMinutes}</label>
+                                <input type="number" id="txtPrePaddingMinutes" pattern="[0-9]*" required="required" min="0" step="1" />
                             </li>
                             <li>
                                 <input type="checkbox" data-mini="true" id="chkPrePaddingRequired" />
@@ -92,8 +92,8 @@
                                 <div style="height: .5em;"></div>
                             </li>
                             <li>
-                                <label for="txtPostPaddingSeconds">${LabelPostPaddingMinutes}</label>
-                                <input type="number" id="txtPostPaddingSeconds" pattern="[0-9]*" required="required" min="0" step="1" />
+                                <label for="txtPostPaddingMinutes">${LabelPostPaddingMinutes}</label>
+                                <input type="number" id="txtPostPaddingMinutes" pattern="[0-9]*" required="required" min="0" step="1" />
                             </li>
                             <li>
                                 <input type="checkbox" data-mini="true" id="chkPostPaddingRequired" />
diff --git a/dashboard-ui/livetvseriestimer.html b/dashboard-ui/livetvseriestimer.html
index 0992954fd..87f613883 100644
--- a/dashboard-ui/livetvseriestimer.html
+++ b/dashboard-ui/livetvseriestimer.html
@@ -78,8 +78,8 @@
                             <br />
                             <ul data-role="listview" class="ulForm">
                                 <li>
-                                    <label for="txtPrePaddingSeconds">${LabelPrePaddingMinutes}</label>
-                                    <input type="number" id="txtPrePaddingSeconds" pattern="[0-9]*" required="required" min="0" step="1" />
+                                    <label for="txtPrePaddingMinutes">${LabelPrePaddingMinutes}</label>
+                                    <input type="number" id="txtPrePaddingMinutes" pattern="[0-9]*" required="required" min="0" step="1" />
                                 </li>
                                 <li>
                                     <input type="checkbox" data-mini="true" id="chkPrePaddingRequired" />
@@ -89,8 +89,8 @@
                                     <div style="height: .5em;"></div>
                                 </li>
                                 <li>
-                                    <label for="txtPostPaddingSeconds">${LabelPostPaddingMinutes}</label>
-                                    <input type="number" id="txtPostPaddingSeconds" pattern="[0-9]*" required="required" min="0" step="1" />
+                                    <label for="txtPostPaddingMinutes">${LabelPostPaddingMinutes}</label>
+                                    <input type="number" id="txtPostPaddingMinutes" pattern="[0-9]*" required="required" min="0" step="1" />
                                 </li>
                                 <li>
                                     <input type="checkbox" data-mini="true" id="chkPostPaddingRequired" />
diff --git a/dashboard-ui/livetvtimer.html b/dashboard-ui/livetvtimer.html
index 4b6361353..593839643 100644
--- a/dashboard-ui/livetvtimer.html
+++ b/dashboard-ui/livetvtimer.html
@@ -45,8 +45,8 @@
                         <br />
                         <ul data-role="listview" class="ulForm">
                             <li>
-                                <label for="txtPrePaddingSeconds">${LabelPrePaddingMinutes}</label>
-                                <input type="number" id="txtPrePaddingSeconds" pattern="[0-9]*" required="required" min="0" step="1" />
+                                <label for="txtPrePaddingMinutes">${LabelPrePaddingMinutes}</label>
+                                <input type="number" id="txtPrePaddingMinutes" pattern="[0-9]*" required="required" min="0" step="1" />
                             </li>
                             <li>
                                 <input type="checkbox" data-mini="true" id="chkPrePaddingRequired" />
@@ -56,8 +56,8 @@
                                 <div style="height: .5em;"></div>
                             </li>
                             <li>
-                                <label for="txtPostPaddingSeconds">${LabelPostPaddingMinutes}</label>
-                                <input type="number" id="txtPostPaddingSeconds" pattern="[0-9]*" required="required" min="0" step="1" />
+                                <label for="txtPostPaddingMinutes">${LabelPostPaddingMinutes}</label>
+                                <input type="number" id="txtPostPaddingMinutes" pattern="[0-9]*" required="required" min="0" step="1" />
                             </li>
                             <li>
                                 <input type="checkbox" data-mini="true" id="chkPostPaddingRequired" />
diff --git a/dashboard-ui/movies.html b/dashboard-ui/movies.html
index 7ac539c54..f035945d2 100644
--- a/dashboard-ui/movies.html
+++ b/dashboard-ui/movies.html
@@ -52,6 +52,7 @@
                             <option value="Banner">${OptionBanner}</option>
                             <option value="List">${OptionList}</option>
                             <option value="Poster">${OptionPoster}</option>
+                            <option value="PosterCard">${OptionPosterCard}</option>
                             <option value="Thumb">${OptionThumb}</option>
                             <option value="ThumbCard">${OptionThumbCard}</option>
                             <option value="Timeline">${OptionTimeline}</option>
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index c3c877db4..ccfe72b8e 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -1213,10 +1213,6 @@
 
                 var defaultActionAttribute = options.defaultAction ? (' data-action="' + options.defaultAction + '"') : '';
 
-                if (options.defaultAction) {
-                    cssClass += ' itemWithAction';
-                }
-
                 html += '<div' + dataAttributes + ' class="' + cssClass + '">';
 
                 var style = "";
@@ -1250,7 +1246,14 @@
                 html += '<div class="cardScalable">';
 
                 html += '<div class="cardPadder"></div>';
-                html += '<a class="cardContent" href="' + href + '"' + defaultActionAttribute + '>';
+
+                var anchorCssClass = "cardContent";
+
+                if (options.defaultAction) {
+                    anchorCssClass += ' itemWithAction';
+                }
+
+                html += '<a class="' + anchorCssClass + '" href="' + href + '"' + defaultActionAttribute + '>';
                 html += '<div class="' + imageCssClass + '" style="' + style + '"' + dataSrc + '></div>';
 
                 html += '<div class="cardOverlayTarget"></div>';
diff --git a/dashboard-ui/scripts/librarylist.js b/dashboard-ui/scripts/librarylist.js
index 8c059946a..5a215ac94 100644
--- a/dashboard-ui/scripts/librarylist.js
+++ b/dashboard-ui/scripts/librarylist.js
@@ -557,6 +557,8 @@
 
         function onShowTimerExpired(elem) {
 
+            elem = $('a', elem)[0];
+
             if ($(elem).hasClass('hasContextMenu')) {
                 return;
             }
@@ -566,8 +568,14 @@
             }
 
             var innerElem = $('.cardOverlayTarget', elem);
-            var id = elem.getAttribute('data-itemid');
-            var commands = elem.getAttribute('data-commands').split(',');
+
+            var dataElement = elem;
+            while (!dataElement.getAttribute('data-itemid')) {
+                dataElement = dataElement.parentNode;
+            }
+
+            var id = dataElement.getAttribute('data-itemid');
+            var commands = dataElement.getAttribute('data-commands').split(',');
 
             var promise1 = ApiClient.getItem(Dashboard.getCurrentUserId(), id);
             var promise2 = Dashboard.getCurrentUser();
@@ -767,11 +775,18 @@
         PlaylistManager.showPanel(selection);
     }
 
-    function onItemWithActionClick() {
+    function onItemWithActionClick(e) {
 
         var elem = this;
+
         var action = elem.getAttribute('data-action');
-        var elemWithAttributes = elem.getAttribute('data-itemid') ? elem : elem.parentNode;
+        var elemWithAttributes = elem;
+
+        if (action) {
+            while (!elemWithAttributes.getAttribute('data-itemid')) {
+                elemWithAttributes = elemWithAttributes.parentNode;
+            }
+        }
 
         var index;
         var itemsContainer;
diff --git a/dashboard-ui/scripts/livetvnewrecording.js b/dashboard-ui/scripts/livetvnewrecording.js
index e6050bd33..2afc3872f 100644
--- a/dashboard-ui/scripts/livetvnewrecording.js
+++ b/dashboard-ui/scripts/livetvnewrecording.js
@@ -25,8 +25,8 @@
         $('#chkAllChannels', page).checked(defaultTimer.RecordAnyChannel).checkboxradio('refresh');
         $('#chkAnyTime', page).checked(defaultTimer.RecordAnyTime).checkboxradio('refresh');
 
-        $('#txtPrePaddingSeconds', page).val(defaultTimer.PrePaddingSeconds / 60);
-        $('#txtPostPaddingSeconds', page).val(defaultTimer.PostPaddingSeconds / 60);
+        $('#txtPrePaddingMinutes', page).val(defaultTimer.PrePaddingSeconds / 60);
+        $('#txtPostPaddingMinutes', page).val(defaultTimer.PostPaddingSeconds / 60);
         $('#chkPrePaddingRequired', page).checked(defaultTimer.IsPrePaddingRequired).checkboxradio('refresh');
         $('#chkPostPaddingRequired', page).checked(defaultTimer.IsPostPaddingRequired).checkboxradio('refresh');
 
@@ -110,8 +110,8 @@
 
         ApiClient.getNewLiveTvTimerDefaults({ programId: programId }).done(function (item) {
 
-            item.PrePaddingSeconds = $('#txtPrePaddingSeconds', form).val() * 60;
-            item.PostPaddingSeconds = $('#txtPostPaddingSeconds', form).val() * 60;
+            item.PrePaddingSeconds = $('#txtPrePaddingMinutes', form).val() * 60;
+            item.PostPaddingSeconds = $('#txtPostPaddingMinutes', form).val() * 60;
             item.IsPrePaddingRequired = $('#chkPrePaddingRequired', form).checked();
             item.IsPostPaddingRequired = $('#chkPostPaddingRequired', form).checked();
 
diff --git a/dashboard-ui/scripts/livetvseriestimer.js b/dashboard-ui/scripts/livetvseriestimer.js
index d72eef7f4..7502e7758 100644
--- a/dashboard-ui/scripts/livetvseriestimer.js
+++ b/dashboard-ui/scripts/livetvseriestimer.js
@@ -27,8 +27,8 @@
 
         $('.itemName', page).html(item.Name);
 
-        $('#txtPrePaddingSeconds', page).val(item.PrePaddingSeconds / 60);
-        $('#txtPostPaddingSeconds', page).val(item.PostPaddingSeconds / 60);
+        $('#txtPrePaddingMinutes', page).val(item.PrePaddingSeconds / 60);
+        $('#txtPostPaddingMinutes', page).val(item.PostPaddingSeconds / 60);
         $('#chkPrePaddingRequired', page).checked(item.IsPrePaddingRequired).checkboxradio('refresh');
         $('#chkPostPaddingRequired', page).checked(item.IsPostPaddingRequired).checkboxradio('refresh');
 
@@ -107,8 +107,8 @@
 
         ApiClient.getLiveTvSeriesTimer(currentItem.Id).done(function (item) {
 
-            item.PrePaddingSeconds = $('#txtPrePaddingSeconds', form).val() * 60;
-            item.PostPaddingSeconds = $('#txtPostPaddingSeconds', form).val() * 60;
+            item.PrePaddingSeconds = $('#txtPrePaddingMinutes', form).val() * 60;
+            item.PostPaddingSeconds = $('#txtPostPaddingMinutes', form).val() * 60;
             item.IsPrePaddingRequired = $('#chkPrePaddingRequired', form).checked();
             item.IsPostPaddingRequired = $('#chkPostPaddingRequired', form).checked();
 
diff --git a/dashboard-ui/scripts/livetvtimer.js b/dashboard-ui/scripts/livetvtimer.js
index 349ee34eb..d10106f22 100644
--- a/dashboard-ui/scripts/livetvtimer.js
+++ b/dashboard-ui/scripts/livetvtimer.js
@@ -57,8 +57,8 @@
 
         LiveTvHelpers.renderMiscProgramInfo($('.miscTvProgramInfo', page), programInfo);
 
-        $('#txtPrePaddingSeconds', page).val(item.PrePaddingSeconds / 60);
-        $('#txtPostPaddingSeconds', page).val(item.PostPaddingSeconds / 60);
+        $('#txtPrePaddingMinutes', page).val(item.PrePaddingSeconds / 60);
+        $('#txtPostPaddingMinutes', page).val(item.PostPaddingSeconds / 60);
         $('#chkPrePaddingRequired', page).checked(item.IsPrePaddingRequired).checkboxradio('refresh');
         $('#chkPostPaddingRequired', page).checked(item.IsPostPaddingRequired).checkboxradio('refresh');
 
@@ -75,8 +75,8 @@
 
         ApiClient.getLiveTvTimer(currentItem.Id).done(function (item) {
 
-            item.PrePaddingSeconds = $('#txtPrePaddingSeconds', form).val() * 60;
-            item.PostPaddingSeconds = $('#txtPostPaddingSeconds', form).val() * 60;
+            item.PrePaddingSeconds = $('#txtPrePaddingMinutes', form).val() * 60;
+            item.PostPaddingSeconds = $('#txtPostPaddingMinutes', form).val() * 60;
             item.IsPrePaddingRequired = $('#chkPrePaddingRequired', form).checked();
             item.IsPostPaddingRequired = $('#chkPostPaddingRequired', form).checked();
 
diff --git a/dashboard-ui/scripts/moviegenres.js b/dashboard-ui/scripts/moviegenres.js
index 84b9eb572..afdb99531 100644
--- a/dashboard-ui/scripts/moviegenres.js
+++ b/dashboard-ui/scripts/moviegenres.js
@@ -79,7 +79,7 @@
 
             html += pagingHtml;
 
-            $('#items', page).html(html).trigger('create');
+            $('#items', page).html(html).trigger('create').createCardMenus();
 
             $('.btnNextPage', page).on('click', function () {
                 query.StartIndex += query.Limit;
diff --git a/dashboard-ui/scripts/movies.js b/dashboard-ui/scripts/movies.js
index 2bfcec348..2b3606823 100644
--- a/dashboard-ui/scripts/movies.js
+++ b/dashboard-ui/scripts/movies.js
@@ -102,6 +102,18 @@
                 });
                 $('.itemsContainer', page).removeClass('timelineItemsContainer');
             }
+            else if (view == "PosterCard") {
+                html = LibraryBrowser.getPosterViewHtml({
+                    items: result.Items,
+                    shape: "portrait",
+                    context: 'movies',
+                    showTitle: true,
+                    showYear: true,
+                    lazy: true,
+                    cardLayout: true
+                });
+                $('.itemsContainer', page).removeClass('timelineItemsContainer');
+            }
             else if (view == "Timeline") {
                 html = LibraryBrowser.getPosterViewHtml({
                     items: result.Items,
diff --git a/dashboard-ui/scripts/tvshows.js b/dashboard-ui/scripts/tvshows.js
index 6c1ab8742..0d1c4096b 100644
--- a/dashboard-ui/scripts/tvshows.js
+++ b/dashboard-ui/scripts/tvshows.js
@@ -87,6 +87,18 @@
                 });
                 $('.itemsContainer', page).removeClass('timelineItemsContainer');
             }
+            else if (view == "PosterCard") {
+                html = LibraryBrowser.getPosterViewHtml({
+                    items: result.Items,
+                    shape: "portrait",
+                    context: 'tv',
+                    showTitle: true,
+                    showYear: true,
+                    lazy: true,
+                    cardLayout: true
+                });
+                $('.itemsContainer', page).removeClass('timelineItemsContainer');
+            }
             else {
 
                 // Poster
diff --git a/dashboard-ui/thirdparty/apiclient/connectionmanager.js b/dashboard-ui/thirdparty/apiclient/connectionmanager.js
index 1c1c7c865..c7bdee4f4 100644
--- a/dashboard-ui/thirdparty/apiclient/connectionmanager.js
+++ b/dashboard-ui/thirdparty/apiclient/connectionmanager.js
@@ -248,6 +248,13 @@
 
         function addAuthenticationInfoFromConnect(server, connectionMode, credentials) {
 
+            if (!server.ExchangeToken) {
+                throw new Error("server.ExchangeToken cannot be null");
+            }
+            if (!credentials.ConnectUserId) {
+                throw new Error("credentials.ConnectUserId cannot be null");
+            }
+
             var url = connectionMode == MediaBrowser.ConnectionMode.Local ? server.LocalAddress : server.RemoteAddress;
 
             url += "/mediabrowser/Connect/Exchange?format=json&ConnectUserId=" + credentials.ConnectUserId;
@@ -641,7 +648,7 @@
 
             function onEnsureConnectUserDone() {
 
-                if (credentials.ConnectUserId && credentials.ConnectAccessToken) {
+                if (credentials.ConnectUserId && credentials.ConnectAccessToken && server.ExchangeToken) {
 
                     addAuthenticationInfoFromConnect(server, connectionMode, credentials).always(onExchangeTokenDone);
 
diff --git a/dashboard-ui/tvshows.html b/dashboard-ui/tvshows.html
index 90e5cf02f..b1fdcd9ed 100644
--- a/dashboard-ui/tvshows.html
+++ b/dashboard-ui/tvshows.html
@@ -42,7 +42,8 @@
                             <option value="Banner">${OptionBanner}</option>
                             <option value="List">${OptionList}</option>
                             <option value="Poster">${OptionPoster}</option>
-                            <option value="Thumb">${OptionThumb}</option>
+                            <option value="PosterCard">${OptionPosterCard}</option>
+                           <option value="Thumb">${OptionThumb}</option>
                             <option value="ThumbCard">${OptionThumbCard}</option>
                         </select>
                     </div>