diff --git a/dashboard-ui/channelsettings.html b/dashboard-ui/channelsettings.html
index 585d560b9f..10318503ac 100644
--- a/dashboard-ui/channelsettings.html
+++ b/dashboard-ui/channelsettings.html
@@ -8,9 +8,9 @@
 
         <div data-role="content">
             <div class="content-primary">
-                <br />
                 <form class="channelSettingsForm">
-
+                    <p class="noChannelsHeader" style="display: none;">${ChannelSettingsFormHelp}</p>
+                    <br />
                     <ul data-role="listview" class="ulForm">
                         <li>
                             <label for="selectChannelResolution">${LabelChannelStreamQuality}</label>
diff --git a/dashboard-ui/scripts/channelsettings.js b/dashboard-ui/scripts/channelsettings.js
index dbe2bc808d..f38ef586fe 100644
--- a/dashboard-ui/scripts/channelsettings.js
+++ b/dashboard-ui/scripts/channelsettings.js
@@ -31,6 +31,12 @@
     
     function loadPage(page, config, allChannelFeatures) {
 
+        if (allChannelFeatures.length) {
+            $('.noChannelsHeader', page).hide();
+        } else {
+            $('.noChannelsHeader', page).show();
+        }
+        
         var downloadableList = allChannelFeatures.filter(function (i) {
             return i.CanDownloadAllMedia;
         });
diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js
index 92ce73c52d..60c840574d 100644
--- a/dashboard-ui/scripts/itemdetailpage.js
+++ b/dashboard-ui/scripts/itemdetailpage.js
@@ -83,7 +83,11 @@
                     $('.btnPlayExternalTrailer', page).addClass('hide').attr('href', '#');
                 }
 
-                if (user.Configuration.IsAdministrator && item.MediaSources && item.MediaSources.length > 1) {
+                var groupedVersions = (item.MediaSources || []).filter(function (g) {
+                    return g.Type == "Grouping";
+                });
+
+                if (user.Configuration.IsAdministrator && groupedVersions.length) {
                     $('.splitVersionContainer', page).show();
                 } else {
                     $('.splitVersionContainer', page).hide();
@@ -479,7 +483,7 @@
 
         $('.lnkSibling', page).addClass('hide');
         return;
-        
+
         if ((item.Type != "Episode" && item.Type != "Season" && item.Type != "Audio") || item.IndexNumber == null) {
             return;
         }