diff --git a/dashboard-ui/css/images/supporter/nonsupporterbadge.png b/dashboard-ui/css/images/supporter/nonsupporterbadge.png
new file mode 100644
index 0000000000..caa9797335
Binary files /dev/null and b/dashboard-ui/css/images/supporter/nonsupporterbadge.png differ
diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css
index d5bd11dc57..5a4a1e009c 100644
--- a/dashboard-ui/css/site.css
+++ b/dashboard-ui/css/site.css
@@ -151,7 +151,7 @@ pre, textarea.pre {
     vertical-align: middle;
 }
 
-.imageLink.supporter {
+.imageLink.supporterIcon {
     display: none;
 }
 
@@ -282,7 +282,7 @@ form, .readOnlyContent {
         height: 50px;
     }
 
-    .imageLink.supporter {
+    .imageLink.supporterIcon {
         display: inline-block;
     }
 
diff --git a/dashboard-ui/scripts/Itemdetailpage.js b/dashboard-ui/scripts/Itemdetailpage.js
index 922acc3cf1..fa5d56dcba 100644
--- a/dashboard-ui/scripts/Itemdetailpage.js
+++ b/dashboard-ui/scripts/Itemdetailpage.js
@@ -526,6 +526,8 @@
                 $('#themeSongsCollapsible', page).show();
 
                 $('#themeSongsContent', page).html(LibraryBrowser.getSongTableHtml(result.Items, { showArtist: true, showAlbum: true })).trigger('create');
+            } else {
+                $('#themeSongsCollapsible', page).hide();
             }
         });
 
@@ -539,6 +541,8 @@
                 $('#themeVideosCollapsible', page).show();
 
                 $('#themeVideosContent', page).html(getVideosHtml(result.Items)).trigger('create');
