diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
index 5bb1386..44733a9 100644
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -91,7 +91,7 @@
                                     id: current_user.identifier_for(scheme)} %>
               </div>
             </div>
-          </div>
+          <% end %>
         <% end %>
 
         <% unless @user.api_token.blank? %>
diff --git a/app/views/orgs/_shibboleth_ds_list.html.erb b/app/views/orgs/_shibboleth_ds_list.html.erb
index c988088..d937b09 100644
--- a/app/views/orgs/_shibboleth_ds_list.html.erb
+++ b/app/views/orgs/_shibboleth_ds_list.html.erb
@@ -8,7 +8,7 @@
         <% letter = org.name[0].capitalize %>
       <% end %>
 
-      <li><a href="#"><%= org.name %></a></li>
+      <li><a href="<%= "#{shibboleth_ds_path}/#{org.id}" %>"><%= org.name %></a></li>
     <% end %>
   </ul>
 </div>
diff --git a/app/views/orgs/shibboleth_ds.html.erb b/app/views/orgs/shibboleth_ds.html.erb
index 4e30c04..86d5b13 100644
--- a/app/views/orgs/shibboleth_ds.html.erb
+++ b/app/views/orgs/shibboleth_ds.html.erb
@@ -48,8 +48,8 @@
   
   <div id="full_list" style="display: none" class="left-indent" aria-hidden="true">
     <div id="org-list">
-      <% if @orgs.count > 55 %>
-        <% if @orgs.count > 110 %>
+      <% if @orgs.count > 49 %>
+        <% if @orgs.count > 99 %>
           <% one_third = @orgs.count / 3 %>
 
          <%= render partial: 'shibboleth_ds_list', 
diff --git a/app/views/plans/_available_templates.html.erb b/app/views/plans/_available_templates.html.erb
index 59eb6fa..5d9f710 100644
--- a/app/views/plans/_available_templates.html.erb
+++ b/app/views/plans/_available_templates.html.erb
@@ -1,16 +1,20 @@
 <legend><%= _('Which DMP template would you like to use?') %></legend>
 
-<label for="plan_template_selector">
-  <%= _('Select a template') %>
-</label>
+<div class="form-left-side">
+  <label for="plan_template_selector">
+    <%= _('Select a template') %>
+  </label>
 
-<select id="plan_template_selector" class="left-indent fixed-width-large">
-  <option value=""><%= _('Please select one') %></option>
-  <%= raw @templates.collect{|t| "<option value=\"#{t.id}\">#{t.title}</option>" }.join('') %>
-</select>
+  <select id="plan_template_selector" class="left-indent fixed-width-large">
+    <option value=""><%= _('Please select one') %></option>
+    <%= raw @templates.collect{|t| "<option value=\"#{t.id}\">#{t.title}</option>" }.join('') %>
+  </select>
+</div>
 
-<div class="left-indent">
-  <%= _('We found multiple DMP templates corresponding to your funder.') %>
+<div class="form-right-side">
+  <div class="left-indent">
+    <p><%= _('We found multiple DMP templates corresponding to your funder.') %></p>
+  </div>
 </div>
 
 <script type="text/javascript">
diff --git a/app/views/plans/new.html.erb b/app/views/plans/new.html.erb
index 31a7a8e..2c51daf 100644
--- a/app/views/plans/new.html.erb
+++ b/app/views/plans/new.html.erb
@@ -14,13 +14,15 @@
       <fieldset class="standard padded">
         <legend><%= _('What research project are you planning?') %></legend>
         
-        <label for="plan_title">
-          <%= _('Project title') %>
-        </label>
+        <div class="form-left-side">
+          <label for="plan_title">
+            <%= _('Project title') %>
+          </label>
   
-        <input type="text" id="plan_title" name="plan[title]" class="fixed-width-large left-indent" />
-        <div class="left-indent" aria-describedby="org-tip" required>
-          <%= _('If applying for funding, state the title exactly as in the proposal.') %>
+          <input type="text" id="plan_title" name="plan[title]" class="input-full-width left-indent" />
+          <div class="left-indent" aria-describedby="org-tip" required>
+            <%= _('If applying for funding, state the title exactly as in the proposal.') %>
+          </div>
         </div>
       </fieldset>
 
@@ -28,47 +30,55 @@
       <fieldset class="standard padded">
         <legend><%= _('Primary research organisation') %></legend>
       
-        <label for="plan_org_name">
-          <%= _('Select the primary research organisation responsible') %>
-        </label>
+        <div class="form-left-side">
+          <label for="plan_org_name">
+            <%= _('Select the primary research organisation responsible') %>
+          </label>
       
