diff --git a/modules/ui/src/app/pages/devices/components/device-qualification-from/device-qualification-from.component.html b/modules/ui/src/app/pages/devices/components/device-qualification-from/device-qualification-from.component.html
index d5caae35e..f2eb9edc8 100644
--- a/modules/ui/src/app/pages/devices/components/device-qualification-from/device-qualification-from.component.html
+++ b/modules/ui/src/app/pages/devices/components/device-qualification-from/device-qualification-from.component.html
@@ -150,34 +150,34 @@
       [format]="format"
       [optionKey]="'text'"></app-dynamic-form>
   </section>
-  <div class="device-qualification-form-actions">
-    <div>
-      <button
-        [disabled]="
-          deviceHasNoChanges(initialDevice(), createDeviceFromForm()) ||
-          ((formIsLoaded$ | async) && !deviceQualificationForm.valid)
-        "
-        mat-flat-button
-        class="save-button"
-        (click)="onSaveClicked()">
-        Save
-      </button>
-      <button
-        mat-flat-button
-        [disabled]="deviceHasNoChanges(initialDevice(), createDeviceFromForm())"
-        type="button"
-        class="close-button"
-        (click)="onCancelClicked()">
-        Discard
-      </button>
-    </div>
+</form>
+<div class="device-qualification-form-actions">
+  <div>
+    <button
+      [disabled]="
+        deviceHasNoChanges(initialDevice(), createDeviceFromForm()) ||
+        ((formIsLoaded$ | async) && !deviceQualificationForm.valid)
+      "
+      mat-flat-button
+      class="save-button"
+      (click)="onSaveClicked()">
+      Save
+    </button>
     <button
       mat-flat-button
-      [disabled]="initialDevice() === null"
+      [disabled]="deviceHasNoChanges(initialDevice(), createDeviceFromForm())"
       type="button"
-      class="delete-button"
-      (click)="onDeleteClick()">
-      Delete
+      class="close-button"
+      (click)="onCancelClicked()">
+      Discard
     </button>
   </div>
-</form>
+  <button
+    mat-flat-button
+    [disabled]="initialDevice() === null"
+    type="button"
+    class="delete-button"
+    (click)="onDeleteClick()">
+    Delete
+  </button>
+</div>
diff --git a/modules/ui/src/app/pages/devices/components/device-qualification-from/device-qualification-from.component.scss b/modules/ui/src/app/pages/devices/components/device-qualification-from/device-qualification-from.component.scss
index f700d9482..86852ea68 100644
--- a/modules/ui/src/app/pages/devices/components/device-qualification-from/device-qualification-from.component.scss
+++ b/modules/ui/src/app/pages/devices/components/device-qualification-from/device-qualification-from.component.scss
@@ -32,10 +32,11 @@ $form-min-width: 285px;
   box-shadow:
     0px 4px 8px 3px rgba(60, 64, 67, 0.15),
     0px 1px 3px 0px rgba(60, 64, 67, 0.3);
+  box-sizing: border-box;
 }
 
 .device-qualification-form {
-  overflow: scroll;
+  overflow-y: scroll;
 }
 
 ::ng-deep .device-form-test-modules {
@@ -87,7 +88,7 @@ $form-min-width: 285px;
 .device-qualification-form-page {
   display: grid;
   align-content: start;
-  padding: 24px 60px;
+  padding: 24px 60px 0 60px;
 }
 
 .device-qualification-form-journey {
diff --git a/modules/ui/src/app/pages/risk-assessment/profile-form/profile-form.component.scss b/modules/ui/src/app/pages/risk-assessment/profile-form/profile-form.component.scss
index 8f1e21d41..2de1ed1ae 100644
--- a/modules/ui/src/app/pages/risk-assessment/profile-form/profile-form.component.scss
+++ b/modules/ui/src/app/pages/risk-assessment/profile-form/profile-form.component.scss
@@ -25,7 +25,7 @@
 }
 
 .profile-form {
-  overflow: scroll;
+  overflow-y: scroll;
 
   .name-field-label {
     margin: 0;
@@ -34,7 +34,7 @@
     display: flex;
     flex-direction: column;
     align-items: flex-start;
-    padding: 16px 32px 32px;
+    padding: 16px 32px 11px 32px;
   }
 
   .profile-form-field {
diff --git a/modules/ui/src/theming/mixins.scss b/modules/ui/src/theming/mixins.scss
index 667c07dd9..eac7e83b4 100644
--- a/modules/ui/src/theming/mixins.scss
+++ b/modules/ui/src/theming/mixins.scss
@@ -91,9 +91,8 @@
 }
 
 @mixin form-actions {
-  position: sticky;
-  left: 32px;
-  bottom: 25px;
+  margin-left: 32px;
+  margin-bottom: 25px;
   display: flex;
   flex-wrap: wrap;
   align-items: center;