diff --git a/app.rb b/app.rb
index c48c3019..2c27a759 100644
--- a/app.rb
+++ b/app.rb
@@ -1037,6 +1037,8 @@ post '/site_files/create_page' do
 
   name = "#{params[:pagefilename]}.html"
 
+  name = "#{params[:dir]}/#{name}" if params[:dir]
+
   if current_site.file_exists?(name)
     @errors << %{Web page "#{name}" already exists! Choose another name.}
     halt erb(:'site_files/new_page')
@@ -1046,7 +1048,7 @@ post '/site_files/create_page' do
 
   flash[:success] = %{#{name} was created! <a style="color: #FFFFFF; text-decoration: underline" href="/site_files/text_editor/#{name}">Click here to edit it</a>.}
 
-  redirect '/dashboard'
+  redirect params[:dir] ? "/dashboard?dir=#{Rack::Utils.escape params[:dir]}" : '/dashboard'
 end
 
 get '/site_files/new' do
diff --git a/views/dashboard.erb b/views/dashboard.erb
index 59bb40b4..74777571 100644
--- a/views/dashboard.erb
+++ b/views/dashboard.erb
@@ -100,7 +100,7 @@
       <% end %>
     </div>
     <div class="actions">
-      <a href="/site_files/new_page" class="btn-Action"><i class="fa fa-file"></i>  New Page</a>
+      <a href="/site_files/new_page?dir=<%= Rack::Utils.escape @dir %>" class="btn-Action"><i class="fa fa-file"></i> New Page</a>
       <a href="#createDir" class="btn-Action" data-toggle="modal"><i class="fa fa-folder"></i> New Folder</a>
       <a href="#" class="btn-Action" onclick="clickUploadFiles(); return false"><i class="fa fa-upload"></i> Upload</a>
     </div>
diff --git a/views/site_files/new_page.erb b/views/site_files/new_page.erb
index af6e4b77..dfb5a5dc 100644
--- a/views/site_files/new_page.erb
+++ b/views/site_files/new_page.erb
@@ -20,6 +20,7 @@
     <section>
       <form method="POST" action="/site_files/create_page" enctype="multipart/form-data">
         <%== csrf_token_input_html %>
+        <input name="dir" type="hidden" value="<%= params[:dir] %>">
         <h2>What's the name of your page?</h2>
         <p><input type="text" name="pagefilename" autocapitalize="off" autocorrect="off">.html</p>
         <p><input class="btn-Action" type="submit" value="Create Page"></p>
diff --git a/views/site_files/text_editor.erb b/views/site_files/text_editor.erb
index d190840d..5b46912e 100644
--- a/views/site_files/text_editor.erb
+++ b/views/site_files/text_editor.erb
@@ -127,7 +127,7 @@
           if(quit === true) {
             window.location = '/dashboard'
           } else {
-            $('#editorUpdates span').html('<i class="icon-save icon-2x"></i>&nbsp;&nbsp;<span style="font-size: 14pt">Your file has been saved.</span>')
+            $('#editorUpdates span').html('<i class="fa fa-floppy-o"></i>&nbsp;&nbsp;Your file has been saved.')
             $('a#saveButton,a#saveAndExitButton').css('opacity', 0.5)
             setTimeout(function() {
               $('#editorUpdates').fadeOut();  //.addClass('hidden');