diff --git a/app/views/plans/index.html.erb b/app/views/plans/index.html.erb
index a4ba9b4..edbffd5 100644
--- a/app/views/plans/index.html.erb
+++ b/app/views/plans/index.html.erb
@@ -99,7 +99,6 @@
   
   <div>
     <a href="<%= new_plan_path %>" class="link-as-button"><%= _('Create plan') %></a>
-    <a href="<%= new_plan_path %>?test=true" class="left-indent"><%= _('Create test plan') %></a>
   </div>
 </div>
 
diff --git a/app/views/plans/new.html.erb b/app/views/plans/new.html.erb
index d10fff2..eea3a57 100644
--- a/app/views/plans/new.html.erb
+++ b/app/views/plans/new.html.erb
@@ -7,33 +7,30 @@
 </p>
 
 <div class="content">
-  <%= form_for @plan, html: {method: :post, class: "roadmap-form"}, remote: true do |f| %>
+  <%= form_for @plan, html: {method: :post, class: "roadmap-form padded bordered"}, remote: true do |f| %>
     <div id="create_plan">
 
       <!-- Plan name section -->
-      <fieldset class="standard padded bordered">
+      <fieldset class="standard">
         <legend><%= _('What research project are you planning?') %></legend>
         
-        <div class="form-left-side left-indent">
-          <label for="plan_title">
-            <%= _('Project title') %>
-          </label>
-  
+        <div class="form-left-side">
           <input type="text" id="plan_title" name="plan[title]" class="left-indent" 
                  data-toggle="tooltip" 
-                 data-content="<%= _('If applying for funding, state the title exactly as in the proposal.') %>" />
+                 data-content="<%= _('If applying for funding, state the project title exactly as in the proposal.') %>" />
+
+          <input type="checkbox" id="is_test" class="left-indent" />
+          <label class="inline checkbox-label" for="is_test">
+            <%= _('mock project for testing, practice, or educational purposes') %>
+          </label>
         </div>
       </fieldset>
 
       <!-- Organisation selection -->
-      <fieldset class="standard padded bordered">
-        <legend><%= _('Primary research organisation') %></legend>
+      <fieldset class="standard">
+        <legend><%= _('Select the primary research organisation') %></legend>
       
-        <div class="form-left-side left-indent">
-          <label for="plan_org_name">
-            <%= _('Select the primary research organisation responsible') %>
-          </label>
-      
+        <div class="form-left-side">
           <%= render partial: "shared/accessible_combobox", 
                      locals: {name: 'plan[org_name]',
                               id: 'plan_org_name',
@@ -55,14 +52,10 @@
       </fieldset>
     
       <!-- Funder selection -->
-      <fieldset class="standard padded bordered">
-        <legend><%= _('Funding organisation') %></legend>
+      <fieldset class="standard">
+        <legend><%= _('Select the primary funding organisation') %></legend>
       
-        <div class="form-left-side left-indent">
-          <label for="plan_funder_name">
-            <%= _('Select the funding organisation') %>
-          </label>
-      
+        <div class="form-left-side">
           <%= render partial: "shared/accessible_combobox", 
                      locals: {name: 'plan[funder_name]',
                               id: 'plan_funder_name',
@@ -81,20 +74,24 @@
       </fieldset>
 
       <!-- Template selection -->
-      <fieldset class="standard padded bordered" id="available-templates">
+      <fieldset class="standard" id="available-templates">
       </fieldset>
     
     </div>
     
-    <input type="hidden" id="plan_template_id" name="plan[template_id]"></input>
-    <input type="hidden" id="plan_visibility" name="plan[visibility" value="<%= @is_test ? 'is_test' : Rails.application.config.default_plan_visibility %>"></input>
+    <fieldset class="standard" id="available-templates">
+      <div class="form-left-side">
+        <input type="hidden" id="plan_template_id" name="plan[template_id]"></input>
+        <input type="hidden" id="plan_visibility" name="plan[visibility" value="<%= @is_test ? 'is_test' : Rails.application.config.default_plan_visibility %>"></input>
     
-    <%= render partial: 'shared/accessible_submit_button',
-               locals: {id: 'create_plan_submit', 
-                        val: 'Create Plan', 
-                        disabled_initially: true,
-                        tooltip: _('You can not continue until you have filled in all of the required information.')} %>
-
+        <%= render partial: 'shared/accessible_submit_button',
+                   locals: {id: 'create_plan_submit', 
+                            val: 'Create Plan', 
+                            disabled_initially: true,
+														classes: "left-indent",
+                            tooltip: _('You can not continue until you have filled in all of the required information.')} %>
+      </div>
+    </fieldset>
   <% end %>
 </div>
 
diff --git a/lib/assets/javascripts/views/plans/new.js b/lib/assets/javascripts/views/plans/new.js
index 5e97d3e..968caa9 100644
--- a/lib/assets/javascripts/views/plans/new.js
+++ b/lib/assets/javascripts/views/plans/new.js
@@ -1,11 +1,19 @@
 $(document).ready(function(){
   $("#available-templates").hide();
 
+  var defaultVisibility = $("#plan_visibility").val();
+
   // 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 user checks the 'mock project' box we need to set the 
+  // visibility to 'is_test'
+  $("#is_test").click(function(){
+    $("#plan_visibility").val(($(this)[0].checked ? 'is_test' : defaultVisibility));
+  });
+
   // When the hidden org and funder id fields change toogle the submit button
   $("#plan_org_id, #plan_funder_id").change(function(){
     handleComboboxChange();
diff --git a/lib/assets/stylesheets/dmproadmap/forms.scss b/lib/assets/stylesheets/dmproadmap/forms.scss
index 9b2ce0e..d463dd8 100644
--- a/lib/assets/stylesheets/dmproadmap/forms.scss
+++ b/lib/assets/stylesheets/dmproadmap/forms.scss
@@ -105,6 +105,7 @@
     }
 
     .checkbox-label {
+      font-weight: normal;
       display: inline-block;
       margin-left: 5px;
     }
@@ -533,7 +534,7 @@
 /* ------------------------------------------------ */
 #connect-orcid-button{
   border: 1px solid #D3D3D3;
-  padding: 5px 10px 5px 20px;
+  padding: 5px 5px 5px 20px;
   background-color: #fff;
   border-radius: 8px;
   box-shadow: 1px 1px 3px #999;
@@ -546,7 +547,7 @@
   vertical-align: right;
   background-image: url('http://orcid.org/sites/default/files/images/orcid_16x16.png');
   background-repeat: no-repeat;
-  background-position: 2px;
+  background-position: left 5px;
 }
 
 #connect-orcid-button:hover{