diff --git a/dashboard-ui/bower_components/paper-ripple/paper-ripple.html b/dashboard-ui/bower_components/paper-ripple/paper-ripple.html
index 08d3da1ac0..76f71c8998 100644
--- a/dashboard-ui/bower_components/paper-ripple/paper-ripple.html
+++ b/dashboard-ui/bower_components/paper-ripple/paper-ripple.html
@@ -585,9 +585,10 @@ Apply `circle` class to make the rippling effect within a circle.
         }
       },
 
-      get shouldKeepAnimating () {
-        for (var index = 0; index < this.ripples.length; ++index) {
-          if (!this.ripples[index].isAnimationComplete) {
+      get shouldKeepAnimating() {
+        var ripples = this.ripples || [];
+        for (var index = 0; index < ripples.length; ++index) {
+          if (!ripples[index].isAnimationComplete) {
             return true;
           }
         }
@@ -625,9 +626,11 @@ Apply `circle` class to make the rippling effect within a circle.
           return;
         }
 
-        this.ripples.forEach(function(ripple) {
-          ripple.upAction(event);
-        });
+        if (this.ripples) {
+            this.ripples.forEach(function (ripple) {
+                ripple.upAction(event);
+            });
+        }
 
         this.animate();
       },
@@ -643,7 +646,10 @@ Apply `circle` class to make the rippling effect within a circle.
 
         Polymer.dom(this.$.waves).appendChild(ripple.waveContainer);
         this.$.background.style.backgroundColor = ripple.color;
-        this.ripples.push(ripple);
+
+        if (this.ripples) {
+            this.ripples.push(ripple);
+        }
 
         this._setAnimating(true);
 
@@ -672,8 +678,9 @@ Apply `circle` class to make the rippling effect within a circle.
 
         this._animating = true;
 
-        for (index = 0; index < this.ripples.length; ++index) {
-          ripple = this.ripples[index];
+        var ripples = this.ripples || [];
+        for (index = 0; index < ripples.length; ++index) {
+            ripple = ripples[index];
 
           ripple.draw();
 
@@ -684,7 +691,7 @@ Apply `circle` class to make the rippling effect within a circle.
           }
         }
 
-        if (!this.shouldKeepAnimating && this.ripples.length === 0) {
+        if (!this.shouldKeepAnimating && ripples.length === 0) {
           this.onAnimationComplete();
         } else {
           window.requestAnimationFrame(this._boundAnimate);
diff --git a/dashboard-ui/css/livetv.css b/dashboard-ui/css/livetv.css
index 06fa8c3fff..21b5080949 100644
--- a/dashboard-ui/css/livetv.css
+++ b/dashboard-ui/css/livetv.css
@@ -328,7 +328,7 @@
 
 @media (max-width: 600px) {
 
-    .guideChannelImage {
+    .guideChannelInfoWithImage {
         display: none;
     }
 
diff --git a/dashboard-ui/livetvguideprovider-scd.html b/dashboard-ui/livetvguideprovider-scd.html
index f2c83e6670..54465d3c04 100644
--- a/dashboard-ui/livetvguideprovider-scd.html
+++ b/dashboard-ui/livetvguideprovider-scd.html
@@ -65,7 +65,7 @@
                                 <button type="submit" data-role="none" class="clearButton">
                                     <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
                                 </button>
-
+                                <paper-button raised class="cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></paper-button>
                             </div>
                         </div>
                     </form>
diff --git a/dashboard-ui/livetvsettings.html b/dashboard-ui/livetvsettings.html
index a26332ef47..0c5a3fd268 100644
--- a/dashboard-ui/livetvsettings.html
+++ b/dashboard-ui/livetvsettings.html
@@ -47,6 +47,15 @@
                             <input type="checkbox" id="chkMovies" />
                         </fieldset>
                     </div>
+                    <div>
+                        <br />
+                        <label for="txtRecordingPath">${LabelRecordingPath}</label>
+                        <div style="display: inline-block; width: 85%;">
+                            <input type="text" id="txtRecordingPath" />
+                        </div>
+                        <button id="btnSelectRecordingPath" type="button" data-icon="search" data-iconpos="notext" data-inline="true">${ButtonSelectDirectory}</button>
+                        <div class="fieldDescription">${LabelRecordingPathHelp}</div>
+                    </div>
                     <br />
                     <br />
                     <ul data-role="listview" class="ulForm">
diff --git a/dashboard-ui/livetvstatus.html b/dashboard-ui/livetvstatus.html
index e235866d31..4907343784 100644
--- a/dashboard-ui/livetvstatus.html
+++ b/dashboard-ui/livetvstatus.html
@@ -66,7 +66,7 @@
                         <p><a href="plugincatalog.html">${LiveTvPluginRequiredHelp}</a></p>
                     </div>
 
-                    <paper-dialog class="dlgAddDevice" entry-animation="fade-in-animation" exit-animation="fade-out-animation" style="height:300px;width:250px;" with-backdrop>
+                    <paper-dialog class="dlgAddDevice" entry-animation="fade-in-animation" exit-animation="fade-out-animation" style="height:500px;width:300px;" with-backdrop>
                         <h2>${HeaderAddDevice}</h2>
 
                         <form class="formAddDevice">
@@ -77,6 +77,8 @@
                                         <option value="hdhomerun">HD Homerun</option>
                                         <option value="m3u">M3U</option>
                                     </select>
+                                    <div class="fieldDescription">${MessageTunerDeviceNotListed}</div>
+                                    <div class="fieldDescription"><a href="appservices.html?context=livetv">${TabExternalServices}</a></div>
                                 </div>
                                 <div>
                                     <br />
diff --git a/dashboard-ui/scripts/htmlmediarenderer.js b/dashboard-ui/scripts/htmlmediarenderer.js
index 8dd267a805..42677f5b75 100644
--- a/dashboard-ui/scripts/htmlmediarenderer.js
+++ b/dashboard-ui/scripts/htmlmediarenderer.js
@@ -91,10 +91,11 @@
 
             var savedKeyPropertyName = 'vbk';
             var savedKey = appStorage.getItem(savedKeyPropertyName);
+
             if (savedKey) {
-                var deferred = DeferredBuilder.Deferred();
-                deferred.resolveWith(null, [savedKey]);
-                return deferred.promise();
+                htmlMediaRenderer.customViblastKey = savedKey;
+                callback();
+                return;
             }
 
             var headers = {};
diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js
index f9e3664787..a143547da7 100644
--- a/dashboard-ui/scripts/librarymenu.js
+++ b/dashboard-ui/scripts/librarymenu.js
@@ -203,7 +203,7 @@
     }
     function closeMainDrawer() {
 
-        document.getElementsByClassName('mainDrawerPanel')[0].closeDrawer();
+        document.querySelector('.mainDrawerPanel').closeDrawer();
     }
 
     function ensureDrawerStructure(drawer) {
diff --git a/dashboard-ui/scripts/livetvguide.js b/dashboard-ui/scripts/livetvguide.js
index e04206867f..476d4877f3 100644
--- a/dashboard-ui/scripts/livetvguide.js
+++ b/dashboard-ui/scripts/livetvguide.js
@@ -285,9 +285,12 @@
             html += '<div class="channelHeaderCell">';
             html += '<a class="channelHeaderCellInner" href="livetvchannel.html?id=' + channel.Id + '">';
 
-            html += '<div class="guideChannelInfo">' + channel.Name + '<br/>' + channel.Number + '</div>';
+            var hasChannelImage = channel.ImageTags.Primary;
+            var cssClass = hasChannelImage ? 'guideChannelInfo guideChannelInfoWithImage' : 'guideChannelInfo';
 
-            if (channel.ImageTags.Primary) {
+            html += '<div class="' + cssClass + '">' + channel.Name + '<br/>' + channel.Number + '</div>';
+
+            if (hasChannelImage) {
 
                 var url = ApiClient.getScaledImageUrl(channel.Id, {
                     maxHeight: 35,
diff --git a/dashboard-ui/scripts/livetvguideprovider-scd.js b/dashboard-ui/scripts/livetvguideprovider-scd.js
index 9034f48617..c9e2563c07 100644
--- a/dashboard-ui/scripts/livetvguideprovider-scd.js
+++ b/dashboard-ui/scripts/livetvguideprovider-scd.js
@@ -108,7 +108,7 @@
 
             $('#selectListing', page).html(result.map(function (o) {
 
-                return '<option value="' + o.Id + '">' + o.name + '</option>';
+                return '<option value="' + o.Id + '">' + o.Name + '</option>';
 
             })).selectmenu('refresh');
 
diff --git a/dashboard-ui/scripts/livetvsettings.js b/dashboard-ui/scripts/livetvsettings.js
index 80db5a1ed4..a68af700f7 100644
--- a/dashboard-ui/scripts/livetvsettings.js
+++ b/dashboard-ui/scripts/livetvsettings.js
@@ -9,6 +9,8 @@
 
         $('#chkMovies', page).checked(config.EnableMovieProviders).checkboxradio("refresh");
 
+        $('#txtRecordingPath', page).val(config.RecordingPath || '');
+
         Dashboard.hideLoadingMsg();
     }
 
@@ -22,6 +24,7 @@
 
                 config.GuideDays = $('#selectGuideDays', form).val() || null;
                 config.EnableMovieProviders = $('#chkMovies', form).checked();
+                config.RecordingPath = $('#txtRecordingPath', form).val() || null;
 
                 ApiClient.updateNamedConfiguration("livetv", config).done(Dashboard.processServerConfigurationUpdateResult);
             });
@@ -32,8 +35,26 @@
 
     $(document).on('pageinitdepends', "#liveTvSettingsPage", function () {
 
+        var page = this;
+
         $('.liveTvSettingsForm').off('submit', onSubmit).on('submit', onSubmit);
 
+        $('#btnSelectRecordingPath', page).on("click.selectDirectory", function () {
+
+            var picker = new DirectoryBrowser(page);
+
+            picker.show({
+
+                callback: function (path) {
+
+                    if (path) {
+                        $('#txtRecordingPath', page).val(path);
+                    }
+                    picker.close();
+                }
+            });
+        });
+
     }).on('pageshowready', "#liveTvSettingsPage", function () {
 
         Dashboard.showLoadingMsg();
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 476e0c040d..68754c0b15 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -2035,6 +2035,7 @@ var AppInfo = {};
         drawerWidth = Math.max(drawerWidth, 240);
         // But not exceeding 310
         drawerWidth = Math.min(drawerWidth, 310);
+
         drawer.drawerWidth = drawerWidth + "px";
 
         if ($.browser.safari && !AppInfo.isNativeApp) {
diff --git a/dashboard-ui/vulcanize-out.html b/dashboard-ui/vulcanize-out.html
index f99eee76f0..a6173fed05 100644
--- a/dashboard-ui/vulcanize-out.html
+++ b/dashboard-ui/vulcanize-out.html
@@ -12815,9 +12815,10 @@ is separate from validation, and `allowed-pattern` does not affect how the input
         }
       },
 
-      get shouldKeepAnimating () {
-        for (var index = 0; index < this.ripples.length; ++index) {
-          if (!this.ripples[index].isAnimationComplete) {
+      get shouldKeepAnimating() {
+        var ripples = this.ripples || [];
+        for (var index = 0; index < ripples.length; ++index) {
+          if (!ripples[index].isAnimationComplete) {
             return true;
           }
         }
@@ -12855,9 +12856,11 @@ is separate from validation, and `allowed-pattern` does not affect how the input
           return;
         }
 
-        this.ripples.forEach(function(ripple) {
-          ripple.upAction(event);
-        });
+        if (this.ripples) {
+            this.ripples.forEach(function (ripple) {
+                ripple.upAction(event);
+            });
+        }
 
         this.animate();
       },
@@ -12873,7 +12876,10 @@ is separate from validation, and `allowed-pattern` does not affect how the input
 
         Polymer.dom(this.$.waves).appendChild(ripple.waveContainer);
         this.$.background.style.backgroundColor = ripple.color;
-        this.ripples.push(ripple);
+
+        if (this.ripples) {
+            this.ripples.push(ripple);
+        }
 
         this._setAnimating(true);
 
@@ -12902,8 +12908,9 @@ is separate from validation, and `allowed-pattern` does not affect how the input
 
         this._animating = true;
 
-        for (index = 0; index < this.ripples.length; ++index) {
-          ripple = this.ripples[index];
+        var ripples = this.ripples || [];
+        for (index = 0; index < ripples.length; ++index) {
+            ripple = ripples[index];
 
           ripple.draw();
 
@@ -12914,7 +12921,7 @@ is separate from validation, and `allowed-pattern` does not affect how the input
           }
         }
 
-        if (!this.shouldKeepAnimating && this.ripples.length === 0) {
+        if (!this.shouldKeepAnimating && ripples.length === 0) {
           this.onAnimationComplete();
         } else {
           window.requestAnimationFrame(this._boundAnimate);