diff --git a/app/controllers/plans_controller.rb b/app/controllers/plans_controller.rb
index a687531..3dea892 100644
--- a/app/controllers/plans_controller.rb
+++ b/app/controllers/plans_controller.rb
@@ -33,7 +33,7 @@
     @plan = Plan.new
     authorize @plan
     
-    @plan.principal_investigator = current_user.name
+    @plan.principal_investigator = current_user.surname.blank? ? nil : "#{current_user.firstname} #{current_user.surname}"
     @plan.data_contact = current_user.email
     @plan.funder_name = plan_params[:funder_name]
     
@@ -80,7 +80,7 @@
         flash[:notice] = msg
         
         respond_to do |format|
-          format.js { render js: "window.location='#{plan_url(@plan)}'" }
+          format.js { render js: "window.location='#{plan_url(@plan)}?editing=true'" }
         end
         
       else
@@ -102,7 +102,7 @@
     @editing = (!params[:editing].nil? && @plan.administerable_by?(current_user.id))
     @all_guidance_groups = @plan.get_guidance_group_options
     @selected_guidance_groups = @plan.guidance_groups.pluck(:id)
-    @based_on = @plan.base_template
+    @based_on = (@plan.template.customization_of.nil? ? @plan.template : Template.live(@plan.template.customization_of))
 
     respond_to :html
   end
diff --git a/app/models/plan.rb b/app/models/plan.rb
index 8a01638..8c8d3c7 100644
--- a/app/models/plan.rb
+++ b/app/models/plan.rb
@@ -1111,8 +1111,8 @@
   # --------------------------------------------------------
   def set_creation_defaults
     # Only run this before_validation because rails fires this before save/create
-    if self.id.nil?
-      self.title = "My plan (#{self.template.title})" if self.title.nil?
+    if self.id.nil? 
+      self.title = "My plan (#{self.template.title})" if self.title.nil? && !self.template.nil?
       self.visibility = 1
     end
   end
diff --git a/app/views/plans/_available_templates.html.erb b/app/views/plans/_available_templates.html.erb
index acdd409..90c4878 100644
--- a/app/views/plans/_available_templates.html.erb
+++ b/app/views/plans/_available_templates.html.erb
@@ -1,10 +1,10 @@
-<h3><%= _('Which DMP template would you like to use?') %></h3>
+<legend><%= _('Which DMP template would you like to use?') %></legend>
 
-<label for="plan_template_title">
+<label for="plan_template_selector">
   <%= _('Select a template') %>
 </label>
 
-<select id="plan_template_id" name="plan[template_id]" class="left-indent input-large">
+<select id="plan_template_selector" class="left-indent input-large">
   <option value=""><%= _('Please select one') %></option>
   <%= raw @templates.collect{|t| "<option value=\"#{t.id}\">#{t.title}</option>" }.join('') %>
 </select>
@@ -14,7 +14,7 @@
 </div>
 
 <script type="text/javascript">
