diff --git a/dashboard-ui/plugincatalog.html b/dashboard-ui/plugincatalog.html
index cde52fc62b..d056a7d50a 100644
--- a/dashboard-ui/plugincatalog.html
+++ b/dashboard-ui/plugincatalog.html
@@ -13,9 +13,14 @@
                     <a href="plugincatalog.html" data-role="button" class="ui-btn-active">Plugin Catalog</a>
                     <a href="pluginupdates.html" data-role="button">Automatic Updates</a>
                 </div>
-                <div class="viewSettings" style="margin: .5em 0;text-align:left;">
-                    <button data-mini="true" data-icon="filter" data-inline="true" onclick="$('#filterPanel', $.mobile.activePage).panel( 'toggle' );">Filter</button>
-                </div>
+
+	            <h5>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 id="pluginTiles"></div>
             </div>
@@ -23,20 +28,6 @@
 
         <div data-role="panel" id="filterPanel" data-position="right" data-display="overlay" data-theme="b" data-position-fixed="true">
             <form>
-                <fieldset data-role="controlgroup">
-                    <legend>
-                        <h3>Application:</h3>
-                    </legend>
-                    <input class="chkStandardFilter" type="checkbox" name="chkServer" id="chkServer" data-theme="c" data-filter="Server">
-                    <label for="chkServer">MB Server</label>
-
-                    <input class="chkStandardFilter" type="checkbox" name="chkTheatre" id="chkTheatre" data-theme="c" data-filter="MBTheater">
-                    <label for="chkTheatre">MB Theater</label>
-
-                    <input class="chkStandardFilter" type="checkbox" name="chkClassic" id="chkClassic" data-theme="c" data-filter="MBClassic">
-                    <label for="chkClassic">MB Classic</label>
-                </fieldset>
-
                 <fieldset data-role="controlgroup">
                     <legend>
                         <h3>Pricing:</h3>
diff --git a/dashboard-ui/scripts/plugincatalogpage.js b/dashboard-ui/scripts/plugincatalogpage.js
index e86da18522..d2b4a218d6 100644
--- a/dashboard-ui/scripts/plugincatalogpage.js
+++ b/dashboard-ui/scripts/plugincatalogpage.js
@@ -2,6 +2,7 @@
 
     // The base query options
     var query = {
+	    TargetSystems: 'Server'
     };
 
     function reloadList(page) {
@@ -70,31 +71,28 @@
 
         }
 
+	    if (!availablePlugins.length) {
+		    html = '<div style="text-align:center;margin: 10px;">No available plugins</div>';
+	    }
+
         $('#pluginTiles', page).html(html);
 
         Dashboard.hideLoadingMsg();
     }
 
+	function selectTab(elem) {
+		$("#pluginTabs a").removeClass("ui-btn-active");
+		$(elem).addClass("ui-btn-active");
+
+		query.TargetSystems = $(elem).attr("rel");
+
+		reloadList($.mobile.activePage);
+	}
+
     $(document).on('pageinit', "#pluginCatalogPage", function () {
 
         var page = this;
 
-        $('.chkStandardFilter', this).on('change', function () {
-
-            var filterName = this.getAttribute('data-filter');
-            var filters = query.TargetSystems || "";
-
-            filters = (',' + filters).replace(',' + filterName, '').substring(1);
-
-            if (this.checked) {
-                filters = filters ? (filters + ',' + filterName) : filterName;
-            }
-
-            query.TargetSystems = filters;
-
-            reloadList(page);
-        });
-
         $('.chkPremiumFilter', this).on('change', function () {
 
             if (this.checked) {
@@ -103,24 +101,18 @@
                 query.IsPremium = null;
             }
 
-            reloadList(page);
         });
 
-    }).on('pageshow', "#pluginCatalogPage", function () {
+	    $('#pluginTabs a', this).each(function(){
+		    $(this).on('click', function () {
+			    selectTab(this);
+		    });
+	    });
 
-        reloadList(this);
+    }).on('pageshow', "#pluginCatalogPage", function () {
+		selectTab($("#pluginTabs a.ui-btn-active"));
 
         // Reset form values using the last used query
-
-        $('.chkStandardFilter', this).each(function () {
-
-            var filters = "," + (query.TargetSystems || "");
-            var filterName = this.getAttribute('data-filter');
-
-            this.checked = filters.indexOf(',' + filterName) != -1;
-
-        }).checkboxradio('refresh');
-
         $('.chkPremiumFilter', this).each(function () {
 
             var filters = query.IsPremium || false;