diff --git a/dashboard-ui/about.html b/dashboard-ui/about.html
index 0e19a608a5..a8f2f5a474 100644
--- a/dashboard-ui/about.html
+++ b/dashboard-ui/about.html
@@ -12,7 +12,7 @@
                     <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
                         <a href="support.html" data-role="button">${TabGeneral}</a>
                         <a href="log.html" data-role="button">${TabLogs}</a>
-                        <a href="supporter.html" data-role="button">${TabSupporterClub}</a>
+                        <a href="supporter.html" data-role="button">${TabDonate}</a>
                         <a href="supporterkey.html" data-role="button">${TabSupporterKey}</a>
                         <a href="about.html" data-role="button" class="ui-btn-active">${TabAbout}</a>
                     </div>
diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css
index 629b34cb83..4955491e1b 100644
--- a/dashboard-ui/css/librarymenu.css
+++ b/dashboard-ui/css/librarymenu.css
@@ -350,6 +350,14 @@
     }
 }
 
+@media all and (max-width: 800px) {
+
+    /* The sidebar isn't visible at this size, so there's no way to navigate within the editor */
+    .editorViewMenu {
+        display: none;
+    }
+}
+
 .libraryDocument .dashboardMenuButton {
     display: none;
 }
diff --git a/dashboard-ui/css/metadataeditor.css b/dashboard-ui/css/metadataeditor.css
index 7c13e8ae5d..90a761224e 100644
--- a/dashboard-ui/css/metadataeditor.css
+++ b/dashboard-ui/css/metadataeditor.css
@@ -84,7 +84,7 @@
 
 /* Fixes button running outside of list */
 .btnRemoveFromEditorList .ui-btn-inner {
-    padding-right: 0!important;
+    padding-right: 0 !important;
 }
 
 
@@ -266,7 +266,7 @@
         left: 0;
         width: 30%;
         overflow-y: scroll;
-        overflow-x: auto!important;
+        overflow-x: auto !important;
         display: block;
         border-right: 1px solid #555;
     }
diff --git a/dashboard-ui/log.html b/dashboard-ui/log.html
index d336f435b7..8ec5a51ffb 100644
--- a/dashboard-ui/log.html
+++ b/dashboard-ui/log.html
@@ -11,7 +11,7 @@
                 <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
                     <a href="support.html" data-role="button">${TabGeneral}</a>
                     <a href="log.html" data-role="button" class="ui-btn-active">${TabLogs}</a>
-                    <a href="supporter.html" data-role="button">${TabSupporterClub}</a>
+                    <a href="supporter.html" data-role="button">${TabDonate}</a>
                     <a href="supporterkey.html" data-role="button">${TabSupporterKey}</a>
                     <a href="about.html" data-role="button">${TabAbout}</a>
                 </div>
diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js
index 35b17d0b73..2042c0b446 100644
--- a/dashboard-ui/scripts/librarymenu.js
+++ b/dashboard-ui/scripts/librarymenu.js
@@ -141,7 +141,7 @@
                     viewMenuCssClass = 'channelsViewMenu';
                 }
 
-                return '<a data-itemid="' + itemId + '" class="lnkMediaFolder viewMenuLink viewMenuTextLink ' + viewMenuCssClass + '" href="' + getItemHref(i) + '">' + i.Name + '</a>';
+                return '<a data-itemid="' + itemId + '" class="lnkMediaFolder viewMenuLink viewMenuTextLink ' + viewMenuCssClass + '" href="' + getItemHref(i, i.CollectionType) + '">' + i.Name + '</a>';
 
             }).join('');
 
