diff --git a/app/views/orgs/_shibboleth_ds_list.html.erb b/app/views/orgs/_shibboleth_ds_list.html.erb
deleted file mode 100644
index d937b09..0000000
--- a/app/views/orgs/_shibboleth_ds_list.html.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<% letter = '' %>
-
-<div class="<%= column_count %>-column">
-  <ul>
-    <% orgs[column_start..column_end].each do |org| %>
-      <% unless org.name[0].capitalize == letter %>
-        <li class="separator"><%= org.name[0].capitalize %></li>
-        <% letter = org.name[0].capitalize %>
-      <% end %>
-
-      <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 3c554e8..c3e2f6a 100644
--- a/app/views/orgs/shibboleth_ds.html.erb
+++ b/app/views/orgs/shibboleth_ds.html.erb
@@ -48,36 +48,30 @@
   
   <div id="full_list" style="display: none" class="left-indent" aria-hidden="true">
     <div id="org-list">
-      <% if @orgs.count > 50 %>
-        <% if @orgs.count > 100 %>
-          <% one_third = (@orgs.count / 3).to_i %>
+			<%
+      increment, cols, letter, total, row = 50, 1, '', @orgs.count, 0
 
-         <%= render partial: 'shibboleth_ds_list', 
-                     locals: {column_count: 'three', orgs: @orgs,
-                              column_start: 0, column_end: (one_third - 1)} %>
-         <%= render partial: 'shibboleth_ds_list', 
-                     locals: {column_count: 'three', orgs: @orgs,
-                              column_start: one_third, column_end: ((one_third * 2) - 1)} %>
-         <%= render partial: 'shibboleth_ds_list', 
-                     locals: {column_count: 'three', orgs: @orgs,
-                              column_start: (one_third * 2), column_end: @orgs.count} %>
-      
-        <% else %>
-          <% one_half = @orgs.count / 2 %>
-          
-          <%= render partial: 'shibboleth_ds_list', 
-                      locals: {column_count: 'two', orgs: @orgs,
-                               column_start: 0, column_end: (one_half - 1)} %>
-          <%= render partial: 'shibboleth_ds_list', 
-                      locals: {column_count: 'two', orgs: @orgs,
-                               column_start: one_half, column_end: @orgs.count} %>
-          
+      # Determine how many letter separators 
+      total += @orgs.collect{|o| o.name[0]}.uniq.count
+      cols = (total > 100 ? 3 : (total > 50 ? 2 : 1))
+      increment = (total / cols)
+      %>
+      <% @orgs.each do |org| %>
+        <% if row == 0 || (row % increment == 0) %>
+          <% if row > 0 %>
+            </ul></div>
+          <% end %>
+          <div class="<%= (cols == 3 ? 'three' : (cols == 2 ? 'two' : 'one')) %>-column"><ul>
         <% end %>
-    
-      <% else %>
-         <%= render partial: 'shibboleth_ds_list', 
-                     locals: {column_count: 'one', orgs: @orgs,
-                              column_start: 0, column_end: @orgs.count} %>
+
+        <% unless org.name[0].capitalize == letter %>
+          <li class="separator"><%= org.name[0].capitalize %></li>
+          <% row += 1 %>
+          <% letter = org.name[0].capitalize %>
+        <% end %>
+
+        <li><a href="<%= "#{shibboleth_ds_path}/#{org.id}" %>"><%= org.name %></a></li>
+        <% row += 1 %>
       <% end %>
     </div>
   </div>
diff --git a/app/views/sections/_edit_section.html.erb b/app/views/sections/_edit_section.html.erb
index 5ed252c..2bae777 100644
--- a/app/views/sections/_edit_section.html.erb
+++ b/app/views/sections/_edit_section.html.erb
@@ -5,112 +5,69 @@
 **Copyright: Digital Curation Centre and California Digital Library
 -->
 
