diff --git a/dashboard-ui/plugincatalog.html b/dashboard-ui/plugincatalog.html
index 72bceeca3a..90c2979990 100644
--- a/dashboard-ui/plugincatalog.html
+++ b/dashboard-ui/plugincatalog.html
@@ -14,13 +14,15 @@
                     <a href="pluginupdates.html" data-role="button">Automatic Updates</a>
                 </div>
 
-	            <h5 style="margin-bottom:4px;">Displaying plugins for:</h5>
-	            <fieldset data-role="controlgroup" data-type="horizontal" style="margin:auto;text-align: center;" id="pluginTabs">
-		            <a href="" data-role="button" data-mini="true" class="ui-btn-active" rel="Server">MB Server</a>
-		            <a href="" data-role="button" data-mini="true" rel="MBTheater">MB Theatre</a>
-		            <a href="" data-role="button" data-mini="true" rel="MBClassic">MB Classic</a>
-		            <button data-mini="true" data-icon="filter" data-inline="true" onclick="$('#filterPanel', $.mobile.activePage).panel( 'toggle' );">Filter</button>
-		        </fieldset>
+                <div style="display: inline-block; margin: .75em 0;">
+                    <fieldset data-role="controlgroup" data-type="horizontal" id="pluginTabs">
+                        <a href="" data-role="button" data-mini="true" class="ui-btn-active" rel="Server">MB Server</a>
+                        <a href="" data-role="button" data-mini="true" rel="MBTheater">MB Theatre</a>
+                        <a href="" data-role="button" data-mini="true" rel="MBClassic">MB Classic</a>
+                    </fieldset>
+                </div>
+
+                <button data-mini="true" data-icon="filter" data-inline="true" onclick="$('#filterPanel', $.mobile.activePage).panel( 'toggle' );">Filter</button>
 
                 <div id="pluginTiles"></div>
             </div>
diff --git a/dashboard-ui/scripts/plugincatalogpage.js b/dashboard-ui/scripts/plugincatalogpage.js
index d2b4a218d6..4f7d68491f 100644
--- a/dashboard-ui/scripts/plugincatalogpage.js
+++ b/dashboard-ui/scripts/plugincatalogpage.js
@@ -80,40 +80,44 @@
         Dashboard.hideLoadingMsg();
     }
 
-	function selectTab(elem) {
+    function selectTab(elem, page) {
+        
 		$("#pluginTabs a").removeClass("ui-btn-active");
 		$(elem).addClass("ui-btn-active");
 
 		query.TargetSystems = $(elem).attr("rel");
 
-		reloadList($.mobile.activePage);
+		reloadList(page);
 	}
 
     $(document).on('pageinit', "#pluginCatalogPage", function () {
 
         var page = this;
 
-        $('.chkPremiumFilter', this).on('change', function () {
+        $('.chkPremiumFilter', page).on('change', function () {
 
             if (this.checked) {
                 query.IsPremium = true;
             } else {
                 query.IsPremium = null;
             }
-
+            reloadList(page);
         });
 
-	    $('#pluginTabs a', this).each(function(){
+        $('#pluginTabs a', page).each(function () {
 		    $(this).on('click', function () {
-			    selectTab(this);
+		        selectTab(this, page);
 		    });
 	    });
 
     }).on('pageshow', "#pluginCatalogPage", function () {
-		selectTab($("#pluginTabs a.ui-btn-active"));
+        
+        var page = this;
+
+        selectTab($("#pluginTabs a.ui-btn-active"), page);
 
         // Reset form values using the last used query
-        $('.chkPremiumFilter', this).each(function () {
+        $('.chkPremiumFilter', page).each(function () {
 
             var filters = query.IsPremium || false;