diff --git a/lib/shared/addon/components/cluster-dashboard/component.js b/lib/shared/addon/components/cluster-dashboard/component.js
index 196e614a8..cf2f6f8e7 100644
--- a/lib/shared/addon/components/cluster-dashboard/component.js
+++ b/lib/shared/addon/components/cluster-dashboard/component.js
@@ -27,7 +27,7 @@ export default Component.extend({
   }),
 
   unhealthyComponents: computed('componentStataus.@each.conditions', function () {
-    return this.get('componentStatuses')
+    return (this.get('componentStatuses')||[])
       .filter(s => !s.conditions.any(c => c.status === 'True'));
   }),
 
@@ -97,7 +97,7 @@ export default Component.extend({
   },
 
   isHealthy(field) {
-    return this.get('componentStatuses')
+    return (this.get('componentStatuses')||[])
       .filter(s => s.name.startsWith(field))
       .any(s => s.conditions.any(c => c.status === 'True'));
   },
diff --git a/lib/shared/addon/components/new-edit-secret/template.hbs b/lib/shared/addon/components/new-edit-secret/template.hbs
index fc77f7329..a5c9eec0c 100644
--- a/lib/shared/addon/components/new-edit-secret/template.hbs
+++ b/lib/shared/addon/components/new-edit-secret/template.hbs
@@ -61,7 +61,7 @@
     addInitialEmptyRow=true
     base64Value=true
     concealValue=true
-    editing=notIsView
+    editing=notView
     changed=(action "updateData")
   }}
 </div>
diff --git a/lib/shared/addon/components/secret-row/template.hbs b/lib/shared/addon/components/secret-row/template.hbs
index 7b797dc90..f03d8a57b 100644
--- a/lib/shared/addon/components/secret-row/template.hbs
+++ b/lib/shared/addon/components/secret-row/template.hbs
@@ -6,7 +6,12 @@
     {{badge-state model=model}}
   </td>
   <td data-title="{{dt.name}}">
-    {{#link-to-external 'secrets.detail' model.id}}{{model.displayName}}{{/link-to-external}}
+      {{#link-to-external 'secrets.detail' model.id}}{{model.displayName}}{{/link-to-external}}
+    {{#if model.description}}
+      <p data-title="{{t 'generic.description'}}" class="text-small text-muted m-0 clip">
+        {{model.description}}
+      </p>
+    {{/if}}
   </td>
   <td data-title="{{dt.description}}">
     {{model.description}}
diff --git a/lib/shared/addon/components/workload-row/template.hbs b/lib/shared/addon/components/workload-row/template.hbs
index dd3894061..7404d4e03 100644
--- a/lib/shared/addon/components/workload-row/template.hbs
+++ b/lib/shared/addon/components/workload-row/template.hbs
@@ -9,7 +9,7 @@
     {{badge-state model=model}}
   </td>
   <td data-title="{{dt.name}}" class="clip">
-    <a href="{{href-to "service" model.id}}">{{model.displayName}} <i class="icon icon-service"></i></a>
+    <a href="{{href-to "workload" model.id}}">{{model.displayName}} <i class="icon icon-service"></i></a>
     {{#if model.showTransitioningMessage}}
       <div class="clip text-small {{model.stateColor}}">{{model.transitioningMessage}}</div>
     {{else if model.displayEndpoints}}
diff --git a/lib/shared/addon/mixins/subscribe.js b/lib/shared/addon/mixins/subscribe.js
index 3457bc823..910a4ae4c 100644
--- a/lib/shared/addon/mixins/subscribe.js
+++ b/lib/shared/addon/mixins/subscribe.js
@@ -101,7 +101,7 @@ export default Mixin.create({
     const clusterStore = this.get('clusterStore');
     const globalStore = this.get('globalStore');
 
-    let count = 0;
+    //let count = 0;
     let event = queue.dequeue();
     let projectId, clusterId, type, forceRemove;
 
@@ -112,11 +112,10 @@ export default Mixin.create({
       }
 
       projectId = get(event.data, 'projectId');
-      clusterId = get(event.data, 'clusterId');
       type = get(event.data, 'type');
       forceRemove = (event.name === 'resource.remove');
 
-      //console.log(this.label, (forceRemove ? 'Remove' : 'Change'), type +':'+ event.data.id, clusterId, projectId);
+      //console.log(this.label, (forceRemove ? 'Remove' : 'Change'), type +':'+ event.data.id,  projectId);
 
       if ( get(this, 'updateProjectStore') && projectId && projectStore.hasType(type) ) {
         //console.log('  Update project store', type, event.data.id, projectId);
@@ -124,7 +123,7 @@ export default Mixin.create({
       }
 
       if ( get(this,'updateClusterStore') && clusterStore.hasType(type) ) {
-        //console.log('  Update cluster store', type, event.data.id, clusterId);
+        //console.log('  Update cluster store', type, event.data.id);
         updateStore(clusterStore, event.data, forceRemove);
       }
 
@@ -133,7 +132,7 @@ export default Mixin.create({
         updateStore(globalStore, event.data, forceRemove);
       }
 
-      count++;
+      //count++;
 
       event = queue.dequeue();
     }
diff --git a/lib/shared/addon/utils/subscribe-cluster.js b/lib/shared/addon/utils/subscribe-cluster.js
index 2fb4a83ce..502b4d4c6 100644
--- a/lib/shared/addon/utils/subscribe-cluster.js
+++ b/lib/shared/addon/utils/subscribe-cluster.js
@@ -1,7 +1,6 @@
 import EmberObject from '@ember/object';
 import Subscribe from 'shared/mixins/subscribe';
 import { get, set } from '@ember/object';
-import { inject as service } from '@ember/service';
 
 export default EmberObject.extend(Subscribe, {
   updateProjectStore: false,
diff --git a/lib/shared/addon/utils/subscribe-global.js b/lib/shared/addon/utils/subscribe-global.js
index 444584d5a..2bd3625cb 100644
--- a/lib/shared/addon/utils/subscribe-global.js
+++ b/lib/shared/addon/utils/subscribe-global.js
@@ -1,7 +1,6 @@
 import EmberObject from '@ember/object';
 import Subscribe from 'shared/mixins/subscribe';
 import { get, set } from '@ember/object';
-import { inject as service } from '@ember/service';
 
 export default EmberObject.extend(Subscribe, {
   updateClusterStore: false,
diff --git a/lib/shared/addon/utils/subscribe-project.js b/lib/shared/addon/utils/subscribe-project.js
index cf52d9613..727d08399 100644
--- a/lib/shared/addon/utils/subscribe-project.js
+++ b/lib/shared/addon/utils/subscribe-project.js
@@ -1,7 +1,6 @@
 import EmberObject from '@ember/object';
 import Subscribe from 'shared/mixins/subscribe';
 import { get, set } from '@ember/object';
-import { inject as service } from '@ember/service';
 
 export default EmberObject.extend(Subscribe, {
   init() {
diff --git a/translations/en-us.yaml b/translations/en-us.yaml
index 73efb4598..0ffafe9a4 100644
--- a/translations/en-us.yaml
+++ b/translations/en-us.yaml
@@ -3655,7 +3655,7 @@ newReceiver:
 
 newSecret:
   title:
-    add: Add Secret
+    new: Add Secret
     edit: 'Edit Secret: {name}'
     view: 'Secret: {name}'
   name: