diff --git a/src/app/submission/form/footer/submission-form-footer.component.html b/src/app/submission/form/footer/submission-form-footer.component.html
index 0d58456b24..4d4892b6dc 100644
--- a/src/app/submission/form/footer/submission-form-footer.component.html
+++ b/src/app/submission/form/footer/submission-form-footer.component.html
@@ -17,7 +17,7 @@
       <span>{{'submission.general.save' | translate}}</span>
     </button>
     <button type="button"
-            class="btn btn-info ml-1 mr-1"
+            class="btn btn-info"
             id="saveForLater"
             [disabled]="(processingSaveStatus | async)"
             (click)="saveLater($event)">
diff --git a/src/tsconfig.browser.json b/src/tsconfig.browser.json
index f7140b9fe4..9eef264c94 100644
--- a/src/tsconfig.browser.json
+++ b/src/tsconfig.browser.json
@@ -1,6 +1,7 @@
 {
   "extends": "../tsconfig.json",
   "angularCompilerOptions": {
-    "entryModule": "./modules/app/browser-app.module#BrowserAppModule"
+    "entryModule": "./modules/app/browser-app.module#BrowserAppModule",
+    "preserveWhitespaces": true
   }
 }
diff --git a/src/tsconfig.server.aot.json b/src/tsconfig.server.aot.json
index de753624f3..23f7854344 100644
--- a/src/tsconfig.server.aot.json
+++ b/src/tsconfig.server.aot.json
@@ -1,7 +1,8 @@
 {
   "extends": "./tsconfig.server.json",
   "angularCompilerOptions": {
-    "entryModule": "./modules/app/server-app.module#ServerAppModule"
+    "entryModule": "./modules/app/server-app.module#ServerAppModule",
+    "preserveWhitespaces": true
   },
   "exclude": []
 }
diff --git a/src/tsconfig.server.json b/src/tsconfig.server.json
index 480b685a2a..9881f1de5e 100644
--- a/src/tsconfig.server.json
+++ b/src/tsconfig.server.json
@@ -1,6 +1,7 @@
 {
   "extends": "../tsconfig.json",
   "angularCompilerOptions": {
-    "entryModule": "./modules/app/server-app.module#ServerAppModule"
+    "entryModule": "./modules/app/server-app.module#ServerAppModule",
+    "preserveWhitespaces": true
   }
 }