diff --git a/workspaces/frontend/src/app/pages/Workspaces/Creation/properties/WorkspaceCreationPropertiesSelection.tsx b/workspaces/frontend/src/app/pages/Workspaces/Creation/properties/WorkspaceCreationPropertiesSelection.tsx
index 5955dce6..2ba6a6ad 100644
--- a/workspaces/frontend/src/app/pages/Workspaces/Creation/properties/WorkspaceCreationPropertiesSelection.tsx
+++ b/workspaces/frontend/src/app/pages/Workspaces/Creation/properties/WorkspaceCreationPropertiesSelection.tsx
@@ -9,6 +9,7 @@ import {
   Divider,
   Split,
   SplitItem,
+  Content,
 } from '@patternfly/react-core';
 import { WorkspaceCreationImageDetails } from '~/app/pages/Workspaces/Creation/image/WorkspaceCreationImageDetails';
 import { WorkspaceCreationPropertiesTable } from '~/app/pages/Workspaces/Creation/properties/WorkspaceCreationPropertiesTable';
@@ -39,6 +40,9 @@ const WorkspaceCreationPropertiesSelection: React.FunctionComponent<
   );
 
   return (
+    <Content style={{ height: '100%' }}>
+    <p>Configure properties for your workspace.</p>
+    <Divider />
     <Split hasGutter>
       <SplitItem style={{ minWidth: '200px' }}>{imageDetailsContent}</SplitItem>
       <SplitItem isFilled>
@@ -69,7 +73,7 @@ const WorkspaceCreationPropertiesSelection: React.FunctionComponent<
             <Divider />
             <div className="pf-u-mb-0">
               <ExpandableSection
-                toggleText={isVolumesExpanded ? 'Volumes' : 'Add Volumes'}
+                toggleText="Volumes"
                 onToggle={() => setIsVolumesExpanded((prev) => !prev)}
                 isExpanded={isVolumesExpanded}
                 isIndented
@@ -97,7 +101,7 @@ const WorkspaceCreationPropertiesSelection: React.FunctionComponent<
             </div>
             {!isVolumesExpanded && (
               <div style={{ paddingLeft: '36px', marginTop: '-10px' }}>
-                <div>Workspace volume enables your project data to be persist</div>
+                <div>Workspace volumes enable your project data to persist.</div>
                 <div className="pf-u-font-size-sm">
                   <strong>{volumes.length} added</strong>
                 </div>
@@ -107,6 +111,7 @@ const WorkspaceCreationPropertiesSelection: React.FunctionComponent<
         </div>
       </SplitItem>
     </Split>
+    </Content>
   );
 };
 
diff --git a/workspaces/frontend/src/app/pages/Workspaces/Creation/properties/WorkspaceCreationPropertiesTable.tsx b/workspaces/frontend/src/app/pages/Workspaces/Creation/properties/WorkspaceCreationPropertiesTable.tsx
index a0e7c249..981e2be3 100644
--- a/workspaces/frontend/src/app/pages/Workspaces/Creation/properties/WorkspaceCreationPropertiesTable.tsx
+++ b/workspaces/frontend/src/app/pages/Workspaces/Creation/properties/WorkspaceCreationPropertiesTable.tsx
@@ -14,6 +14,7 @@ import {
   ModalFooter,
   Form,
   FormGroup,
+  ModalHeader,
 } from '@patternfly/react-core';
 
 interface Volume {
@@ -140,16 +141,12 @@ export const WorkspaceCreationPropertiesTable: React.FC<WorkspaceCreationPropert
         Create Volume
       </Button>
 
-      <Modal
-        title={editIndex !== null ? 'Edit Volume' : 'Create Volume'}
-        isOpen={isModalOpen}
-        onClose={resetForm}
-        variant={ModalVariant.small}
-      >
+      <Modal isOpen={isModalOpen} onClose={resetForm} variant={ModalVariant.small}>
+        <ModalHeader
+          title={editIndex !== null ? 'Edit Volume' : 'Create Volume'}
+          description="Add a volume and optionally connect it with an existing workspace."
+        />
         <ModalBody>
-          <div> Add volume and optionally connect it with an existing workspace.</div>
-          <div className="pf-u-font-size-sm" />
-          <div className="pf-c-form">
             <Form>
               <FormGroup label="PVC Name" isRequired fieldId="pvc-name">
                 <TextInput
@@ -163,16 +160,15 @@ export const WorkspaceCreationPropertiesTable: React.FC<WorkspaceCreationPropert
               </FormGroup>
               <FormGroup label="Mount Path" isRequired fieldId="mount-path">
                 <TextInput
-                  name="mountPath"
+                    name="mountPath"
                   isRequired
                   type="text"
-                  value={formData.mountPath}
-                  onChange={(_, val) => setFormData({ ...formData, mountPath: val })}
+                    value={formData.mountPath}
+                    onChange={(_, val) => setFormData({ ...formData, mountPath: val })}
                   id="mount-path"
-                />
+                  />
               </FormGroup>
             </Form>
-          </div>
         </ModalBody>
         <ModalFooter>
           <Button
@@ -180,7 +176,7 @@ export const WorkspaceCreationPropertiesTable: React.FC<WorkspaceCreationPropert
             onClick={handleAddOrEdit}
             isDisabled={!formData.pvcName || !formData.mountPath}
           >
-            {editIndex !== null ? 'Save' : 'Add'}
+            {editIndex !== null ? 'Save' : 'Create'}
           </Button>
           <Button key="cancel" variant="link" onClick={resetForm}>
             Cancel
diff --git a/workspaces/frontend/src/shared/style/MUI-theme.scss b/workspaces/frontend/src/shared/style/MUI-theme.scss
index c983407b..8fb14129 100644
--- a/workspaces/frontend/src/shared/style/MUI-theme.scss
+++ b/workspaces/frontend/src/shared/style/MUI-theme.scss
@@ -751,8 +751,8 @@
 }
 
 .mui-theme .pf-v6-c-modal-box {
-  --pf-v6-c-modal-box--BorderRadius: 0;
-  border: 2px solid var(--mui-palette-common-black);
+  --pf-v6-c-modal-box--BorderRadius: var(--mui-shape-borderRadius);
+  --pf-v6-c-modal-box--BoxShadow: var(--mui-shadows-24);
 }
 
 .mui-theme .pf-v6-c-button.pf-m-plain {