diff --git a/app/views/plans/_dropdowns_new_plan.html.erb b/app/views/plans/_dropdowns_new_plan.html.erb
deleted file mode 100644
index c7e9d7e..0000000
--- a/app/views/plans/_dropdowns_new_plan.html.erb
+++ /dev/null
@@ -1,41 +0,0 @@
-<!-- Dropdown funder menu and 'create plan' button -->
-
-<%= semantic_form_for @plan, url: plans_path(@plan) 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-down so we can determine what questions and guidance should be displayed in your plan.</p>")%></p>
-      </div>
-
-      <!-- drop down selecting template, org etc -->
-      <div class="dropdowns">
-
-        <!-- funder template dropdown -->
-        <div class="control-group" id="funder-control-group">
-          <div class="controls">
-            <%= f.input :funder_id,
-                :as => :select,
-                :collection => @funders,
-                :label => _('Select your research funder or no funder, as appropariate.'),
-                :input_html => { :multiple => false, :class => ["select2", "select2-container"] },
-                :include_blank =>  _('Select Funder') %>
-
-          <div class="div_clear"></div>
-        </div>   <!-- funder-control-group -->
-
-      </div>   <!-- dropdowns -->
-    </div>   <!-- createa-project -->
-  <% end %>  <!-- f.inputs -->
-
-  <!-- submit buttons -->
-  <%= f.actions do %>
-    <%= f.action :submit,
-    :as => :button,
-    :input_html => { :id => "create-plan-button", :class => "btn btn-primary"},
-    :label => _('Create plan') %>
-  <% end %>   <!-- f.actions -->
-
-<% end %>   <!-- semantic form -->
diff --git a/app/views/plans/new.html.erb b/app/views/plans/new.html.erb
index 81d824c..f1aebc4 100644
--- a/app/views/plans/new.html.erb
+++ b/app/views/plans/new.html.erb
@@ -1,10 +1,60 @@
-<% javascript "projects.js" %>
+<% javascript "new_plan.js" %>
 
-<div class="new-plan-container">
-    <p><%= @error %></p>
-        <!-- render dropdowns for plan selection -->
-    <%= render "dropdowns_new_plan" %>
+<div class="main">
+  <h1><%= _('Create a new plan') %></h1>
 
+  <p>
+		<%= _("Before you get started, we need to ask a few questions to set you up with the best DMP template for your needs.") %>
+	</p>
+
+	<form source="<%= plans_path %>" method="POST">
+		<fieldset class="white-fieldset">
+			<h3><%= _('Where will the research be conducted?') %></h3>
+			
+			<label for="plan_org_id">
+				<%= _('Select the primary research organisation responsible') %>
+			</label>
+			<input type="text" name="plan[org_id]" id="plan_org_id" 
+						 class="js-combobox" list="orgs" 
+						 data-combobox-prefix-class="combobox"
+						 data-combobox-case-sensitive="no"
+						 data-combobox-search-option="containing" />
+			<datalist id="orgs">
+				<% @orgs.each do |org| %>
+					<option value="<%= org.name %>" />
+				<% end %>
+			</datalist>
+			
+			<input type="checkbox" id="plan_no_org">
+			<span class="checkbox-label">
+				<%= _('My research organization is not on the list or no research organization is associated with this plan')%>
+			</span>
+		</fieldset>
+		
+		<fieldset class="white-fieldset">
+			<h3><%= _('Who will fund the research?') %></h3>
+			
+			<label for="plan_funder_id">
+				<%= _('Select the funding organisation') %>
+			</label>
+			<input type="text" name="plan[funder_id]" id="plan_funder_id" 
+						 class="js-combobox" list="funders" 
+						 data-combobox-prefix-class="combobox"
+						 data-combobox-case-sensitive="no"
+						 data-combobox-search-option="containing" />
+			<datalist id="funders">
+				<% @funders.each do |funder| %>
+					<option value="<%= funder.name %>" />
+				<% end %>
+			</datalist>
+			
+			<input type="checkbox" id="plan_no_funder">
+			<span class="checkbox-label">
+				<%= _('No funder associated with this plan')%>
+			</span>
+		</fieldset>
+		
+		<input type="submit" value="<%= _('Create Plan') %>" class="form-submit" />
+	</form>
 </div>
 
-
diff --git a/config/application.rb b/config/application.rb
index bae1b99..f03a36f 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -74,6 +74,7 @@
     config.assets.precompile += %w(jquery.tablesorter.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(admin.js)
     config.assets.precompile += %w(admin.css)