diff --git a/ui/app/templates/csi/volumes/index.hbs b/ui/app/templates/csi/volumes/index.hbs
index 6d86c277c..6b4b41faf 100644
--- a/ui/app/templates/csi/volumes/index.hbs
+++ b/ui/app/templates/csi/volumes/index.hbs
@@ -60,12 +60,10 @@
       {{/list-pagination}}
     {{else}}
       <div data-test-empty-volumes-list class="empty-message">
-        {{#if (eq sortedVolumes.length 0)}}
-          <h3 data-test-empty-volumes-list-headline class="empty-message-headline">No Volumes</h3>
-          <p class="empty-message-body">
-            The cluster currently has no CSI Volumes.
-          </p>
-        {{/if}}
+        <h3 data-test-empty-volumes-list-headline class="empty-message-headline">No Volumes</h3>
+        <p class="empty-message-body">
+          The cluster currently has no CSI Volumes.
+        </p>
       </div>
     {{/if}}
   {{/if}}
diff --git a/ui/app/templates/csi/volumes/volume.hbs b/ui/app/templates/csi/volumes/volume.hbs
index e7ae55115..2329409f6 100644
--- a/ui/app/templates/csi/volumes/volume.hbs
+++ b/ui/app/templates/csi/volumes/volume.hbs
@@ -1,12 +1,12 @@
 {{title "CSI Volume " model.name}}
-<section class="section">
-<h1 class="title" data-test-title>{{model.name}}</h1>
+<section class="section with-headspace">
+  <h1 class="title" data-test-title>{{model.name}}</h1>
 
   <div class="boxed-section is-small">
     <div class="boxed-section-body inline-definitions">
       <span class="label">Volume Details</span>
       <span class="pair" data-test-volume-health>
-        <span class="term">health</span>
+        <span class="term">Health</span>
         {{if model.schedulable "Schedulable" "Unschedulable"}}
       </span>
       <span class="pair" data-test-volume-provider>