diff --git a/static/css/main.css b/static/css/main.css
index 0dd06570..6edbed86 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -318,3 +318,8 @@
 .ct-legend-clicked {
     background-color: #f05b4f !important;
 }
+
+.gophish-editor {
+    font-family: 'Courier New',Monospace !important;
+    font-size: small !important;
+}
diff --git a/static/js/app/landing_pages.js b/static/js/app/landing_pages.js
index 1486d835..48955e3e 100644
--- a/static/js/app/landing_pages.js
+++ b/static/js/app/landing_pages.js
@@ -35,6 +35,7 @@ function dismiss(){
     $("#modal\\.flashes").empty()
     $("#name").val("")
     $("#html_editor").val("")
+    $("#newLandingPageModal").modal('hide')
 }
 
 function deletePage(idx){
diff --git a/static/js/app/templates.js b/static/js/app/templates.js
index ded0bd66..529555de 100644
--- a/static/js/app/templates.js
+++ b/static/js/app/templates.js
@@ -56,6 +56,7 @@ function dismiss(){
     $("#name").val("")
     $("#text_editor").val("")
     $("#html_editor").val("")
+    $("#modal").modal('hide')
 }
 
 function deleteTemplate(idx){
diff --git a/templates/landing_pages.html b/templates/landing_pages.html
index 605aff7f..837307ad 100644
--- a/templates/landing_pages.html
+++ b/templates/landing_pages.html
@@ -68,7 +68,7 @@
                 <input type="text" class="form-control" placeholder="Page name" id="name" autofocus/>
             </div>
             <div class="form-group">
-                <button class="btn btn-danger" data-toggle="modal" data-target="#importSiteModal"><i class="fa fa-envelope"></i> Import Site</button>
+                <button class="btn btn-danger" data-toggle="modal" data-target="#importSiteModal"><i class="fa fa-globe"></i> Import Site</button>
             </div>
             <!-- Nav tabs -->
             <ul class="nav nav-tabs" role="tablist">
@@ -105,7 +105,7 @@
             </div>
         </div>
         <div class="modal-footer">
-            <button type="button" data-dismiss="modal" class="btn btn-default" onclick="dismiss()">Cancel</button>
+            <button type="button" data-dismiss="modal" class="btn btn-default">Cancel</button>
             <button type="button" class="btn btn-primary" id="modalSubmit" onclick="importSite()">Import</button>
         </div>
     </div>
diff --git a/templates/templates.html b/templates/templates.html
index 9c3592a3..330826b5 100644
--- a/templates/templates.html
+++ b/templates/templates.html
@@ -70,7 +70,7 @@
                 <input type="text" class="form-control" ng-model="template.name" placeholder="Template name" id="name" autofocus/>
             </div>
             <div class="form-group">
-		<button class="btn btn-danger" data-toggle="modal" data-target="#importEmailModal"><i class="fa fa-envelope"></i> Import Email (Coming Soon!)</button>
+		<button class="btn btn-danger" data-toggle="modal" data-target="#importEmailModal"><i class="fa fa-envelope"></i> Import Email</button>
             </div>
             <label class="control-label" for="subject">Subject:</label>
             <div class="form-group">
@@ -84,7 +84,7 @@
             <!-- Tab panes -->
             <div class="tab-content">
                 <div role="tabpanel" class="tab-pane active" id="text">
-                    <textarea rows="10" id="text_editor" class="form-control" placeholder="Plaintext"></textarea>
+                    <textarea rows="10" id="text_editor" class="gophish-editor form-control" placeholder="Plaintext"></textarea>
                 </div>
                 <div role="tabpanel" class="tab-pane" id="html">
                     <textarea id="html_editor"></textarea>
@@ -130,11 +130,11 @@
             <div class="row" id="modal.flashes"></div>
             <label class="control-label" for="email">Email Content:</label>
             <div class="form-group">
-                    <textarea rows="10" id="email_content" class="form-control" placeholder="Raw Email Source"></textarea>
+                    <textarea rows="10" id="email_content" class="gophish-editor form-control" placeholder="Raw Email Source"></textarea>
             </div>
         </div>
         <div class="modal-footer">
-            <button type="button" data-dismiss="modal" class="btn btn-default" onclick="dismiss()">Cancel</button>
+            <button type="button" data-dismiss="modal" class="btn btn-default">Cancel</button>
             <button type="button" class="btn btn-primary" id="modalSubmit" onclick="importEmail()">Import</button>
         </div>
     </div>