diff --git a/app/views/plans/export.html.erb b/app/views/plans/export.html.erb
index b854936..d982182 100644
--- a/app/views/plans/export.html.erb
+++ b/app/views/plans/export.html.erb
@@ -1,78 +1,78 @@
 <div id="export_font">
-	<h1><%= @plan.title %></h1>
-	<h2><%= @plan.template.title %></h2>
-	<div class="dmp_details_body">
-		<div class="dmp_details">
-			<% details = @exported_plan.admin_details %>
-			<% if details.present?  && @show_details %>
-				<h3><%= _('Admin Details') %></h3>
-				<table class="dmp_table">
-					<thead>
-						<tr>
-							<th class="dmp_th_medium"><%= _('Title')%></th>
-							<th class="dmp_th_big"><%= _('Description')%></th>
-						</tr>
-					</thead>
-					<tbody>
-					<%
-						details.each do |field|
-							value = @exported_plan.send(field)
-					%>
-						<tr>
-							<th class="dmp_th_border"><p>- <%= admin_field_t(field.to_s) -%></p></th>
-							<td class="dmp_td_border"><%= value.present? ? value : _('-') %></td>
-						</tr>
-						<% end %>
-					</tbody>
-				</table>
-		 <% end %>
-			<% @sections.each do |section| %>
-		   	<h3><%= section.title %></h3>
-		   	<table class="dmp_table">
-  				<thead>
-			    	<tr>
+  <h1><%= @plan.title %></h1>
+  <h2><%= @plan.template.title %></h2>
+  <div class="dmp_details_body">
+    <div class="dmp_details">
+      <% details = @exported_plan.admin_details %>
+      <% if details.present?  && @show_details %>
+        <h3><%= _('Admin Details') %></h3>
+        <table class="dmp_table">
+          <thead>
+            <tr>
+              <th class="dmp_th_medium"><%= _('Title')%></th>
+              <th class="dmp_th_big"><%= _('Description')%></th>
+            </tr>
+          </thead>
+          <tbody>
+          <%
+            details.each do |field|
+              value = @exported_plan.send(field)
+          %>
+            <tr>
+              <th class="dmp_th_border"><p>- <%= admin_field_t(field.to_s) -%></p></th>
+              <td class="dmp_td_border"><%= value.present? ? value : _('-') %></td>
+            </tr>
+            <% end %>
+          </tbody>
+        </table>
+     <% end %>
+      <% @sections.each do |section| %>
+        <h3><%= section.title %></h3>
+        <table class="dmp_table">
+          <thead>
+            <tr>
               <% if @question_headings %>
-		      		<th class="dmp_th_medium"><%= _('Questions')%></th>
+              <th class="dmp_th_medium"><%= _('Questions')%></th>
               <% end %>
-		      		<th class="dmp_th_big"><%= _('Answers')%></th>
- 						</tr>
-					</thead>
-					<tbody>
-						<% section.questions.order(:number).each do |question| %>
-						<tr>
+              <th class="dmp_th_big"><%= _('Answers')%></th>
+            </tr>
+          </thead>
+          <tbody>
+            <% section.questions.order(:number).each do |question| %>
+            <tr>
               <% answer = @plan.answer(question.id, false) %>
               <% if !@unanswered_questions && answer.blank?
                   next # skip unanswered questions
                 end %>
               <% if @question_headings %>
-							<th class="dmp_th_border" >
-								<p>- <%= raw question.text %></p>
-							</th>
+              <th class="dmp_th_border" >
+                <p>- <%= raw question.text %></p>
+              </th>
               <% end %>
-    					<td class="dmp_td_border" >
-								<% if answer.nil? %>
-									<p><%= _('Question not answered') %></p>
-								<% else %>
+              <td class="dmp_td_border" >
+                <% if answer.nil? %>
+                  <p><%= _('Question not answered') %></p>
+                <% else %>
                   <% q_format = question.question_format %>
-									<% if q_format.option_based? %>
-  									<ul>
-											<% answer.question_options.each do |option| %>
-												<li><%= option.text %></li>
-											<% end %>
-										</ul>
+                  <% if q_format.option_based? %>
+                    <ul>
+                      <% answer.question_options.each do |option| %>
+                        <li><%= option.text %></li>
+                      <% end %>
+                    </ul>
                     <% if question.option_comment_display == true %>
                       <%= raw answer.text %>
                     <% end %>
