diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index e036b2583c..b217c766c4 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -1961,6 +1961,19 @@ div.internal-grouping-01:has(svg.warning) span.body-compact-01 {
   cds-table {
     min-width: 66rem;
   }
+
+  div.content:has(div.staff svg.submission-badge) {
+    margin-left: 16rem;
+  }
+
+  div.form-footer-group-buttons {
+    gap: 0.5rem;
+  }
+
+  div.form-footer-group-buttons cds-button {
+    margin-top: 1rem;
+  }
+
 }
 
 /* X-Large (from 1312px to 1583px) */
@@ -2027,6 +2040,12 @@ div.internal-grouping-01:has(svg.warning) span.body-compact-01 {
         (var(--padding-right) + var(--padding-left) + var(--scroll-bar-width))
     );
   }
+
+  div.content:has(div.frame-03 svg.submission-badge) {
+    margin-left: 12rem;
+  }
+
+  
 }
 
 /* XX-Large (from 1584px to 1783px) */
diff --git a/frontend/src/pages/FormStaffConfirmationPage.vue b/frontend/src/pages/FormStaffConfirmationPage.vue
index 8fd9733e4c..29b4f34c5e 100644
--- a/frontend/src/pages/FormStaffConfirmationPage.vue
+++ b/frontend/src/pages/FormStaffConfirmationPage.vue
@@ -13,7 +13,7 @@ const SVG = useSvg(badgePictogram);
 </script>
 
 <template>
-  <div class="frame-03" role="status">
+  <div class="frame-03 staff" role="status">
     <SVG alt="Badge pictogram" class="submission-badge" role="presentation"></SVG>
     <div class="form-header form-header-application-submitted">
       <h1 class="fluid-heading-04">New client {{ clientNumber }} has been created!</h1>
diff --git a/frontend/src/pages/FormStaffProcessingPage.vue b/frontend/src/pages/FormStaffProcessingPage.vue
index 5ba294e97a..201de7b69a 100644
--- a/frontend/src/pages/FormStaffProcessingPage.vue
+++ b/frontend/src/pages/FormStaffProcessingPage.vue
@@ -2,7 +2,7 @@
 // Composables
 import useSvg from "@/composables/useSvg";
 // @ts-ignore
-import badgePictogram from "@carbon/pictograms/es/badge";
+import badgePictogram from "@carbon/pictograms/es/time";
 
 defineProps<{  
   submissionId: number;
@@ -13,7 +13,7 @@ const SVG = useSvg(badgePictogram);
 </script>
 
 <template>
-  <div class="frame-03" role="status">
+  <div class="frame-03 staff" role="status">
     <SVG alt="Badge pictogram" class="submission-badge" role="presentation"></SVG>
     <div class="form-header form-header-application-submitted">
       <h1 class="fluid-heading-04">This submission is being processed</h1>
diff --git a/frontend/src/routes.ts b/frontend/src/routes.ts
index 970c0b589f..4e54385a1b 100644
--- a/frontend/src/routes.ts
+++ b/frontend/src/routes.ts
@@ -132,7 +132,7 @@ export const routes = [
       },
       style: "content",
       headersStyle: "headers",
-      sideMenu: false,
+      sideMenu: true,
       profile: true,
     },
   },
diff --git a/frontend/stub/mappings/fuzzy_matches.json b/frontend/stub/mappings/fuzzy_matches.json
index b3afc9901d..462fee83e3 100644
--- a/frontend/stub/mappings/fuzzy_matches.json
+++ b/frontend/stub/mappings/fuzzy_matches.json
@@ -56,7 +56,7 @@
       },
       "response": {
         "status": 409,
-        "bodyFileName": "partial_individual_match.json",
+        "bodyFileName": "fuzzy/partial_individual_match.json",
         "headers": { "Content-Type": "application/json" }
       }
     },
@@ -108,7 +108,7 @@
       },
       "response": {
         "status": 409,
-        "bodyFileName": "full_individual_match.json",
+        "bodyFileName": "fuzzy/full_individual_match.json",
         "headers": { "Content-Type": "application/json" }
       }
     },
@@ -154,7 +154,7 @@
       },
       "response": {
         "status": 409,
-        "bodyFileName": "document_individual_match.json",
+        "bodyFileName": "fuzzy/document_individual_match.json",
         "headers": { "Content-Type": "application/json" }
       }
     },
@@ -195,7 +195,7 @@
       },
       "response": {
         "status": 409,
-        "bodyFileName": "partial_business_name_match.json",
+        "bodyFileName": "fuzzy/partial_business_name_match.json",
         "headers": { "Content-Type": "application/json" }
       }
     },
@@ -235,7 +235,7 @@
       },
       "response": {
         "status": 409,
-        "bodyFileName": "full_business_name_match.json",
+        "bodyFileName": "fuzzy/full_business_name_match.json",
         "headers": { "Content-Type": "application/json" }
       }
     },
