diff --git a/app/controllers/plans_controller.rb b/app/controllers/plans_controller.rb
index b0f3465..f967326 100644
--- a/app/controllers/plans_controller.rb
+++ b/app/controllers/plans_controller.rb
@@ -359,7 +359,7 @@
 
     begin
       @exported_plan.save!
-      file_name = @plan.title.gsub(/ /, "_")
+      file_name = @exported_plan.settings(:export)[:value]['title'].gsub(/ /, "_")
 
       respond_to do |format|
         format.html
diff --git a/app/views/plans/export.docx.erb b/app/views/plans/export.docx.erb
index 7f9c2c2..be267a8 100644
--- a/app/views/plans/export.docx.erb
+++ b/app/views/plans/export.docx.erb
@@ -1,4 +1,4 @@
-<h1><%= @exported_plan.title %></h1>
+<h1><%= @plan.title %></h1>
 <h2><%= @plan.template.title %></h2>
 
 <% details = @exported_plan.admin_details %>
diff --git a/config/tinymce.yml b/config/tinymce.yml
index 6966167..8002f2e 100644
--- a/config/tinymce.yml
+++ b/config/tinymce.yml
@@ -4,11 +4,12 @@
 toolbar: bold italic | bullist numlist | link | table
 plugins:
   - table
-  #- autoresize
+  - autoresize
   - link
   - paste
-target_list: false 
+target_list: false
 autoresize_min_height: 130
+autoresize_bottom_margin: 10
 extended_valid_elements: "iframe[tooltip] , a[href|target=_blank]"
 extended_valid_elements: "a[href|target=_blank]"
 paste_auto_cleanup_on_paste : true
@@ -17,4 +18,6 @@
 paste_convert_middot_lists: true
 paste_remove_styles_if_webkit: true
 paste_remove_spans: true
-paste_strip_class_attributes: "all"
\ No newline at end of file
+paste_strip_class_attributes: "all"
+table_default_attributes:
+  border: 1
\ No newline at end of file