-									<% else%>
+                  <% else%>
                     <%= raw answer.text %>
                   <% end%>
-								<% end %>
-							</td>
-						</tr>
-						<% end %>
-					</tbody>
-				</table>
-			<% end %> <!-- end @exported_plan.sections.each -->
-		</div>
-	</div>
+                <% end %>
+              </td>
+            </tr>
+            <% end %>
+          </tbody>
+        </table>
+      <% end %> <!-- end @exported_plan.sections.each -->
+    </div>
+  </div>
 </div>
\ No newline at end of file
diff --git a/app/views/settings/phases/_export_formatting_form.html.erb b/app/views/settings/phases/_export_formatting_form.html.erb
index 91b1bb8..3633722 100644
--- a/app/views/settings/phases/_export_formatting_form.html.erb
+++ b/app/views/settings/phases/_export_formatting_form.html.erb
@@ -1,5 +1,5 @@
 <%
-   
+   @export_settings ||= plan.settings(:export)
    admin_settings = @export_settings.fields[:admin]
    question_settings = @export_settings.fields[:questions] || :all
    filename = @export_settings.title.present? ? @export_settings.title : plan.title
@@ -72,11 +72,43 @@
         <% end %>
     </ol>
   </fieldset>
-  
+  <div id="pdf-format-options">
+    <h3><%= _('PDF Formatting') %></h3>
+    <fieldset class="font">
+      <legend><%= _('Font') -%></legend>
+      <div>
+      <%= label_tag("export[formatting][font_face]", _('Face')) %>
+      <%= select_tag("export[formatting][font_face]", options_for_select(Settings::Template::VALID_FONT_FACES, @export_settings.formatting[:font_face]), { "data-default" => plan.template.settings(:export).formatting[:font_face] }) %>
+      </div>
+      <div>
+        <%= label_tag("export[formatting][font_size]", _('Size') + " (pt)") %>
+        <%= select_tag("export[formatting][font_size]", options_for_select(Settings::Template::VALID_FONT_SIZE_RANGE.to_a, @export_settings.formatting[:font_size]), { "data-default" => plan.template.settings(:export).formatting[:font_size] }) %>
+      </div>
+    </fieldset>
+    <fieldset class="margins">
+      <legend><%= _('Margin') -%> (mm)</legend>
+        <div>
+          <%= label_tag("export[formatting][margin][top]", _('Top')) %>
+          <%= select_tag("export[formatting][margin][top]", options_for_select(Settings::Template::VALID_MARGIN_RANGE.to_a, @export_settings.formatting[:margin][:top]), { "data-default" => plan.template.settings(:export).formatting[:margin][:top] }) %>
+        </div>
+        <div>
+          <%= label_tag("export[formatting][margin][bottom]", _('Bottom')) %>
+          <%= select_tag("export[formatting][margin][bottom]", options_for_select(Settings::Template::VALID_MARGIN_RANGE.to_a, @export_settings.formatting[:margin][:bottom]), { "data-default" => plan.template.settings(:export).formatting[:margin][:bottom] }) %>
+        </div>
+        <div>
+          <%= label_tag("export[formatting][margin][left]", _('Left')) %>
+          <%= select_tag("export[formatting][margin][left]", options_for_select(Settings::Template::VALID_MARGIN_RANGE.to_a, @export_settings.formatting[:margin][:left]), { "data-default" => plan.template.settings(:export).formatting[:margin][:left] }) %>
+        </div>
+        <div>
+          <%= label_tag("export[formatting][margin][right]", _('Right')) %>
+          <%= select_tag("export[formatting][margin][right]", options_for_select(Settings::Template::VALID_MARGIN_RANGE.to_a, @export_settings.formatting[:margin][:right]), { "data-default" => plan.template.settings(:export).formatting[:margin][:rigth] }) %>
+        </div>
+    </fieldset>
+  </div>
   <div class="div_right">
     <%= submit_tag(_('Reset'), class: "btn btn-primary", role:'button') %>
     <%= submit_tag(_('Save'), class: "btn btn-primary", "data-toggle" => "collapse", "data-target" => "#settings-accordion-plan-#{plan.template.id}", role:"button") %>
   </div>
   <span class="label label-inverse unsaved_changes_alert" style="display:none;"><%= _('Unsaved changes') %></span>
   <div class="div_clear"> </div>
-<% end %>
+<% end %>
\ No newline at end of file