diff --git a/dashboard-ui/scripts/supporterpage.js b/dashboard-ui/scripts/supporterpage.js
index 120da580df..5421fea5b1 100644
--- a/dashboard-ui/scripts/supporterpage.js
+++ b/dashboard-ui/scripts/supporterpage.js
@@ -104,15 +104,15 @@
             if (info.IsActiveSupporter && info.PlanType == 'Lifetime') {
 
                 $('.planSummary', page)
-                    .html('You have a lifetime supporter club membership. You can provide additional donations on a one-time or recurring basis using the options below. Thank you for supporting Media Browser.')
-                    .css('color', 'green');
+                    .html('You have a lifetime supporter membership. You can provide additional donations on a one-time or recurring basis using the options below. Thank you for supporting Media Browser.')
+                    .css('color', 'blue');
 
             }
             else if (info.IsActiveSupporter) {
 
                 $('.planSummary', page)
                     .html('You have an active ' + info.PlanType + ' membership. You can upgrade your plan using the options below.')
-                    .css('color', 'green');
+                    .css('color', 'blue');
 
             }
             else if (info.IsExpiredSupporter) {
diff --git a/dashboard-ui/support.html b/dashboard-ui/support.html
index 541049c409..3f01b2d6c5 100644
--- a/dashboard-ui/support.html
+++ b/dashboard-ui/support.html
@@ -12,7 +12,7 @@
                     <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
                         <a href="support.html" data-role="button" class="ui-btn-active">${TabGeneral}</a>
                         <a href="log.html" data-role="button">${TabLogs}</a>
-                        <a href="supporter.html" data-role="button">${TabSupporterClub}</a>
+                        <a href="supporter.html" data-role="button">${TabDonate}</a>
                         <a href="supporterkey.html" data-role="button">${TabSupporterKey}</a>
                         <a href="about.html" data-role="button">${TabAbout}</a>
                     </div>
diff --git a/dashboard-ui/supporter.html b/dashboard-ui/supporter.html
index 34395b8910..e35817bfa2 100644
--- a/dashboard-ui/supporter.html
+++ b/dashboard-ui/supporter.html
@@ -13,7 +13,7 @@
                     <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
                         <a href="support.html" data-role="button">${TabGeneral}</a>
                         <a href="log.html" data-role="button">${TabLogs}</a>
-                        <a href="supporter.html" data-role="button" class="ui-btn-active">${TabSupporterClub}</a>
+                        <a href="supporter.html" data-role="button" class="ui-btn-active">${TabDonate}</a>
                         <a href="supporterkey.html" data-role="button">${TabSupporterKey}</a>
                         <a href="about.html" data-role="button">${TabAbout}</a>
                     </div>
@@ -34,28 +34,28 @@
                             <div class="fldLifetime">
                                 <input type="radio" class="radioDonationType" name="radioDonationType" id="radioLifetimeSupporter" value="lifetime" checked="checked">
                                 <label for="radioLifetimeSupporter">
-                                    ${OptionLifeTimeSupporterClubMembership}<br />
+                                    ${OptionLifeTimeSupporterMembership}<br />
                                     <span class="lifetimeAmount"></span>
                                 </label>
                             </div>
                             <div class="fldYearly">
                                 <input type="radio" class="radioDonationType" name="radioDonationType" id="radioYearlySupporter" value="yearly">
                                 <label for="radioYearlySupporter">
-                                    Yearly supporter club membership<br />
+                                    ${OptionYearlySupporterMembership}<br />
                                     <span class="yearlyAmount"></span>
                                 </label>
                             </div>
                             <div class="fldMonthly">
                                 <input type="radio" class="radioDonationType" name="radioDonationType" id="radioMonthlySupporter" value="monthly">
                                 <label for="radioMonthlySupporter">
-                                    Monthly supporter club membership<br />
+                                    ${OptionMonthlySupporterMembership}<br />
                                     <span class="monthlyAmount"></span>
                                 </label>
                             </div>
                             <div class="fldDaily">
                                 <input type="radio" class="radioDonationType" name="radioDonationType" id="radioDailySupporter" value="daily">
                                 <label for="radioDailySupporter">
-                                    Daily supporter club membership<br />
+                                    Daily supporter membership<br />
                                     <span class="dailyAmount"></span>
                                 </label>
                             </div>
diff --git a/dashboard-ui/supporterkey.html b/dashboard-ui/supporterkey.html
index 8ce4374584..5707212095 100644
--- a/dashboard-ui/supporterkey.html
+++ b/dashboard-ui/supporterkey.html
@@ -12,7 +12,7 @@
                     <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
                         <a href="support.html" data-role="button">${TabGeneral}</a>
                         <a href="log.html" data-role="button">${TabLogs}</a>
-                        <a href="supporter.html" data-role="button">${TabSupporterClub}</a>
+                        <a href="supporter.html" data-role="button">${TabDonate}</a>
                         <a href="supporterkey.html" data-role="button" class="ui-btn-active">${TabSupporterKey}</a>
                         <a href="about.html" data-role="button">${TabAbout}</a>
                     </div>