diff --git a/dashboard-ui/bower_components/iron-flex-layout/.bower.json b/dashboard-ui/bower_components/iron-flex-layout/.bower.json
index 6533803466..90b7b9e929 100644
--- a/dashboard-ui/bower_components/iron-flex-layout/.bower.json
+++ b/dashboard-ui/bower_components/iron-flex-layout/.bower.json
@@ -23,14 +23,14 @@
     "paper-styles": "polymerelements/paper-styles#^1.0.0",
     "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
   },
-  "homepage": "https://github.com/PolymerElements/iron-flex-layout",
+  "homepage": "https://github.com/polymerelements/iron-flex-layout",
   "_release": "1.0.3",
   "_resolution": {
     "type": "version",
     "tag": "v1.0.3",
     "commit": "e6c2cfec18354973ac03e70dcd8afcc3c72d09b9"
   },
-  "_source": "git://github.com/PolymerElements/iron-flex-layout.git",
+  "_source": "git://github.com/polymerelements/iron-flex-layout.git",
   "_target": "^1.0.0",
-  "_originalSource": "PolymerElements/iron-flex-layout"
+  "_originalSource": "polymerelements/iron-flex-layout"
 }
\ No newline at end of file
diff --git a/dashboard-ui/bower_components/iron-overlay-behavior/.bower.json b/dashboard-ui/bower_components/iron-overlay-behavior/.bower.json
index 1d4238574e..4c2d96b1f1 100644
--- a/dashboard-ui/bower_components/iron-overlay-behavior/.bower.json
+++ b/dashboard-ui/bower_components/iron-overlay-behavior/.bower.json
@@ -34,14 +34,14 @@
     "web-component-tester": "*",
     "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
   },
-  "homepage": "https://github.com/polymerelements/iron-overlay-behavior",
+  "homepage": "https://github.com/PolymerElements/iron-overlay-behavior",
   "_release": "1.0.6",
   "_resolution": {
     "type": "version",
     "tag": "v1.0.6",
     "commit": "9c77f077f4181b6f03cc986d0f3c224094edbc2d"
   },
-  "_source": "git://github.com/polymerelements/iron-overlay-behavior.git",
+  "_source": "git://github.com/PolymerElements/iron-overlay-behavior.git",
   "_target": "^1.0.0",
-  "_originalSource": "polymerelements/iron-overlay-behavior"
+  "_originalSource": "PolymerElements/iron-overlay-behavior"
 }
\ No newline at end of file
diff --git a/dashboard-ui/bower_components/paper-behaviors/.bower.json b/dashboard-ui/bower_components/paper-behaviors/.bower.json
index 26486f6c6d..321be71437 100644
--- a/dashboard-ui/bower_components/paper-behaviors/.bower.json
+++ b/dashboard-ui/bower_components/paper-behaviors/.bower.json
@@ -42,7 +42,7 @@
     "tag": "v1.0.3",
     "commit": "90b54de14264c19693601b9fc16af6b68a9d48e4"
   },
-  "_source": "git://github.com/PolymerElements/paper-behaviors.git",
+  "_source": "git://github.com/polymerelements/paper-behaviors.git",
   "_target": "^1.0.0",
-  "_originalSource": "PolymerElements/paper-behaviors"
+  "_originalSource": "polymerelements/paper-behaviors"
 }