-        <%= render partial: "shared/accessible_combobox", 
-                   locals: {name: 'plan[org_name]',
-                            id: 'plan_org_name',
-                            default_selection: @default_org,
-                            models: @orgs,
-                            attribute: 'name',
-                            classes: 'fixed-width-large'} %>
-      
-        <input type="checkbox" id="plan_no_org">
-
-        <label for="plan_no_org" class="checkbox-label">
-          <%= _('My research organisation is not on the list') %>
-          <em><%= _(' or ') %></em>
-          <%= _('no research organisation is associated with this plan')%>
-        </label>
+          <%= render partial: "shared/accessible_combobox", 
+                     locals: {name: 'plan[org_name]',
+                              id: 'plan_org_name',
+                              default_selection: @default_org,
+                              models: @orgs,
+                              attribute: 'name',
+                              classes: 'input-full-width'} %>
+        </div>
+        
+        <div class="form-right-side">
+          <p class="inline"><strong>- <%= _('or') %> -</strong></p>
+          <input type="checkbox" id="plan_no_org">
+          <label for="plan_no_org" class="checkbox-label">
+            <%= _('My research organisation is not on the list') %>
+            <em><%= _(' or ') %></em><br />
+            <%= _('no research organisation is associated with this plan')%>
+          </label>
+        </div>
       </fieldset>
     
       <!-- Funder selection -->
       <fieldset class="standard padded">
         <legend><%= _('Funding organisation') %></legend>
       
-        <label for="plan_funder_name">
-          <%= _('Select the funding organisation') %>
-        </label>
+        <div class="form-left-side">
+          <label for="plan_funder_name">
+            <%= _('Select the funding organisation') %>
+          </label>
       
-        <%= render partial: "shared/accessible_combobox", 
-                   locals: {name: 'plan[funder_name]',
-                            id: 'plan_funder_name',
-                            default_selection: nil,
-                            models: @funders,
-                            attribute: 'name',
-                            classes: 'fixed-width-large'} %>
-                                                                 
-        <input type="checkbox" id="plan_no_funder" />
-        <label for="plan_no_funder" class="checkbox-label">
-          <%= _('No funder associated with this plan')%>
-        </label>
+          <%= render partial: "shared/accessible_combobox", 
+                     locals: {name: 'plan[funder_name]',
+                              id: 'plan_funder_name',
+                              default_selection: nil,
+                              models: @funders,
+                              attribute: 'name',
+                              classes: 'input-full-width'} %>
+        </div>
+        <div class="form-right-side">
+          <p class="inline"><strong>- <%= _('or') %> -</strong></p>
+          <input type="checkbox" id="plan_no_funder" />
+          <label for="plan_no_funder" class="checkbox-label">
+            <%= _('No funder associated with this plan')%>
+          </label>
+        </div>
       </fieldset>
 
       <!-- Template selection -->
diff --git a/config/routes.rb b/config/routes.rb
index 327ef69..e1a22f9 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -54,6 +54,7 @@
   post 'users/update_preferences/:id', to: 'user#update_preferences', as: 'user_update_preferences'
 
   get '/orgs/shibboleth', to: 'orgs#shibboleth_ds', as: 'shibboleth_ds'
+  get '/orgs/shibboleth/:org_name', to: 'orgs#shibboleth_ds_passthru'  # if an org id is present passthru to shib
   post '/orgs/shibboleth', to: 'orgs#shibboleth_ds_passthru'
 
   #ActiveAdmin.routes(self)
diff --git a/lib/assets/stylesheets/roadmap-form.scss b/lib/assets/stylesheets/roadmap-form.scss
index e88a71ac..c79f056 100644
--- a/lib/assets/stylesheets/roadmap-form.scss
+++ b/lib/assets/stylesheets/roadmap-form.scss
@@ -96,7 +96,8 @@
     font-size: 26px;
     font-weight: normal;
     text-decoration: none;
- 
+    margin-bottom: 10px;
+
     float: left; /* positions the legend within the fieldset box */
     border-bottom: none;
   }
@@ -114,6 +115,9 @@
   .right-indent {
     margin-right: 5px;
   }
+  .input-full-width {
+    width: 95%;
+  }
   .input-extra-large {
     width: 70%;
   }
@@ -263,15 +267,15 @@
 
 .combobox-container {
   position: relative;
-  max-width: 585px;
- 
+  width: 95%;
+  min-width: 325px;
   font-family: $font-family;
 }
 
 .combobox-suggestions {
   position: absolute;
   left: 0;
-  width: 562px;
+  width: 98%;
   margin-top: -10px;
   background: #fff;
   z-index: 99;
@@ -438,11 +442,50 @@
   }
 }
 div.three-column {
-	width: 31%;
+  width: 31%;
 } 
 div.two-column {
   width: 47%;
 } 
 div.one-column {
   width: 95%;
-}
\ No newline at end of file
+}
+
+/* Create plan */
+/* ------------------------------------------------ */
+#create_plan {
+  fieldset {
+    padding-bottom: 15px;
+  }
+  
+  #plan_title {
+    margin-bottom: 5px;
+    width: 90%;
+  }
+  
+  .form-left-side {
+    position: relative;
+    float: left;
+    width: 40%;
+  }
+  .form-right-side {
+    position: relative;
+    float: left;
+    margin-left: 20px;
+    padding-top: 20px;
+    width: 45%;
+    min-width: 400px;
+    
+    label, input {
+      display: inline-block;
+    }
+    label {
+      width: 75%;
+    }
+    p {
+      vertical-align: top;
+      margin-top: -2px;
+      margin: -2px -5px 0 5px;
+    }
+  }
+}