-
-<%= form_for(section, url: admin_update_section_path(section, phase: phase, edit: edit), html: { method: :put}) do |s| %>
-  <% if @open && @section_id == section.id then%>
-    <% toggle = 'accordion-body  section-collapse in collapse'%>
-  <% else %>
-    <% toggle = 'accordion-body collapse section-collapse' %>
-  <% end %>
-
- <% if @new_sec %>
-    <% toggle = 'accordion-body  section-collapse in collapse'%>
- <% end %>
-
-  <div class="accordion-group" >
-    <div class="accordion-heading">
-      <div class="div_left make_div_smaller">
-        <div class="accordion_heading_text">
-          <%= s.text_field :title, as: :string, class: 'text_field', placeholder: _('New section title') %>
-
+<h3><%= _('Section details') %></h3>
+<div id="collapse-sec-<%= section.id %>">
+	<%= form_for(section, url: admin_update_section_path(section, phase: phase, edit: edit), html: { method: :put, class: 'roadmap-form bordered'}) do |s| %>
+		<fieldset class="side-by-side">
+			<div class="form-input">
+      	<%= s.label :title %>
+				<%= s.text_field :title, as: :string, class: 'input-large', placeholder: _('New section title') %>
+			</div>
+			<div class="form-input">
+				<%= s.label _('Order of display'), for: :number %>
+        <%= s.number_field :number, in: 1..15, class: "input-small has-tooltip", 'data-toggle' => "tooltip", 'title' => _('This allows you to order sections.') %>
+      <div class="form-input">
+				<%= s.label :description %>
+        <%= text_area_tag("section-desc-#{section.id}", section.description , class: "tinymce") %>
+        <div class="inline">
+          <%= link_to( image_tag('help_button.png'), '#', class: 'section_desc_popover', rel: "popover", 'data-html' => "true", 'data-content' => _("<div class='tooltip_box'>Enter a basic description. This could be a summary of what is covered in the section or instructions on how to answer. This text will be displayed in the coloured banner once a section is opened to edit.</div>"))%>
         </div>
-      </div>
-      <div class="div_right make_div_longer">
-        <a class="accordion-toggle" data-toggle="collapse" data-parent="#sections-accordion" href="#collapse-sec-<%= section.id %>">
-          <!-- + or - icon-->
-              <span class="icon-plus icon-white accordion-icon"> </span>
-            </a>
-      </div>
-    </div>
-
-
-    <div id="collapse-sec-<%= section.id %>" class="<%= toggle %>" >
-      <div class="accordion-inner">
-        <table class="dmp_details_table">
-          <tr>
-            <td class="first_template"><%= _('Order of display') %></td>
-            <td><%= s.number_field :number, in: 1..15, class: "number_field has-tooltip", 'data-toggle' => "tooltip", 'title' => _('This allows you to order sections.') %></td>
-          </tr>
-          <tr>
-            <td class="first_template"><%= _('Description') %></td>
-            <td class="tinymce">
-              <div class="div_left_icon">
-                <%= text_area_tag("section-desc-#{section.id}", section.description , class: "tinymce") %>
-              </div>
-              <div class="div_right_icon">
-                <%= link_to( image_tag('help_button.png'), '#', class: 'section_desc_popover', rel: "popover", 'data-html' => "true", 'data-content' => _("<div class='tooltip_box'>Enter a basic description. This could be a summary of what is covered in the section or instructions on how to answer. This text will be displayed in the coloured banner once a section is opened to edit.</div>"))%>
-              </div>
-            </td>
-          </tr>
-        </table>
-        <!-- save buttons-->
-        <div class="move_2_right">
-          <%= s.submit _('Save'), class: 'btn btn-primary' %>
-          <% if section.modifiable %>
-            <%= link_to _('Delete'), admin_destroy_section_path(section_id: section.id),
-            confirm: _("You are about to delete '%{section_title}'. This will affect questions linked to this section. Are you sure?") % { :section_title => section.title }, method: :delete, class: "btn btn-primary"%>
-          <% end %>
-          <%= link_to _('Cancel'), :back, class: 'btn cancel' %>
-        </div>
-<% end %>
-        <div class="two-column-clear question-divider"></div>
-        <% @questions = section.questions.order("number")%>
-        <% if @questions.length > 0 %>
-          <% question_left = @questions.length %>
-          <% @questions.each do |question| %>
-            <div class="question_guidance_block">
-              <div id="show_question_div_<%= question.id%>" class="<%= if question.id == @question_id then "current_question" end %>">
-                <!-- render the show question block-->
-                <%= render partial: 'questions/show_question', locals: {question: question} %>
-              </div>
-
-              <div id="edit_question_div_<%= question.id%>"  style="display: none">
-                <!-- render the edit question block-->
-                <%= render partial: 'questions/edit_question', locals: {question: question} %>
-              </div>
-            </div>
-            <!--verify how many questions are left -->
-            <% if question_left.to_i > 1  %>
-                <div class="two-column-clear question-divider"></div>
-            <% else %>
-                <div class="two-column-clear"></div>
-            <% end %>
-            <% question_left = question_left - 1 %>
-
-          <% end %>
-        <% end %>
-
-        <!-- Add a new question if the version is not published-->
+			</div>
+			
+      <br />
+      <div class="form-input">
+        <label></label>
+        <%= s.submit _('Save'), class: 'btn btn-primary' %>
         <% if section.modifiable %>