\ No newline at end of file
diff --git a/dashboard-ui/css/card.css b/dashboard-ui/css/card.css
index 40a741430d..85d8dc5561 100644
--- a/dashboard-ui/css/card.css
+++ b/dashboard-ui/css/card.css
@@ -67,7 +67,7 @@
 }
 
 .homeTopViews .cardImage {
-    border-radius: 6px;
+    border-radius: 5px;
 }
 
 .cardOverlayPlayButton {
@@ -322,10 +322,10 @@
         position: absolute;
         left: 0;
         right: 0;
-        width: 64px;
-        height: 64px;
+        width: 50%;
+        height:  50%;
         margin: auto;
-        top: 25%;
+        top: 22%;
     }
 
 .bannerCard {
diff --git a/dashboard-ui/metadataadvanced.html b/dashboard-ui/metadataadvanced.html
index f832f2a7cf..ed9ff773e4 100644
--- a/dashboard-ui/metadataadvanced.html
+++ b/dashboard-ui/metadataadvanced.html
@@ -168,6 +168,24 @@
                         </div>
                     </div>
 
+                    <div data-role="collapsible">
+                        <h2>${HeaderVideos}</h2>
+                        <div>
+                            <div>
+                                <br />
+                                <paper-checkbox class="chkEnableVideoFrameAnalysis">${OptionEnableVideoFrameAnalysis}</paper-checkbox>
+                                <div class="fieldDescription paperCheckboxFieldDescription">${OptionEnableVideoFrameAnalysisHelp}</div>
+                            </div>
+                            <div>
+                                <br />
+                                <paper-input type="number" step="10" min="0" class="txtVideoFrameAnalysisLimit" label="${LabelVideoFrameAnalysisLimit}">
+                                    <div suffix>MB</div>
+                                </paper-input>
+                            </div>
+                            <br />
+                        </div>
+                    </div>
+
                     <br /><br />
                     <ul data-role="listview" class="ulForm">
                         <li>
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 359a944d04..a1c572ef31 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -186,7 +186,6 @@
         },
 
         enableFullPaperTabs: function () {
-
             return AppInfo.isNativeApp;
         },
 
@@ -306,8 +305,7 @@
                 return;
             }
 
-            $(document).one('pageshowready', '.page', function () {
-
+            var afterNavigate = function () {
                 if (getWindowUrl().toLowerCase().indexOf(url.toLowerCase()) != -1) {
 
                     var pages = this.querySelector('neon-animated-pages');
@@ -329,9 +327,15 @@
                         tabs.noSlide = noSlide;
                     }
                 }
-            });
+            };
 
-            Dashboard.navigate(url);
+            if (getWindowUrl().toLowerCase().indexOf(url.toLowerCase()) != -1) {
+
+                afterNavigate.call($($.mobile.activePage)[0]);
+            } else {
+                $(document).one('pageshowready', '.page', afterNavigate);
+                Dashboard.navigate(url);
+            }
         },
 
         canShare: function (item, user) {
diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js
index e834de3136..91e350923c 100644
--- a/dashboard-ui/scripts/librarymenu.js
+++ b/dashboard-ui/scripts/librarymenu.js
@@ -389,6 +389,7 @@
 
                     view.ImageTags = {};
                     view.icon = 'live-tv';
+                    view.onclick = "LibraryBrowser.showTab('livetv.html', 0);";
 
                     var guideView = $.extend({}, view);
                     guideView.Name = Globalize.translate('ButtonGuide');
diff --git a/dashboard-ui/scripts/metadataadvanced.js b/dashboard-ui/scripts/metadataadvanced.js
index bd93757050..3b375dcc7d 100644
--- a/dashboard-ui/scripts/metadataadvanced.js
+++ b/dashboard-ui/scripts/metadataadvanced.js
@@ -14,6 +14,8 @@
         $('#chkPeopleOthers', page).checked(config.PeopleMetadataOptions.DownloadOtherPeopleMetadata).checkboxradio("refresh");
         $('#chkPeopleGuestStars', page).checked(config.PeopleMetadataOptions.DownloadGuestStarMetadata).checkboxradio("refresh");
 
+        $('.chkEnableVideoFrameAnalysis', page).checked(config.EnableVideoFrameAnalysis);
+        $('.txtVideoFrameAnalysisLimit', page).val((config.VideoFrameAnalysisLimitBytes / 1000000) || '');
 
         Dashboard.hideLoadingMsg();
     }
diff --git a/dashboard-ui/scripts/sections.js b/dashboard-ui/scripts/sections.js
index e5d136de9c..1fd44061b3 100644
--- a/dashboard-ui/scripts/sections.js
+++ b/dashboard-ui/scripts/sections.js
@@ -20,6 +20,7 @@
 
                     view.ImageTags = {};
                     view.icon = 'live-tv';
+                    view.onclick = "LibraryBrowser.showTab('livetv.html', 0);return false;";
 
                     var guideView = $.extend({}, view);
                     guideView.Name = Globalize.translate('ButtonGuide');
