diff --git a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/form/form.component.html b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/form/form.component.html
index 1d3036ee383f4deaa33693e201eb62fe2f29950c..5e5e5a71b32720feca40510789eb48bcb94cdb26 100644
--- a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/form/form.component.html
+++ b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/form/form.component.html
@@ -499,7 +499,7 @@
                   />
                 </div>
 
-                <div class="grid-col-12 padding-y-2">
+                <div class="grid-col-12 padding-y-2 calc-config">
                   <mat-expansion-panel
                     [disabled]="calcConfig() === null"
                     [expanded]="calcConfig() !== null"
diff --git a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/form/form.component.scss b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/form/form.component.scss
index 0695887375fb137083214ec5116668fd80cfa59e..0d57f27d523871a72fc174abbcc8352f003e4835 100644
--- a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/form/form.component.scss
+++ b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/form/form.component.scss
@@ -1,3 +1,6 @@
+@use '@angular/material' as mat;
+@use '@ghsc/nshmp-template/styles/variables';
+
 :host {
   height: 100%;
   width: 100%;
@@ -54,3 +57,11 @@ mat-expansion-panel {
     font-size: clamp(8px, 6px + 1vw, 14px);
   }
 }
+
+.calc-config {
+  @include mat.expansion-overrides(
+    (
+      container-background-color: variables.$nshmp-surface-container-highest,
+    )
+  );
+}
diff --git a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/history/history.component.html b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/history/history.component.html
index a9d1ea24a91dc615374d80f49aa03fc4f1d0680f..cd86d3262b04c98a307685c02b72c2c4116112ac 100644
--- a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/history/history.component.html
+++ b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/history/history.component.html
@@ -45,9 +45,11 @@
                   </a>
                 </div>
 
-                <div>Submitted: {{ serviceResponse.date }}</div>
+                <div class="padding-bottom-1">
+                  Submitted: {{ serviceResponse.date }}
+                </div>
 
-                <mat-expansion-panel class="grid-col-12 padding-top-1">
+                <mat-expansion-panel class="grid-col-12">
                   <mat-expansion-panel-header>
                     <mat-panel-title>Configuration</mat-panel-title>
                   </mat-expansion-panel-header>
diff --git a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/history/history.component.scss b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/history/history.component.scss
index 048c1f1df9dedc6b2669012fb99239c7f6236922..1f39dbb77b36625efdf582ad3f93e91abd9cd6ba 100644
--- a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/history/history.component.scss
+++ b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/history/history.component.scss
@@ -1,3 +1,6 @@
+@use '@angular/material' as mat;
+@use '@ghsc/nshmp-template/styles/variables';
+
 .code-block {
   font-size: 11px;
 }
@@ -5,4 +8,16 @@
 .history-cards {
   overflow: auto;
   max-height: 150vh;
+
+  @include mat.card-overrides(
+    (
+      outlined-container-color: variables.$nshmp-surface-container-high,
+    )
+  );
+
+  @include mat.expansion-overrides(
+    (
+      container-background-color: variables.$nshmp-surface-container-highest,
+    )
+  );
 }