diff --git a/app/workload/controller.js b/app/workload/controller.js
index 3ac471bcc..b6f747ad9 100644
--- a/app/workload/controller.js
+++ b/app/workload/controller.js
@@ -2,6 +2,7 @@ import { computed } from '@ember/object';
 import { oneWay } from '@ember/object/computed';
 import { inject as service } from '@ember/service';
 import Controller, { inject as controller } from '@ember/controller';
+import { get, set } from '@ember/object';
 
 export default Controller.extend({
   application:        controller(),
@@ -9,12 +10,23 @@ export default Controller.extend({
   allWorkloads:       service(),
 
   service:            oneWay('model.workload'),
-
+  namespace: "", 
   sortBy:             'priority',
   fixedLaunchConfig:  null,
   activeLaunchConfig: null,
   portSortBy:         'privatePort',
+  init(){
+    this._super(...arguments);
+    let namespaceId = null;
+    namespaceId = get(this, 'service.namespaceId');
 
+    if (namespaceId) {
+      let namespace = get(this, 'clusterStore').getById('namespace', namespaceId);
+      if (namespace) {
+        set(this, 'namespace', namespace);
+      }
+    }
+  },
   headers: [
     {
       name:           'priority',
diff --git a/app/workload/template.hbs b/app/workload/template.hbs
index caf05f7a7..2583b570d 100644
--- a/app/workload/template.hbs
+++ b/app/workload/template.hbs
@@ -167,7 +167,7 @@
 
     {{container/form-volumes
       launchConfig=activeLaunchConfig
-      service=service
+      workload=service
       editing=false
       expandAll=al.expandAll
       expandFn=expandFn
diff --git a/lib/shared/addon/components/container/form-volume-row/template.hbs b/lib/shared/addon/components/container/form-volume-row/template.hbs
index 556d4aec2..75fc0b4b0 100644
--- a/lib/shared/addon/components/container/form-volume-row/template.hbs
+++ b/lib/shared/addon/components/container/form-volume-row/template.hbs
@@ -2,42 +2,54 @@
   <div class="row">
     <div class="col span-6">
       <label class="acc-label">{{t 'formVolumeRow.name.label'}}</label>
-      {{input type="text" value=model.volume.name placeholder=(t 'formVolumeRow.name.placeholder')}}
+      {{#input-or-display editable=editing value=model.volume.name}}
+        {{input type="text" value=model.volume.name placeholder=(t 'formVolumeRow.name.placeholder')}}
+      {{/input-or-display}}
     </div>
     <div class="col span-4">
       <label class="acc-label">{{t 'formVolumeRow.mode.label'}}</label>
       <div class="form-control-static">
         {{t (concat 'formVolumeRow.mode.' model.mode)}}
-        {{#if (eq model.mode "newPvc")}}
-          <button class="btn bg-transparent" action={{action 'defineNewPvc'}}>
-            <i class="icon icon-edit"/>
-            {{t 'generic.edit'}}
-          </button>
-        {{else if (or (eq model.mode "existingVolume") (eq model.mode "newVolume"))}}
-          <button class="btn bg-transparent" action={{action 'defineNewVolume'}}>
-            <i class="icon icon-edit"/>
-            {{t 'generic.edit'}}
-          </button>
+        {{#if editing}}
+          {{#if (eq model.mode "newPvc")}}
+            <button class="btn bg-transparent" action={{action 'defineNewPvc'}}>
+              <i class="icon icon-edit"/>
+              {{t 'generic.edit'}}
+            </button>
+          {{else if (or (eq model.mode "existingVolume") (eq model.mode "newVolume"))}}
+            <button class="btn bg-transparent" action={{action 'defineNewVolume'}}>
+              <i class="icon icon-edit"/>
+              {{t 'generic.edit'}}
+            </button>
+          {{/if}}
         {{/if}}
       </div>
     </div>
-    <div class="col span-2 text-right mt-0">
-      <button class="btn bg-link icon-btn" {{action "remove"}}>
-        <span class="darken"><i class="icon icon-minus text-small"/></span>
-        <span>Remove Volume</span>
-      </button>
-    </div>
+    {{#if editing}}
+      <div class="col span-2 text-right mt-0">
+        <button class="btn bg-link icon-btn" {{action "remove"}}>
+          <span class="darken"><i class="icon icon-minus text-small"/></span>
+          <span>{{t "formVolumeRow.remove"}}</span>
+        </button>
+      </div>
+    {{/if}}
   </div>
   {{#if (eq model.mode "existingPvc")}}
     <div class="row">
       <div class="col span-6">
-        <label class="acc-label">Persistent Volume Claim {{field-required}}</label>
-        {{new-select
-          value=model.volume.persistentVolumeClaim.persistentVolumeClaimId
-          content=pvcChoices
-          prompt="Select a Persistent Volume Claim..."
-          localizedLabel=false
-        }}
+        <label class="acc-label">{{t "formVolumeRow.mode.existingPvc"}} {{field-required}}</label>
+        {{#if editing}}
+          {{new-select
+            value=model.volume.persistentVolumeClaim.persistentVolumeClaimId
+            content=pvcChoices
+            prompt="Select a Persistent Volume Claim..."
+            localizedLabel=false
+          }}
+        {{else}}
+          <div>
+            {{model.volume.persistentVolumeClaim.persistentVolumeClaimId}}
+          </div>
+        {{/if}}
       </div>
     </div>
   {{else if (eq model.mode "bindMount")}}
@@ -58,45 +70,58 @@
       {{#if model.mounts.length}}
         <table class="fixed">
         <tr>
-          <th>Mount Point{{field-required}}</th>
+          <th>{{t "formVolumes.table.mountPoint"}}{{field-required}}</th>
           <th width="20">&nbsp;</th>
-          <th>Sub Path in Volume</th>
+          <th>{{t "formVolumeRow.subPath"}}</th>
           <th width="20">&nbsp;</th>
-          <th width="100" class="text-center">Read-Only</th>
-          <th width="40">&nbsp;</th>
+          <th width="100" class="text-center">{{t "formVolumeRow.readOnly"}}</th>
+          {{#if editing}}
+            <th width="40">&nbsp;</th>
+          {{/if}}
         </tr>
         {{#each model.mounts as |mnt|}}
           <tr>
             <td>
-              {{input value=mnt.mountPath}}
+              {{#input-or-display editable=editing value=mnt.mountPath}}
+                {{input value=mnt.mountPath}}
+              {{/input-or-display}}
             </td>
             <td></td>
             <td>
-              {{input value=mnt.subPath}}
+              {{#input-or-display editable=editing value=mnt.subPath}}
+                {{input value=mnt.subPath}}
+              {{/input-or-display}}
             </td>
             <td></td>
             <td class="text-center">
-              {{input type="checkbox" classNames="form-control" checked=mnt.readOnly}}
-            </td>
-            <td>
-              <button class="btn bg-primary btn-sm" {{action "removeMount" mnt}}>
-                <i class="icon icon-minus"/>
-                <span class="sr-only">{{t 'generic.remove'}}</span>
-              </button>
+              {{#if editing}}
+                {{input type="checkbox" classNames="form-control" checked=mnt.readOnly}}
+              {{else}}
+                {{mnt.readOnly}}
+              {{/if}}
             </td>
+            {{#if editing}}
+              <td>
+                <button class="btn bg-primary btn-sm" {{action "removeMount" mnt}}>
+                  <i class="icon icon-minus"/>
+                  <span class="sr-only">{{t 'generic.remove'}}</span>
+                </button>
+              </td>
+            {{/if}}
           </tr>
         {{/each}}
         </table>
       {{else}}
-        The volume will not be mounted in the current container.  It may be used by other containers in the pod.
+        {{t "formVolumeRow.noVolume"}}
+      {{/if}}
+      {{#if editing}}
+        <div class="mt-20">
+          <button class="btn bg-link icon-btn" {{action "addMount"}}>
+            <span class="darken"><i class="icon icon-plus text-small"/></span>
+            <span>{{t "formVolumeRow.addMount"}}</span>
+          </button>
+        </div>
       {{/if}}
-
-      <div class="mt-20">
-        <button class="btn bg-link icon-btn" {{action "addMount"}}>
-          <span class="darken"><i class="icon icon-plus text-small"/></span>
-          <span>Add Mount</span>
-        </button>
-      </div>
     </div>
   </div>
 </div>
diff --git a/lib/shared/addon/components/container/form-volumes/template.hbs b/lib/shared/addon/components/container/form-volumes/template.hbs
index 31b24d516..b485709f9 100644
--- a/lib/shared/addon/components/container/form-volumes/template.hbs
+++ b/lib/shared/addon/components/container/form-volumes/template.hbs
@@ -8,6 +8,7 @@
   expand=(action expandFn)
   everExpanded=true
 }}
+  {{log volumesArray}}
   {{#if volumesArray.length}}
     {{#each volumesArray as |row|}}
       {{container/form-volume-row
diff --git a/translations/en-us.yaml b/translations/en-us.yaml
index aba50f953..1de96bd46 100644
--- a/translations/en-us.yaml
+++ b/translations/en-us.yaml
@@ -3621,7 +3621,11 @@ formVolumeRow:
     bindMount: Bind-Mount
     tmpfs: Tmpfs
     secret: Secret
-
+  remove: Remove Volume
+  subPath: Sub Path in Volume
+  readOnly: Read-Only
+  noVolume: The volume will not be mounted in the current container.  It may be used by other containers in the pod.
+  addMount: Add Mount
 formVolumes:
   title: Volumes
   detail: Persist and share data separate from the lifecycle of an individual container.