-  $("#plan_template_id").change(function(){
-    $(".form-submit").prop('disabled', false);
+  $("#plan_template_selector").change(function(){
+    $("#plan_template_id").val($(this).val()).change();
   });
 </script>
\ No newline at end of file
diff --git a/app/views/plans/_plan_details.html.erb b/app/views/plans/_plan_details.html.erb
index 4991edf..c1220b4 100644
--- a/app/views/plans/_plan_details.html.erb
+++ b/app/views/plans/_plan_details.html.erb
@@ -69,7 +69,7 @@
   <!-- the viewing div -->
   <div class="show-plan-details <%= if @editing then "project-hide" end %> ">
       <div class="div_left">
-        <p> <%= _('This page gives you an overview of your plan. It tells what your plan is based on and gives an overview of the questions that you will be asked.')%> </p>
+        <p></p>
       </div>
 
       <!-- edit plan button -->
@@ -179,126 +179,117 @@
 
   <div class="div_clear"></div>
 
-	<h3><%= _('This plan is based on:')%></h3>
+  <h3><%= _('This plan is based on:')%></h3>
 
-	<table class="dmp_details_table">
-    <tbody>
-      <%if based_on.present? %> 
-        <tr>
-          <td class="first"><%= _('Funder') %></td>
-          <td><%= based_on.org.name %></td>
-        </tr>
-      <%end%>
-      <%if plan.template.org.name.present? %> 
-        <tr>
-          <td class="first"><%= _('Institution') %></td>
-          <td><%= plan.template.org.name %></td>
-        </tr>
-      <%end%>
-    </tbody>
-	</table>
+  <p>
+    <% if based_on.org != plan.template.org %>
+      <%= _('A version of ') %> "<%= based_on.title %>" <%= based_on.title.downcase.include?(_('template')) ? '' : _('template') %><%= _(' that has been customised by ') %> <%= plan.template.org.name %>
+    <% else %>
+      <%= _('The')%> "<%= plan.template.title %>" <%= (plan.template.is_default ? _('generic template') : plan.template.title.downcase.include?(_('template')) ? '' : _('template')) %> <%= _(' provided by ') %><%= plan.template.org.name %>
+    <% end %>
+  </p>
 
   <div class="div_clear"></div>
 
-	<!-- If project has phases-->
+  <!-- If project has phases-->
   <% phases = plan.template.phases %>
-		<% if phases.count == 1 %>
-			<% phases.each do |phase| %>
-				<div class="move_2_right">
-					<%= link_to _('Answer questions'), edit_plan_phase_path(plan,phase), :class => 'btn btn-primary'  %>
-					<a href="#<%= phases[0].id %>-export-dialog" data-toggle="modal" class='btn btn-primary'><%= _('Export') %></a>
-				</div>
-				<%= render :partial => "plans/export", locals: {plan: plan, phase: phases[0] } %>
-				<div class="div_clear"></div>
-				<p><%= raw phase.description %></p>
-				<% if phase.sections.any? %>
-					<table class="dmp_table">
-						<thead>
-						    <tr>
-						      	<th class="dmp_th_medium"><%= _('Sections')%></th>
-						      	<th class="dmp_th_big"><%= _('Questions')%></th>
-		   					</tr>
-	   					</thead>
-	   					<tbody>
-	   						<% phase.sections.each do |section| %>
-								<tr >
-									<th class="dmp_th_border" >
-										<p><%= section.title %></p>
-									</th>
-	        				<td class="dmp_td_border" >
-										<% if section.questions.any? %>
-											<ul class="question_ul">
-												<% section.questions.each do |ques|%>
-													<li>
-														<%= raw ques.text %>
-													</li>
-												<%end%>
-											</ul>
-										<%end%>
-									</td>
-								</tr>
-							<%end%>
-						</tbody>
-					</table>
-				<%end%> <!-- end of if phase.sections.any? -->
-			<%end%> <!-- end of phases.each do |phase| -->
+    <% if phases.count == 1 %>
+      <% phases.each do |phase| %>
+        <div class="move_2_right">
+          <%= link_to _('Answer questions'), edit_plan_phase_path(plan,phase), :class => 'btn btn-primary'  %>
+          <a href="#<%= phases[0].id %>-export-dialog" data-toggle="modal" class='btn btn-primary'><%= _('Export') %></a>
+        </div>
+        <%= render :partial => "plans/export", locals: {plan: plan, phase: phases[0] } %>
+        <div class="div_clear"></div>
+        <p><%= raw phase.description %></p>
+        <% if phase.sections.any? %>
+          <table class="dmp_table">
+            <thead>
+                <tr>
+                    <th class="dmp_th_medium"><%= _('Sections')%></th>
+                    <th class="dmp_th_big"><%= _('Questions')%></th>
+                 </tr>
+               </thead>
+               <tbody>
+                 <% phase.sections.each do |section| %>
+                <tr >
+                  <th class="dmp_th_border" >
+                    <p><%= section.title %></p>
+                  </th>
+                  <td class="dmp_td_border" >
+                    <% if section.questions.any? %>
+                      <ul class="question_ul">
+                        <% section.questions.each do |ques|%>
+                          <li>
+                            <%= raw ques.text %>
+                          </li>
+                        <%end%>
+                      </ul>
+                    <%end%>
+                  </td>
+                </tr>
+              <%end%>
+            </tbody>
+          </table>
+        <%end%> <!-- end of if phase.sections.any? -->
+      <%end%> <!-- end of phases.each do |phase| -->
     <%else%>   <!-- phases.count > 1 -->
-			<div class="project_description">
-				<%= raw plan.template.description %>
-			</div>
-			<% phases.each do |phase| %>
-				<div class="accordion" id="project-accordion">
-					<div class="accordion-group">
-						<div class="accordion-heading">
-							<a class="accordion-toggle" data-toggle="collapse" data-parent="#project-accordion" href="#<%= phase.id %>">
-								<h3><%= phase.title %><span class="plus-laranja"> </span></h3>
-							</a>
-						</div>
-						<div id="<%= phase.id %>" class="accordion-project collapse">
-							<div class="accordion-inner">
-								<div class="div_right">
-									<%= link_to _('Answer questions'), edit_plan_phase_path(plan,phase), :class => 'btn btn-primary'  %>
-									<a href="#<%= phase.id %>-export-dialog" data-toggle="modal" class='btn btn-primary'><%= _('Export') %></a>
-								</div>
-								<%= render :partial => "plans/export", locals: {plan: plan, phase: phase} %>
-								<div class="div_clear"></div>
-									<p><%= raw phase.description %>
-								</p>
+      <div class="project_description">
+        <%= raw plan.template.description %>
+      </div>
+      <% phases.each do |phase| %>
+        <div class="accordion" id="project-accordion">
+          <div class="accordion-group">
+            <div class="accordion-heading">
+              <a class="accordion-toggle" data-toggle="collapse" data-parent="#project-accordion" href="#<%= phase.id %>">
+                <h3><%= phase.title %><span class="plus-laranja"> </span></h3>
+              </a>
+            </div>
+            <div id="<%= phase.id %>" class="accordion-project collapse">
+              <div class="accordion-inner">
+                <div class="div_right">
+                  <%= link_to _('Answer questions'), edit_plan_phase_path(plan,phase), :class => 'btn btn-primary'  %>
+                  <a href="#<%= phase.id %>-export-dialog" data-toggle="modal" class='btn btn-primary'><%= _('Export') %></a>
+                </div>
+                <%= render :partial => "plans/export", locals: {plan: plan, phase: phase} %>
+                <div class="div_clear"></div>
+                  <p><%= raw phase.description %>
+                </p>
 
-								<% if phase.sections.any? %>
-									<table class="dmp_table">
-										<thead>
-										    <tr>
-										      	<th class="dmp_th_medium"><%= _('Sections')%></th>
-										      	<th class="dmp_th_big"><%= _('Questions')%></th>
-						   					</tr>
-					   					</thead>
-					   					<tbody>
-					   						<% phase.sections.each do |section| %>
-												<tr >
-													<th class="dmp_th_border" >
-														<p><%= section.title %></p>
-													</th>
-					        				<td class="dmp_td_border" >
-														<% if section.questions.any? %>
-															<ul class="question_ul">
-																<% section.questions.each do |ques|%>
-																	<li>
-																		- <%= raw ques.text %>
-																	</li>
-																<%end%>
-															</ul>
-														<%end%>
-													</td>
-												</tr>
-											<%end%>
-										</tbody>
-									</table>
-								<%end%> <!-- end of if phase.sections.any? -->
-							</div>
-						</div>
-					</div>
-				</div>
-			<%end%><!-- end of phases.each
-		<%end%> <!-- end of if phases.count == 1 -->
+                <% if phase.sections.any? %>
+                  <table class="dmp_table">
+                    <thead>
+                        <tr>
+                            <th class="dmp_th_medium"><%= _('Sections')%></th>
+                            <th class="dmp_th_big"><%= _('Questions')%></th>
+                         </tr>
+                       </thead>
+                       <tbody>
+                         <% phase.sections.each do |section| %>
+                        <tr >
+                          <th class="dmp_th_border" >
+                            <p><%= section.title %></p>
+                          </th>
+                          <td class="dmp_td_border" >
+                            <% if section.questions.any? %>
+                              <ul class="question_ul">
+                                <% section.questions.each do |ques|%>
+                                  <li>
+                                    - <%= raw ques.text %>
+                                  </li>
+                                <%end%>
+                              </ul>
+                            <%end%>
+                          </td>
+                        </tr>
+                      <%end%>
+                    </tbody>
+                  </table>
+                <%end%> <!-- end of if phase.sections.any? -->
+              </div>
+            </div>
+          </div>
+        </div>
+      <%end%><!-- end of phases.each
+    <%end%> <!-- end of if phases.count == 1 -->
 </div>
diff --git a/app/views/plans/create.js.erb b/app/views/plans/create.js.erb
index aed2a41..11be185 100644
--- a/app/views/plans/create.js.erb
+++ b/app/views/plans/create.js.erb
@@ -1,16 +1,16 @@
-$("#available-templates").html("").hide();
+$("#available-templates").fadeOut();
 
 <% if @templates.nil? %>
   $(".main_page_content").prepend('<p id="main-page-alert" class="alert alert-notice" style="display:none"><p class="alert alert-notice"><%= raw notice %></p></p>');
-  $(".form-submit").prop("disabled", true);
-	
+
 <% elsif @templates.count > 1 %>
   // Clear the existing contents of the modal and then display template combobox
   $("#available-templates").html("<%= escape_javascript(render partial: 'available_templates') %>").fadeIn(); 
-  $(".form-submit").prop("disabled", true);
 
 <% else %>
   // Only one template so fill in the id
-  $("#available-templates").html('<input type="hidden" id="plan_template_id" name="plan[template_id]" value="<%= @templates.first.id %>" />');
-  $(".form-submit").prop("disabled", false);
-<% end %>
\ No newline at end of file
+  $("#plan_template_id").val("<%= @templates.first.id %>");
+<% end %>
+
+// Force the submit button toggle
+$("#plan_template_id").change();
\ No newline at end of file
diff --git a/app/views/plans/new.html.erb b/app/views/plans/new.html.erb
index 9651ce1..bce407a 100644
--- a/app/views/plans/new.html.erb
+++ b/app/views/plans/new.html.erb
@@ -1,4 +1,4 @@
-<% javascript "new_plan.js" %>
+<% javascript "plans/create_plan.js" %>
 
 <div class="main">
   <h1><%= _('Create a new plan') %></h1>
@@ -12,23 +12,21 @@
 
       <!-- Plan name section -->
       <fieldset class="white-fieldset">
-        <h3><%= _('What research project are you planning?') %></h3>
+        <legend><%= _('What research project are you planning?') %></legend>
         
         <label for="plan_title">
           <%= _('Project title') %>
         </label>
-        
-        <% default_name = (current_user.firstname.blank? ? _('My Plan') : current_user.firstname + "'s" + _(" Plan")) %>
-        <input type="text" id="plan_title" name="plan[title]" placeholder="<%= default_name %>" 
-               class="left-indent input-large" />
-        <div class="left-indent">
+  
+        <input type="text" id="plan_title" name="plan[title]" class="input-large left-indent" />
+        <div class="left-indent" aria-describedby="org-tip" required>
           <%= _('If applying for funding, state the title exactly as in the proposal.') %>
         </div>
       </fieldset>
 
       <!-- Organisation selection -->
       <fieldset class="white-fieldset">
-        <h3><%= _('Where will the research be conducted?') %></h3>
+        <legend><%= _('Primary research organisation') %></legend>
       
         <label for="plan_org_name">
           <%= _('Select the primary research organisation responsible') %>
@@ -43,16 +41,17 @@
                             classes: 'input-large'} %>
       
         <input type="checkbox" id="plan_no_org">
-        <span class="checkbox-label">
-          <%= _('My research organization is not on the list') %>
+
+        <label for="plan_no_org" class="checkbox-label">
+          <%= _('My research organisation is not on the list') %>
           <em><%= _(' or ') %></em>
-          <%= _('no research organization is associated with this plan')%>
-        </span>
+          <%= _('no research organisation is associated with this plan')%>
+        </label>
       </fieldset>
     
       <!-- Funder selection -->
       <fieldset class="white-fieldset">
-        <h3><%= _('Who will fund the research?') %></h3>
+        <legend><%= _('Funding organisation') %></legend>
       
         <label for="plan_funder_name">
           <%= _('Select the funding organisation') %>
@@ -67,9 +66,9 @@
                             classes: 'input-large'} %>
                                                                  
         <input type="checkbox" id="plan_no_funder" />
