diff --git a/CSETWebNg/src/app/import/import.component.html b/CSETWebNg/src/app/import/import.component.html
index 89d7d17255..fe7819a0cb 100644
--- a/CSETWebNg/src/app/import/import.component.html
+++ b/CSETWebNg/src/app/import/import.component.html
@@ -106,7 +106,7 @@ <h6>{{set.name}}</h6>
                             <h4>Drop code file here</h4>
                         </div>
                         <h4 class="d-flex" style="align-items:center">Module Code
-                            <div class="btn-group ml-3 flex-11a" role="group" aria-label="...">
+                            <div class="btn-group ml-3 mr-3 flex-11a" role="group" aria-label="...">
                                 <button (click)="switchToJson()" type="button" class="btn btn-secondary"
                                     [ngClass]="{'active': this.lang=='json'}">JSON</button>
                                 <button (click)="switchToXml()" type="button" class="btn btn-secondary"
@@ -239,12 +239,17 @@ <h4>Supporting Documents</h4>
                             <span *ngIf="state=='Processing'">Processing</span>
                             <span *ngIf="state=='Ready'">Import</span>
                         </button>
-                        <button *ngIf="state!='Processing'&&state!='Ready'" class="btn btn-primary"
-                            (click)="clearForm()">Import
-                            another module</button>
+                        <div class="d-flex align-items-center" *ngIf="state!='Processing' && state!='Ready'">
+                          <button class="btn btn-primary"
+                              (click)="clearForm()">Import another module
+                          </button>
+                          <div style="margin-bottom: 0" class="alert alert-warning ml-3">
+                            Warning: This will clear the code editor
+                          </div>
+                        </div>
                     </div>
                 </form>
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/CSETWebNg/src/app/import/import.component.ts b/CSETWebNg/src/app/import/import.component.ts
index 7353e3ad4a..929e5dc96b 100644
--- a/CSETWebNg/src/app/import/import.component.ts
+++ b/CSETWebNg/src/app/import/import.component.ts
@@ -22,7 +22,6 @@
 //
 ////////////////////////////////
 import { Component, ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/core';
-import { DomSanitizer } from '@angular/platform-browser';
 import { CodeEditorComponent, CodeEditorService, CodeModel } from '@ngstack/code-editor';
 import { saveAs } from 'file-saver';
 import { editor } from 'monaco-editor/esm/vs/editor/editor.api';
@@ -214,7 +213,7 @@ export class ImportComponent implements OnInit, OnDestroy {
         }
       },
       e => {
-        console.log(e)
+        console.error(e)
         for (let key in e.error.errors) {
           this.errors.push(`${e.error.errors[key]}`);
         }
@@ -226,7 +225,7 @@ export class ImportComponent implements OnInit, OnDestroy {
   public clearForm() {
     this.uploader.clearQueue();
     this.moduleCode = '';
-    this.codeModel.value = '';
+    this.codeModel = { ...this.jsonCodeModel };
     this.state = 'Ready';
     this.errors = [];
     this.subscriptions.forEach(s => s.unsubscribe());
@@ -249,7 +248,6 @@ export class ImportComponent implements OnInit, OnDestroy {
   constructor(
     private configSvc: ConfigService,
     private fileClient: FileUploadClientService,
-    private sanitizer: DomSanitizer,
     private editorService: CodeEditorService
   ) {
     // hardcoding the polyfill here, as ugly as that is TODO:  Remove
@@ -303,7 +301,7 @@ export class ImportComponent implements OnInit, OnDestroy {
       return promise;
     };
     this.initializeUploader();
-    this.codeModel = this.jsonCodeModel;
+    this.codeModel = { ...this.jsonCodeModel };
 
   }