diff --git a/app/catalog-tab/route.js b/app/catalog-tab/route.js
index ab0447abf..3f401a8a6 100644
--- a/app/catalog-tab/route.js
+++ b/app/catalog-tab/route.js
@@ -101,6 +101,7 @@ export default Ember.Route.extend({
 
     function filter(data, category, catalogIds) {
       data = data.filterBy('templateBase', (templateBase === 'cattle' ? '' : templateBase));
+      let categories = uniqKeys(data, 'category');
 
       if ( category !== 'all' ) {
         data = data.filterBy('category', category);
@@ -109,7 +110,7 @@ export default Ember.Route.extend({
       data = data.sortBy('name');
 
       return Ember.Object.create({
-        categories: uniqKeys(data, 'category'),
+        categories: categories,
         uniqueCatalogIds: catalogIds,
         catalog: data,
         templateBase: templateBase,
diff --git a/app/components/page-header/component.js b/app/components/page-header/component.js
index dda6ff317..6a0c32e6a 100644
--- a/app/components/page-header/component.js
+++ b/app/components/page-header/component.js
@@ -79,15 +79,15 @@ export default Ember.Component.extend({
   bootstrapCatalogs: function() {
     let defaultCatalogs = [];
     let customCatalogs  = [];
-    let catalogUrls     = this.get('settings').get(C.SETTING.CATALOG_URL).split(',');
+    let catalogUrls     = (this.get('settings').get(C.SETTING.CATALOG_URL)||'').split(',');
 
     catalogUrls.forEach((catalog) => {
       let tmp = {};
       catalog = catalog.split('=')[0];
 
-      if (catalog === 'library' || catalog === 'community') {
+      if (catalog === C.CATALOG.LIBRARY_KEY || catalog === C.CATALOG.COMMUNITY_KEY) {
 
-        if (catalog === 'library') {
+        if (catalog === C.CATALOG.LIBRARY_KEY) {
 
           if (this.get('settings.isPrivateLabel')) {
             tmp.icon = 'icon-catalog';
diff --git a/app/mixins/faster-links-and-menus.js b/app/mixins/faster-links-and-menus.js
deleted file mode 100644
index adfd5fb77..000000000
--- a/app/mixins/faster-links-and-menus.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import Ember from 'ember';
-
-const { getOwner } = Ember;
-
-/*
- * Many link-to and resource-action-menus components on the screen are pretty slow.
- * So instead a static <a> and <button> are put in the template and this handles the clicks.
- */
-export default Ember.Mixin.create({
-  needs           : ['application'],
-  resourceActions : Ember.inject.service('resource-actions'),
-  currentPath     : Ember.computed.alias('application.currentPath'),
-
-  pathObserver: Ember.observer('currentPath', function() {
-    // Make sure that when we change paths, close the action menu
-    Ember.$('body').trigger('click');
-  }),
-
-  click(event) {
-    var btn = $(event.target).closest('BUTTON');
-    if ( btn && btn.hasClass('more-actions') ) // Only menu buttons
-    {
-      this.get('resourceActions').show(this.get('model'), btn);
-    }
-    else if ( event.target.tagName === 'A' && $(event.target).data('transitionLink')) // Only links with data-transition-link
-    {
-      getOwner(this).lookup('router:main').transitionTo(event.target.pathname);
-      event.preventDefault();
-      return false;
-    }
-  }
-});