-        <span class="checkbox-label">
+        <label for="plan_no_funder" class="checkbox-label">
           <%= _('No funder associated with this plan')%>
-        </span>
+        </label>
       </fieldset>
 
       <!-- Template selection -->
@@ -78,7 +77,11 @@
     
     </div>
     
-    <input type="submit" class="form-submit" value="<%= _('Create Plan') %>" />
+    <input type="hidden" id="plan_template_id" name="plan[template_id]"></input>
+    
+    <%= render partial: 'shared/accessible_submit_button',
+               locals: {id: 'create_plan_submit', val: 'Create Plan', disabled_initially: false} %>
+
   <% end %>
 </div>
 
diff --git a/app/views/projects/_dropdowns_new_project.html.erb b/app/views/projects/_dropdowns_new_project.html.erb
deleted file mode 100644
index f9a91ce..0000000
--- a/app/views/projects/_dropdowns_new_project.html.erb
+++ /dev/null
@@ -1,110 +0,0 @@
-<!-- Create a new project (3 dropdowns = 6 options) -->
-<%= semantic_form_for @project, :url => {:controller => :projects, :action => :create }, :html=>{:method=>:post} do |f| %>
-	<%= f.inputs do %>
-        <%= hidden_field_tag :default_tag, "false" ,:id => "default_tag" %>
-		<div class="createa-project">
-			<h1> <%= _('Create a new plan')%> </h1>
-			<div class="info-new-project">
-				<p><%= raw _("<p>Please select from the following drop-downs so we can determine what questions and guidance should be displayed in your plan.</p> <p>If you aren't responding to specific requirements from a funder or an institution, <a id='create-default-plan-button' data-toggle='modal' href='#default-template-confirmation-dialog'>select here to write a generic DMP</a> based on the most common themes.</p>")%></p>
-
-			</div>
-			<div class="dropdowns">
-				<div class="control-group" id="funder-control-group">
-					<div class="controls">
-						<%= f.input :funder_id, :as => :select, :collection => @funders, :label => _('If applying for funding, select your research funder.'), :input_html => { :multiple => false, :class => ["select2", "select2-container"] }, :include_blank =>  _('Select Funder') %>
-
-						<div class="div_clear"></div>
-
-						<div id="other-funder-link" class="move_2_right">
-							<a href='#' id="no-funder"><%= _('Not applicable/not listed.')%></a>
-						</div>
-						<div class="create_project_question_descriptions">
-							<%= _('Otherwise leave blank.')%>
-						</div>
-					</div>
-					<div class="div_clear"></div>
-					<div id="other-funder-name" class="controls" style="display:none;">
-						<%= f.input :funder_name, :as => :string, :placeholder => _('Funder name'), :label => _('Name of funder, if applicable.') %>
-					</div>
-				</div>
-				<div class="control-group" id="institution-control-group">
-					<div class="controls">
-						<%= f.input :institution_id, :as => :select, :collection => @institutions, :label => _('To see institutional questions and/or guidance, select your organisation.'), :input_html => { :multiple => false, :class => ["select2", "select2-container", "typeahead"] }, :include_blank =>  _('Select Organisation')  %>
-						<div class="div_clear"></div>
-						<div class="move_2_right">
-							<a href='#' id="no-institution"><%= _('Not applicable/not listed.')%></a>
-						</div>
-						<div class="create_project_question_descriptions">
-							<%= _('You may leave blank or select a different organisation to your own.')%>
-						</div>
-					</div>
-				</div>
-				<div class="control-group" id="template-control-group">
-					<div class="controls">
-						<li id="project_dmptemplate_id_input" class="select input optional">
-							<label for="project_dmptemplate_id" class="label">
-								<%= _('Choose a template') %>
-							</label>
-							<select id="project_dmptemplate_id" name="project[dmptemplate_id]" class="select2 select2-container typeahead"></select>
-							<div class="create_project_question_descriptions">
-								<%= _('There are a number of possible templates you could use. Please choose one.') %>
-							</div>
-						</li>
-					</div>
-				</div>
-				<div class="control-group" id="guidance-control-group">
-					<div class="controls">
-						<% other_guidance = GuidanceGroup.all %>
-						<%= f.input :guidance_groups, :as => :check_boxes, :collection => other_guidance, :label => _('Tick to select any other sources of guidance you wish to see.'), :member_label => :display_name %>
-					</div>
-				</div>
-			</div>
-		</div>
-		
-		<% # 
-		   # The following JSON arrays are used to build/filter the contents of
-			 # the select2 dropdown box for dmptemplates and the checkboxes for
-			 # the guidance group selections 
-			 #    (they are referenced in /app/assets/javascripts/projects.js)
-		   # %>
-		
-		<%= hash_to_js_json_variable('funders', 
-			@funders.collect{ |inst| 
-				{'id': inst.id, 
-				 'text': inst.name} 
-		}) %>
-		
-		<%= hash_to_js_json_variable('institutions', 
-			@institutions.collect{ |inst| 
-				{'id': inst.id, 
-				 'text': inst.name,
-				 'default': (current_user.org.id == inst.id)} 
-		}) %>
-		
-		<%= hash_to_js_json_variable('templates', 
-			@templates.collect{ |tmplt| 
-				{'organisation': tmplt.organisation_id, 
-				 'id': tmplt.id, 
-				 'text': tmplt.title} 
-		}) %>
-		
-		<%= hash_to_js_json_variable('guidance_for_template_or_organisation',
-			@guidance_groups.collect{ |grp| 
-				{'organisation': grp.organisation_id,
-				 'templates': grp.dmptemplates.collect{ |t| t.id }, 
-				 'id': grp.id, 
-				 'text': grp.name} 
-		}) %>
-		
-		<%= hash_to_js_json_variable('guidance_always_available',
-			@always_guidance.collect{ |grp|
-				{'id': grp.id, 
-				 'text': grp.name} 
-		}) %>
-		
-	<% end %>
-	<!-- submit buttons -->
-	<%= f.actions do %>
-		<a id="create-plan-button" style="display:none;" data-toggle="modal" href="#project-confirmation-dialog" class="btn btn-primary"><%= _('Create plan')%></a>
-	<% end %>
-<% end %>
diff --git a/app/views/shared/_accessible_combobox.html.erb b/app/views/shared/_accessible_combobox.html.erb
index 7eb94e3..c2f99e0 100644
--- a/app/views/shared/_accessible_combobox.html.erb
+++ b/app/views/shared/_accessible_combobox.html.erb
@@ -7,6 +7,7 @@
          data-combobox-prefix-class="combobox"
          data-combobox-case-sensitive="no"
          data-combobox-search-option="containing"