diff --git a/dashboard-ui/strings/html/server.json b/dashboard-ui/strings/html/server.json
index cb97347d7d..bbeb344f4f 100644
--- a/dashboard-ui/strings/html/server.json
+++ b/dashboard-ui/strings/html/server.json
@@ -1535,5 +1535,9 @@
     "OptionSendRecordingsToAutoOrganize": "Enable Auto-Organize for new recordings",
     "OptionSendRecordingsToAutoOrganizeHelp": "New recordings will be sent to the Auto-Organize feature and imported into your media library.",
     "HeaderDefaultPadding": "Default Padding",
-    "HeaderSubtitles": "Subtitles"
+    "HeaderSubtitles": "Subtitles",
+    "HeaderVideos": "Videos",
+    "OptionEnableVideoFrameAnalysis": "Enable frame by frame video analysis",
+    "OptionEnableVideoFrameAnalysisHelp": "Extract detailed information about videos that can be used to make transcoding as efficient as possible. This will cause library scans to take longer.",
+    "chkEnableVideoFrameAnalysis": "Limit frame by frame analysis to videos less than:"
 }
diff --git a/dashboard-ui/thirdparty/emby-icons.html b/dashboard-ui/thirdparty/emby-icons.html
index f3cfd68e8a..99339b51ac 100644
--- a/dashboard-ui/thirdparty/emby-icons.html
+++ b/dashboard-ui/thirdparty/emby-icons.html
@@ -130,6 +130,7 @@ See [iron-iconset](#iron-iconset) and [iron-iconset-svg](#iron-iconset-svg) for
             <g id="sort-by-alpha"><path d="M14.94 4.66h-4.72l2.36-2.36zm-4.69 14.71h4.66l-2.33 2.33zM6.1 6.27L1.6 17.73h1.84l.92-2.45h5.11l.92 2.45h1.84L7.74 6.27H6.1zm-1.13 7.37l1.94-5.18 1.94 5.18H4.97zm10.76 2.5h6.12v1.59h-8.53v-1.29l5.92-8.56h-5.88v-1.6h8.3v1.26l-5.93 8.6z" /></g>
             <g id="filter-list"><path d="M10 18h4v-2h-4v2zM3 6v2h18V6H3zm3 7h12v-2H6v2z" /></g>
             <g id="error"><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 15h-2v-2h2v2zm0-4h-2V7h2v6z" /></g>
+            <g id="wifi"><path d="M1 9l2 2c4.97-4.97 13.03-4.97 18 0l2-2C16.93 2.93 7.08 2.93 1 9zm8 8l3 3 3-3c-1.65-1.66-4.34-1.66-6 0zm-4-4l2 2c2.76-2.76 7.24-2.76 10 0l2-2C15.14 9.14 8.87 9.14 5 13z" /></g>
         </defs>
     </svg>
 </iron-iconset-svg>
diff --git a/dashboard-ui/vulcanize-out.html b/dashboard-ui/vulcanize-out.html
index 40bd203ba3..eea8d141e4 100644
--- a/dashboard-ui/vulcanize-out.html
+++ b/dashboard-ui/vulcanize-out.html
@@ -19142,6 +19142,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
             <g id="sort-by-alpha"><path d="M14.94 4.66h-4.72l2.36-2.36zm-4.69 14.71h4.66l-2.33 2.33zM6.1 6.27L1.6 17.73h1.84l.92-2.45h5.11l.92 2.45h1.84L7.74 6.27H6.1zm-1.13 7.37l1.94-5.18 1.94 5.18H4.97zm10.76 2.5h6.12v1.59h-8.53v-1.29l5.92-8.56h-5.88v-1.6h8.3v1.26l-5.93 8.6z"></path></g>
             <g id="filter-list"><path d="M10 18h4v-2h-4v2zM3 6v2h18V6H3zm3 7h12v-2H6v2z"></path></g>
             <g id="error"><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 15h-2v-2h2v2zm0-4h-2V7h2v6z"></path></g>
+            <g id="wifi"><path d="M1 9l2 2c4.97-4.97 13.03-4.97 18 0l2-2C16.93 2.93 7.08 2.93 1 9zm8 8l3 3 3-3c-1.65-1.66-4.34-1.66-6 0zm-4-4l2 2c2.76-2.76 7.24-2.76 10 0l2-2C15.14 9.14 8.87 9.14 5 13z"></path></g>
         </defs>
     </svg>
 </iron-iconset-svg>