diff --git a/smp-angular/src/app/edit/edit-resources/resource-document-panel/resource-document-panel.component.html b/smp-angular/src/app/edit/edit-resources/resource-document-panel/resource-document-panel.component.html
index 22ea7fb89f622785fa1e30140052962c111af611..93637a38943d97e8e8f5afb27b8be714d773b66b 100644
--- a/smp-angular/src/app/edit/edit-resources/resource-document-panel/resource-document-panel.component.html
+++ b/smp-angular/src/app/edit/edit-resources/resource-document-panel/resource-document-panel.component.html
@@ -16,15 +16,6 @@
         <mat-icon>add_circle</mat-icon>
         <span>Generate</span>
       </button>
-      <button id="saveResource_id" mat-raised-button
-              color="primary"
-              matTooltip="Validate resource"
-              [disabled]="saveButtonDisabled"
-              (click)="onSaveButtonClicked()"
-      >
-        <mat-icon>save</mat-icon>
-        <span>Save</span>
-      </button>
     </mat-toolbar-row>
   </mat-toolbar>
   <div [formGroup]="resourceForm" style="width: 100%; display: flex; flex-direction: row; ">
@@ -77,12 +68,25 @@
         </mat-select>
       </mat-form-field>
     </div>
-    <div style="flex: 2;align-self: stretch; flex-direction: column;">
+    <div style="display:block; overflow: auto;flex: 2;align-self: stretch; flex-direction: column;background-color: #FCFCFCBB; border: ridge 3px #b0bec5">
       <ngx-codemirror #codemirror
                       formControlName="payload"
                       [options]="codemirrorOptions"
                       ngDefaultControl
       ></ngx-codemirror>
     </div>
+    <mat-toolbar class="mat-elevation-z2" style="flex-grow: 0">
+      <mat-toolbar-row>
+        <button id="saveResource_id" mat-raised-button
+                color="primary"
+                matTooltip="Validate resource"
+                [disabled]="saveButtonDisabled"
+                (click)="onSaveButtonClicked()"
+        >
+          <mat-icon>save</mat-icon>
+          <span>Save</span>
+        </button>
+      </mat-toolbar-row>
+    </mat-toolbar>
   </div>
 </div>
diff --git a/smp-angular/src/assets/stylesheets/codeMirror.css b/smp-angular/src/assets/stylesheets/codeMirror.css
index fd1bd8055ba529ede698f804ea73debb450087a7..22bc92bb4f7f6fa5e2913d3ce8b481adde3f3c37 100644
--- a/smp-angular/src/assets/stylesheets/codeMirror.css
+++ b/smp-angular/src/assets/stylesheets/codeMirror.css
@@ -152,7 +152,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #a22;}
 .CodeMirror {
   position: relative;
   overflow: hidden;
-  background: white;
+  background: transparent;
 }
 
 .CodeMirror-scroll {