+         data-combobox-allow-suggestion-on-empty="true"
          value="<%= default_selection[attribute] unless default_selection.nil? %>" />
   <datalist id="<%= id %>_list">
     <% models.each do |model| %>
@@ -50,7 +51,7 @@
       }).change(function(){
         $(clear).css("display", $(combo).val().trim().length <= 0 ? 'none' : 'inline');
       });
-  
+
       // Hide the clear button if it gets clicked
       // -------------------------------------------------------------
       $(clear).click(function(){
diff --git a/app/views/shared/_accessible_submit_button.html.erb b/app/views/shared/_accessible_submit_button.html.erb
new file mode 100644
index 0000000..fcf38f5
--- /dev/null
+++ b/app/views/shared/_accessible_submit_button.html.erb
@@ -0,0 +1,27 @@
+<input id="<%= id %>" 
+       type="submit" 
+       class="form-submit" 
+       clickable="<%= disabled_initially %>"
+       value="<%= val %>"
+       artia-describedby="<%= id %>_tip" />
+
+<div role="tooltip" id="<%= id %>_tip" class="submit-tooltip">
+  <div class="arrow-left"></div>
+  <span class="submit-tooltip-msg">
+    <%= _('You can not continue until you have filled in all of the required information.') %>
+  </span>
+</div>
+
+<script type="text/javascript">
+  $(document).ready(function(){
+    // Allow the 'button disabled' tooltip to appear if the button is NOT clickable
+    $("#<%= id %>").on('click focus', function(e){
+      if($(this).attr('clickable') != 'true'){
+        e.preventDefault();
+        $("#<%= id %>_tip").attr('role', 'tooltip');
+      }else{
+        $("#<%= id %>_tip").attr('role', '');
+      }
+    });
+  });
+</script>
\ No newline at end of file
diff --git a/config/application.rb b/config/application.rb
index 99d62cc..5859929 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -75,7 +75,7 @@
     config.assets.precompile += %w(jquery-accessible-autocomplet-list-aria.js)
     config.assets.precompile += %w(export_configure.js)
     config.assets.precompile += %w(toolbar.js)
-    config.assets.precompile += %w(new_plan.js)
+    config.assets.precompile += %w(plans/create_plan.js)
     config.assets.precompile += %w(admin.js)
     config.assets.precompile += %w(admin.css)
     
diff --git a/lib/assets/javascripts/new_plan.js b/lib/assets/javascripts/new_plan.js
deleted file mode 100644
index 8553b80..0000000
--- a/lib/assets/javascripts/new_plan.js
+++ /dev/null
@@ -1,69 +0,0 @@
-$(document).ready(function(){
-  // Form submit button is disabled until all requirements are met
-  $(".form-submit").prop("disabled", true);
-  $("#available-templates").hide();
-
-  // retrieve the template options and toggle the submit button on page reload
-  handleComboboxChange();
-  handleCheckboxClick("org", $("#plan_no_org").prop("checked"));
-  handleCheckboxClick("funder", $("#plan_no_funder").prop("checked"));
-  
-  // When the hidden org and funder id fields change toogle the submit button
-  $("#plan_org_id, #plan_funder_id").change(function(){
-    handleComboboxChange();
-  });
-
-  // Make sure the checkbox is unchecked if we're entering text
-  $(".js-combobox").keyup(function(){
-    var whichOne = $(this).prop('id').split('_')[1];
-    $("#plan_no_" + whichOne).prop("checked", false);
-  });
-
-  // If the user clicks the no Org/Funder checkbox disable the dropdown 
-  // and hide clear button
-  $("#plan_no_org, #plan_no_funder").click(function(){
-    var whichOne = $(this).prop('id').split('_')[2];
-    handleCheckboxClick(whichOne, this.checked);
-  });
-});
-
-// Only display the submit button if the user has made each decision
-// -------------------------------------------------------------
-function handleComboboxChange(){
-  // If the (no_org checkbox is checked OR an org was selected) AND
-  //        (no_funder checkbox is checked OR a funder was selected)
-  var retrieve = ($("#plan_no_org").prop("checked") || 
-                  $("#plan_org_id").val().trim().length > 0) &&
-                 ($("#plan_no_funder").prop("checked") || 
-                  $("#plan_funder_id").val().trim().length > 0);
-  
-  if(retrieve){
-    $(".form-submit").prop('disabled', false);
-    
-    // If the templates section isn't available then submit the form to find the template options
-    if($("#available_templates").html() == undefined){
-      if(!$("#plan_template_id").val()){
-        $("form").submit();
-      }
-    }
-    
-  }else{
-    $("#available-templates").fadeOut();
-    $("#plan_template_id").val("");
-    
-    $(".form-submit").prop('disabled', true);
-  }
-}
-
-// Clear the combobox and disable it if the box was checked
-// -------------------------------------------------------------
-function handleCheckboxClick(name, checked){
-  $("#plan_" + name + "_name").prop("disabled", checked);
-  if(checked){
-    $("#plan_" + name + "_name").val("");
-    $("#plan_" + name + "_id").val("").change();
-    $("#plan_" + name + "_name").siblings(".combobox-clear-button").hide();
-  }else{
-    $(".form-submit").prop('disabled', true);
-  }
-}
diff --git a/lib/assets/javascripts/plans/create_plan.js b/lib/assets/javascripts/plans/create_plan.js
new file mode 100644
index 0000000..d1d599b
--- /dev/null
+++ b/lib/assets/javascripts/plans/create_plan.js
@@ -0,0 +1,65 @@
+$(document).ready(function(){
+  $("#available-templates").hide();
+
+  // retrieve the template options and toggle the submit button on page reload
+  handleComboboxChange();
+  handleCheckboxClick("org", $("#plan_no_org").prop("checked"));
+  handleCheckboxClick("funder", $("#plan_no_funder").prop("checked"));
+  
+  // When the hidden org and funder id fields change toogle the submit button
+  $("#plan_org_id, #plan_funder_id").change(function(){
+    handleComboboxChange();
+  });
+
+  // Make sure the checkbox is unchecked if we're entering text
+  $(".js-combobox").keyup(function(){
+    var whichOne = $(this).prop('id').split('_')[1];
+    $("#plan_no_" + whichOne).prop("checked", false);
+  });
+
+  // If the user clicks the no Org/Funder checkbox disable the dropdown 
+  // and hide clear button
+  $("#plan_no_org, #plan_no_funder").click(function(){
+    var whichOne = $(this).prop('id').split('_')[2];
+    handleCheckboxClick(whichOne, this.checked);
+  });
+  
+  $("#plan_template_id").change(function(){
+    $("#create_plan_submit").attr('clickable', ($(this).val().trim().length > 0));
+  });
+});
+
+// Only display the submit button if the user has made each decision
+// -------------------------------------------------------------
+function handleComboboxChange(){
+  // If the (no_org checkbox is checked OR an org was selected) AND
+  //        (no_funder checkbox is checked OR a funder was selected) AND
+  //        (the template selector is not visible OR a template has been selected)
+  var retrieve = ($("#plan_no_org").prop("checked") || 
+                  $("#plan_org_id").val().trim().length > 0) &&
+                 ($("#plan_no_funder").prop("checked") || 
+                  $("#plan_funder_id").val().trim().length > 0);
+  
+  if(retrieve){
+    if($("#plan_template_id").val().trim().length <= 0){
+      $("form").submit();
+    }
+    
+  }else{
+    $("#available-templates").fadeOut();
+    $("#plan_template_id").val("");
+  }
+}
+
+// Clear the combobox and disable it if the box was checked
+// -------------------------------------------------------------
+function handleCheckboxClick(name, checked){
+  $("#plan_" + name + "_name").prop("disabled", checked);
+  $("#plan_template_id").val("").change();
+
+  if(checked){
+    $("#plan_" + name + "_name").val("");
+    $("#plan_" + name + "_id").val("").change();
+    $("#plan_" + name + "_name").siblings(".combobox-clear-button").hide();
+  }
+}
diff --git a/lib/assets/stylesheets/dmproadmap.scss b/lib/assets/stylesheets/dmproadmap.scss
index 3b11517..cba11dd 100644
--- a/lib/assets/stylesheets/dmproadmap.scss
+++ b/lib/assets/stylesheets/dmproadmap.scss
@@ -1,8 +1,10 @@
 @import "font-awesome";
 
 $font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+$header-font: "GillSansLight";
 
 $white: #FFF;
+$dark-grey: #333;
 
 $primary-color: #F49700;
 $disabled-button-color: #CCC;
@@ -25,6 +27,15 @@
   width: 110px;
 }
 
+.arrow-left {
+  display: inline-block;
+  width: 0;
+  height: 0;
+  border-top: 12px solid transparent;
+  border-bottom: 12px solid transparent;
+  border-right: 12px solid $dark-grey;
+}
+
 .main_header {
   margin-bottom: 20px;
 }
@@ -54,7 +65,6 @@
 }
 
 .main {
-  
   form {
     .white-fieldset {
       background-color: $white;
@@ -65,8 +75,16 @@
       -moz-border-radius: 10px;
       border-radius: 10px;
       
-      .heading-spacer {
-        height: 35px;
+      legend {
+        font-family: $header-font;
+        color: $primary-color;
+        font-size: 26px;
+        font-weight: normal;
+        text-decoration: none;
+        
+        float: left; /* positions the legend within the fieldset box */
+        padding-top: 20px;
+        border-bottom: none;
       }
       
       label, 
@@ -83,6 +101,48 @@
       input[type="checkbox"] {
         vertical-align: top;
       }
+      
+      .checkbox-label {
+        display: inline-block;
+        margin-left: 5px;
+      }
+    }
+    
+    input.form-submit {
+      background-color: $primary-color;
+      color: $reverse-text;
+      padding: 10px 30px;
+      font-size: 12pt;
+      
+      -webkit-border-radius: 10px;
+      -moz-border-radius: 10px;
+      border-radius: 10px;
+    }
+    input.form-submit[clickable='false'] {
+      background-color: $disabled-button-color;
+    }
+
+    input.form-submit:focus + [role="tooltip"] {
+      display: inline-block;
+    }
+
+    .submit-tooltip {
+      display: none;
+      margin-left: 5px;
+
+      .arrow-left {
+        vertical-align: middle;
+        margin-right: -5px;
+      }
+      .submit-tooltip-msg {
+        color: $white;
+        background-color: $dark-grey;
+        padding: 5px 5px 8px 5px;
+      
+        -webkit-border-radius: 5px;
+        -moz-border-radius: 5px;
+        border-radius: 5px;
+      }
     }
   }
 }
diff --git a/test/functional/plans_controller_test.rb b/test/functional/plans_controller_test.rb
index 1c38f4e..259bfbf 100644
--- a/test/functional/plans_controller_test.rb
+++ b/test/functional/plans_controller_test.rb
@@ -70,36 +70,27 @@
     
     get new_plan_path
     assert_response :success
+    assert assigns(:plan)
     assert assigns(:orgs)
     assert assigns(:funders)
-    assert assigns(:default_org_name)
+    assert assigns(:default_org)
   end
 
   # POST /plans (plans_path)
   # ----------------------------------------------------------
   test "create a new plan" do
-    params = {template_id: @template.id}
+    params = {plan: {org_id: @template.org.id, template_id: @template.id, title: 'Testing Create'}}
     # Should redirect user to the root path if they are not logged in!
-    post plans_path, params
+    post plans_path(format: :js), params
     assert_unauthorized_redirect_to_root_path
     
     sign_in @user
     
-    post plans_path, params
-    assert_equal _('Plan was successfully created.'), flash[:notice]
-    assert_response :redirect
-    assert_redirected_to "#{plan_url(Plan.last)}?editing=true"
+    post plans_path(format: :js), params
+    assert flash[:notice].include?(_('Plan was successfully created.'))
+    assert_response :success
     assert assigns(:plan)
-    assert_equal "#{_('My plan')} (#{@template.title})", Plan.last.title, "expected the record to have been created"
-    
-# TODO: We should also test the various template routes: funder, institution, generic
-    
-# TODO: Reactivate this once the validations on the model are in place!
-    # Invalid object
-#    post plans_path, {plan: {title: nil, template: @template}}
-#    assert flash[:notice].starts_with?(_('Could not create your'))
-#    assert_response :success
-#    assert assigns(:plan)
+    assert_equal "Testing Create", Plan.last.title, "expected the record to have been created"
   end 
 
   # GET /plan/:id (plan_path)
diff --git a/test/functional/users/omniauth_callbacks_controller_test.rb b/test/functional/users/omniauth_callbacks_controller_test.rb
index 9086351..3dca1ca 100644
--- a/test/functional/users/omniauth_callbacks_controller_test.rb
+++ b/test/functional/users/omniauth_callbacks_controller_test.rb
@@ -13,7 +13,7 @@
     @schemes.each do |scheme|
       @callback_uris[scheme.name] = Rails.application.routes.url_helpers.send(
                                                 "user_#{scheme.name.downcase}_omniauth_callback_path")
-      
+
       OmniAuth.config.mock_auth[:"#{scheme.name.downcase}"] = OmniAuth::AuthHash.new({
         :provider => "#{scheme.name.downcase}",
         :uid => 'foo:bar'