@@ -275,7 +275,7 @@
       },
       "response": {
         "status": 409,
-        "bodyFileName": "full_registered_number_match.json",
+        "bodyFileName": "fuzzy/full_registered_number_match.json",
         "headers": { "Content-Type": "application/json" }
       }
     },
@@ -315,7 +315,7 @@
       },
       "response": {
         "status": 409,
-        "bodyFileName": "partial_individual_match.json",
+        "bodyFileName": "fuzzy/partial_individual_match.json",
         "headers": { "Content-Type": "application/json" }
       }
     },
@@ -344,7 +344,7 @@
       },
       "response": {
         "status": 409,
-        "bodyFileName": "full_dba_match.json",
+        "bodyFileName": "fuzzy/full_dba_match.json",
         "headers": { "Content-Type": "application/json" }
       }
     },
@@ -372,7 +372,7 @@
       },
       "response": {
         "status": 409,
-        "bodyFileName": "partial_dba_match.json",
+        "bodyFileName": "fuzzy/partial_dba_match.json",
         "headers": { "Content-Type": "application/json" }
       }
     },
@@ -401,7 +401,7 @@
       },
       "response": {
         "status": 409,
-        "bodyFileName": "full_acronym_match.json",
+        "bodyFileName": "fuzzy/full_acronym_match.json",
         "headers": { "Content-Type": "application/json" }
       }
     },
@@ -442,7 +442,7 @@
       },
       "response": {
         "status": 409,
-        "bodyFileName": "full_fn_federal_id_match.json",
+        "bodyFileName": "fuzzy/full_fn_federal_id_match.json",
         "headers": { "Content-Type": "application/json" }
       }
     },
@@ -471,7 +471,7 @@
       },
       "response": {
         "status": 409,
-        "bodyFileName": "partial_business_name_match.json",
+        "bodyFileName": "fuzzy/partial_business_name_match.json",
         "headers": { "Content-Type": "application/json" }
       }
     },
@@ -499,7 +499,7 @@
       },
       "response": {
         "status": 409,
-        "bodyFileName": "full_business_name_match.json",
+        "bodyFileName": "fuzzy/full_business_name_match.json",
         "headers": { "Content-Type": "application/json" }
       }
     },
@@ -528,7 +528,7 @@
       },
       "response": {
         "status": 409,
-        "bodyFileName": "full_address_email_match.json",
+        "bodyFileName": "fuzzy/full_address_email_match.json",
         "headers": {
           "Content-Type": "application/json"
         }
@@ -558,7 +558,7 @@
       },
       "response": {
         "status": 409,
-        "bodyFileName": "full_address_business_phone_match.json",
+        "bodyFileName": "fuzzy/full_address_business_phone_match.json",
         "headers": {
           "Content-Type": "application/json"
         }
@@ -588,7 +588,7 @@
       },
       "response": {
         "status": 409,
-        "bodyFileName": "full_address_secondary_phone_match.json",
+        "bodyFileName": "fuzzy/full_address_secondary_phone_match.json",
         "headers": {
           "Content-Type": "application/json"
         }
@@ -618,7 +618,7 @@
       },
       "response": {
         "status": 409,
-        "bodyFileName": "full_address_fax_phone_match.json",
+        "bodyFileName": "fuzzy/full_address_fax_phone_match.json",
         "headers": {
           "Content-Type": "application/json"
         }
@@ -648,7 +648,7 @@
       },
       "response": {
         "status": 409,
-        "bodyFileName": "full_address_match.json",
+        "bodyFileName": "fuzzy/full_address_match.json",
         "headers": {
           "Content-Type": "application/json"
         }
@@ -679,7 +679,7 @@
       },
       "response": {
         "status": 409,
-        "bodyFileName": "full_contact_email_match.json",
+        "bodyFileName": "fuzzy/full_contact_email_match.json",
         "headers": {
           "Content-Type": "application/json"
         }
@@ -709,7 +709,7 @@
       },
       "response": {
         "status": 409,
-        "bodyFileName": "full_contact_business_phone_match.json",
+        "bodyFileName": "fuzzy/full_contact_business_phone_match.json",
         "headers": {
           "Content-Type": "application/json"
         }
@@ -739,7 +739,7 @@
       },
       "response": {
         "status": 409,
-        "bodyFileName": "full_contact_secondary_phone_match.json",
+        "bodyFileName": "fuzzy/full_contact_secondary_phone_match.json",
         "headers": {
           "Content-Type": "application/json"
         }
@@ -769,7 +769,7 @@
       },
       "response": {
         "status": 409,
-        "bodyFileName": "full_contact_fax_phone_match.json",
+        "bodyFileName": "fuzzy/full_contact_fax_phone_match.json",
         "headers": {
           "Content-Type": "application/json"
         }
@@ -799,7 +799,7 @@
       },
       "response": {
         "status": 409,
-        "bodyFileName": "full_contact_match.json",
+        "bodyFileName": "fuzzy/full_contact_match.json",
         "headers": {
           "Content-Type": "application/json"
         }