+            } else {
+                $('#themeVideosCollapsible', page).hide();
             }
         });
 
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 3c948c8f9f..8e6e36c9dd 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -477,7 +477,7 @@ var Dashboard = {
         options = options || {};
 
         options.header = options.header || "Select Media Path";
-        options.instruction = options.instruction || "Any path will do, but network paths (UNC) will allow clients direct file playback when possible. For optimal playback of bluray and dvd folders, unc paths are recommended.";
+        options.instruction = options.instruction || "Any path will do, but <b>network paths (UNC)</b> allow clients direct file playback when possible. For optimal playback of bluray and dvd folders, <b>network paths</b> are recommended.";
 
         var html = '<div data-role="popup" id="popupDirectoryPicker" class="ui-corner-all popup" style="min-width:65%;">';
 
@@ -713,13 +713,17 @@ var Dashboard = {
 
         header.append(headerHtml);
 
-        Search.onSearchRendered(header);
+        if (!$('.supporterIcon', header).length) {
+            
+            Dashboard.getPluginSecurityInfo().done(function (pluginSecurityInfo) {
 
-        Dashboard.getPluginSecurityInfo().done(function (pluginSecurityInfo) {
-            if (pluginSecurityInfo.IsMBSupporter) {
-                $('<a class="imageLink" href="supporter.html"><img src="css/images/supporter/supporterbadge.png" /></a>').insertBefore('.btnTools', header);
-            }
-        });
+                if (pluginSecurityInfo.IsMBSupporter) {
+                    $('<a class="imageLink supporterIcon" href="supporter.html"><img src="css/images/supporter/supporterbadge.png" /></a>').insertBefore($('.btnTools', header));
+                } else {
+                    $('<a class="imageLink supporterIcon nonSupporterIcon" href="supporter.html" title="Become a Media Browser supporter!"><img src="css/images/supporter/nonsupporterbadge.png" /></a>').insertBefore($('.btnTools', header));
+                }
+            });
+        }
     },
 
     ensureToolsMenu: function (page) {
diff --git a/dashboard-ui/supporter.html b/dashboard-ui/supporter.html
index 2e2f1eb7b7..d1232ac679 100644
--- a/dashboard-ui/supporter.html
+++ b/dashboard-ui/supporter.html
@@ -20,46 +20,41 @@
                     <p>
                         By becoming a Media Browser Supporter, you ensure the continued development and support of this product <strong>and open up a whole new world of premium plug-ins.</strong>
                     </p>
-                    <p style="margin-bottom: 30px">
+                    <p>
                         A portion of all MB3 Supporter donations is also contributed to some of our metadata providers (<a href="http://themoviedb.org" target="_blank">The Movie Db</a>, 
                         <a href="http://thetvdb.com" target="_blank">The TVdb</a>, and <a href="http://fanart.tv" target="_blank">FanArt.tv</a>)
                     </p>
-                    <p style="margin-bottom: 30px">
+                    <p>
                         Premium plug-ins can be installed and used for their trial periods (14 days on any particular machine) but, to register them for use
                         beyond that period, you also have to be a Media Browser Supporter.
                     
                     </p>
-                    <div style="display: none; padding: 10px 10px 10px 10px; margin-bottom: 10px" class="ui-bar-e supporterOnly">
-                        <p>
-                            <strong><em>Thank You</em></strong> for your past support of the Media Browser Team.  Users like you make it possible for 
+                    <p style="display: none; padding: 1em; border-radius: 5px; font-weight: normal;" class="ui-bar-e supporterOnly">
+                        <strong>Thank You</strong> for your past support of the Media Browser Team.  Users like you make it possible for 
                             Media Browser to exist and keep getting better and better.  You can always support us again if you feel you are getting maximum
                             value from the product.  
                         
-                        </p>
-                    </div>
-                    <form name="_xclick" action="https://www.paypal.com/cgi-bin/webscr" 
-                          method="post">
-                                <label for="donateAmt" >Amount (USD)</label>
-                                <select id="donateAmt" name="amount" >
-                                    <option>10</option>
-                                    <option>15</option>
-                                    <option>20</option>
-                                    <option>30</option>
-                                    <option>50</option>
-                                </select>
-                            
-                                <input type="hidden" name="cmd" value="_xclick">
-                                <input type="hidden" name="business" value="donate@mediabrowser3.com">
-                                <input type="hidden" name="currency_code" value="USD">
-                                <input type="hidden" name="item_name" value="Media Browser Supporter">
-                                <input type="hidden" name="item_number" value="MBSupporter">
-                                <input type="hidden" name="notify_url" value="http://mb3admin.com/admin/service/services/ppipn.php">
-                                <input type="hidden" name="return" id ="paypalReturnUrl" value="#">
-                                <a data-role="button" onclick="_xclick.submit();"><img src="css/images/supporter/donatepaypal.png"/></a>  
-                                
-                                <p><small><em>This button is now <strong>live</strong>. Transactions will result in real money being transferred.</em></small></p>
-                            
+                    </p>
+                    <form name="_xclick" action="https://www.paypal.com/cgi-bin/webscr"
+                        method="post">
+                        <label for="donateAmt">Amount (USD)</label>
+                        <select id="donateAmt" name="amount">
+                            <option>10</option>
+                            <option>15</option>
+                            <option>20</option>
+                            <option>30</option>
+                            <option>50</option>
+                        </select>
 
+                        <input type="hidden" name="cmd" value="_xclick">
+                        <input type="hidden" name="business" value="donate@mediabrowser3.com">
+                        <input type="hidden" name="currency_code" value="USD">
+                        <input type="hidden" name="item_name" value="Media Browser Supporter">
+                        <input type="hidden" name="item_number" value="MBSupporter">
+                        <input type="hidden" name="notify_url" value="http://mb3admin.com/admin/service/services/ppipn.php">
+                        <input type="hidden" name="return" id="paypalReturnUrl" value="#">
+                        <a data-role="button" onclick="_xclick.submit();">
+                            <img src="css/images/supporter/donatepaypal.png" /></a>
                     </form>
 
                 </div>