-
-          <% if @questions.length != 0 %>
-            <div class="two-column-clear question-divider"></div>
-          <% end%>
-          <!-- add question block -->
-          <div id="add_question_block_div_<%= section.id%>" style="display: none">
-            <%= render partial: 'questions/add_question', locals: {section: section} %>
-          </div>
-
-          <!-- add question button-->
-          <div id="add_question_button_div_<%= section.id%>">
-            <div class="div_left">
-              <%= hidden_field_tag :section_id, section.id, class: "section_id" %>
-              <%= link_to _('Add question'), '#', class: "btn btn-primary add_question_button" %>
-            </div>
-          </div>
+          <%= link_to _('Delete'), admin_destroy_section_path(section_id: section.id),
+          confirm: _("You are about to delete '%{section_title}'. This will affect questions linked to this section. Are you sure?") % { :section_title => section.title }, method: :delete, class: "btn btn-primary"%>
         <% end %>
-
-        <div class="two-column-clear"></div>
+        <%= link_to _('Cancel'), :back, class: 'btn cancel' %>
       </div>
+		</fieldset>
+	<% end %>
+</div>
+	
+<h3><%= _('Questions') %></h3>
+<% @questions = section.questions.order("number")%>
+<% if @questions.length > 0 %>
+	<% @questions.each do |question| %>
+		<div class="question_guidance_block">
+			<div id="show_question_div_<%= question.id%>" class="<%= if question.id == @question_id then "current_question" end %>">
+        <!-- render the show question block-->
+        <%= render partial: 'questions/show_question', locals: {question: question} %>
+      </div>
+
+      <div id="edit_question_div_<%= question.id%>"  style="display: none">
+        <!-- render the edit question block-->
+        <%= render partial: 'questions/edit_question', locals: {question: question} %>
+      </div>
+		</div>
+  <% end %>
+<% end %>
+        
+<!-- Add a new question if the version is not published-->
+<% if section.modifiable %>
+	<!-- add question block -->
+	<div id="add_question_block_div_<%= section.id%>" style="display: none">
+		<%= render partial: 'questions/add_question', locals: {section: section} %>
+	</div>
+
+  <!-- add question button-->
+	<div id="add_question_button_div_<%= section.id%>">
+    <div class="div_left">
+      <%= hidden_field_tag :section_id, section.id, class: "section_id" %>
+      <%= link_to _('Add question'), '#', class: "btn btn-primary add_question_button" %>
     </div>
   </div>
+<% end %>
\ No newline at end of file
diff --git a/lib/assets/stylesheets/dmproadmap/forms.scss b/lib/assets/stylesheets/dmproadmap/forms.scss
index af58298..f4cdc92 100644
--- a/lib/assets/stylesheets/dmproadmap/forms.scss
+++ b/lib/assets/stylesheets/dmproadmap/forms.scss
@@ -93,7 +93,8 @@
 
   /* Fieldset with labels to the left of inputs */
   /* ------------------------------------------ */
-  fieldset.side-by-side {
+  fieldset.side-by-side, 
+  div.read-only-side-by-side {
     border: 0;
     
     .mce-tinymce {
@@ -350,13 +351,14 @@
 .omniauth-options {
   display: block;
   width: 100%;
-
+  margin-bottom: 10px;
+  
   .omniauth-login {
-    width: 93%;
+    display: inline-block;
+    width: 90%;
     padding: 4px 12px;
     background-color: $primary-color;
     color: $white;
-    margin: 0 auto 10px auto;
     border-radius: 5px;
   }
 }
@@ -446,13 +448,13 @@
   ul li {
     margin-top: 5px;
     margin-bottom: 5px;
+    padding: 4px 12px;
   }
 
   ul li.separator {
     background-color: $medium-grey;
     color: $white;
     font-weight: bold;
-    padding: 4px 12px;
   }
 }
 div.three-column {