diff --git a/app/assets/stylesheets/curation_concerns/_curation_concerns.scss b/app/assets/stylesheets/curation_concerns/_curation_concerns.scss
index aa6ba4f69..3777410a2 100644
--- a/app/assets/stylesheets/curation_concerns/_curation_concerns.scss
+++ b/app/assets/stylesheets/curation_concerns/_curation_concerns.scss
@@ -9,4 +9,4 @@
 @import "curation_concerns/theme";
 @import "curation_concerns/typography";
 @import 'hydra-editor/multi_value_fields';
-@import 'curation_concerns/fileupload';
\ No newline at end of file
+@import 'curation_concerns/fileupload';
diff --git a/app/assets/stylesheets/curation_concerns/modules/search_results.scss b/app/assets/stylesheets/curation_concerns/modules/search_results.scss
index 6f385c71b..2bda7afe3 100644
--- a/app/assets/stylesheets/curation_concerns/modules/search_results.scss
+++ b/app/assets/stylesheets/curation_concerns/modules/search_results.scss
@@ -3,8 +3,13 @@
 
 #documents .document {
   border-top: 1px solid $gray-lighter;
-  margin-top: 1em;
-  padding-top:.5em;
+  margin-top: $padding-base-vertical;
+  padding-top: $padding-base-vertical;
+
+  @extend .clearfix;
+  .document-title-heading {
+    @extend h5;
+  }
 
   &:before {
     //Overwrite blacklight
@@ -15,12 +20,6 @@
     margin-top:0;
     padding-top:0;
   }
-  .search-result-actions {
-    @include make-xs-column(8);
-    @include make-xs-column-offset(4);
-    @include make-sm-column(2);
-    @include make-sm-column-offset(0);
-  }
 
   .document-thumbnail {
     @include make-xs-column(4);
diff --git a/app/views/catalog/_document_list.html.erb b/app/views/catalog/_document_list.html.erb
index e9f416aca..0792fd9b0 100644
--- a/app/views/catalog/_document_list.html.erb
+++ b/app/views/catalog/_document_list.html.erb
@@ -1,5 +1,5 @@
 <h3 id="document-list-heading" class="accessible-hidden">List of files deposited in <%= t('curation_concerns.product_name') %> that match your search criteria</h3>
 <ol id="documents" class="container-fluid search-results-list" start="<%= document_counter_with_offset(0) %>" aria-labeled-by="document-list-heading">
   <%= render documents, as: :document %>
-</ul>
+</ol>
 
diff --git a/app/views/catalog/_index_default.html.erb b/app/views/catalog/_index_default.html.erb
deleted file mode 100644
index 348c7160d..000000000
--- a/app/views/catalog/_index_default.html.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<div class="row">
-  <%#= render_document_partial document, 'thumbnail', document_counter: generic_file_counter %>
-  <dl class="document-metadata dl-invert dl-horizontal">
-    
-    <% index_fields(document).each do |solr_fname, field| -%>
-      <% if should_render_index_field? document, field %>
-        <dt class="blacklight-<%= solr_fname.parameterize %>"><%= render_index_field_label document, :field => solr_fname %></dt>
-        <dd class="blacklight-<%= solr_fname.parameterize %>"><%= render_index_field_value document, :field => solr_fname %></dd>
-      <% end -%>
-    <% end -%>
-
-  </dl>
-
-  <div class="search-result-actions">
-    <%= render_document_partial document, 'action_menu' %>
-  </div>
-</div>
diff --git a/app/views/catalog/_search_results.html.erb b/app/views/catalog/_search_results.html.erb
deleted file mode 100644
index a1b462159..000000000
--- a/app/views/catalog/_search_results.html.erb
+++ /dev/null
@@ -1,24 +0,0 @@
-<h2 class="sr-only top-content-title"><%= t('blacklight.search.search_results_header') %></h2>
-
-<% @page_title = t('blacklight.search.title', :application_name => application_name) %>
-
-<% provide(:head) do -%>
-  <%= render_opensearch_response_metadata %>
-  <%= auto_discovery_link_tag(:rss, url_for(params.merge(:format => 'rss')), :title => t('blacklight.search.rss_feed') ) %>
-  <%= auto_discovery_link_tag(:atom, url_for(params.merge(:format => 'atom')), :title => t('blacklight.search.atom_feed') ) %>
-<% end -%>
-
-<%= render 'search_header' %>
-
-<h2 class="sr-only"><%= t('blacklight.search.search_results') %></h2>
-
-<%- if @response.empty? %>
-  <%= render "zero_results" %>
-<%- elsif render_grouped_response? %>
-  <%= render_grouped_document_index %>
-<%- else %>
-  <%= render_document_index %>
-<%- end %>
-
-<%= render 'results_pagination' %>
-
diff --git a/app/views/collections/_identifier_and_action.html.erb b/app/views/collections/_identifier_and_action.html.erb
deleted file mode 100644
index fcd8b4284..000000000
--- a/app/views/collections/_identifier_and_action.html.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<div class="row identifier-and-action">
-  <div class="col-md-2 list-number">
-    <%= document_counter_with_offset(counter) if defined?(counter) %>
-    <%= render partial: 'catalog/_index_partials/type_display', locals: {document: document} %>
-  </div>
-
-  <div class="col-md-6 search-result-link">
-    <%= link_to_document document, label: document_show_link_field(document), counter: counter %>
-  </div>
-
-  <div class="col-md-4 search-result-actions">
-    <%= render 'collections/action_menu', document: document %>
-  </div>
-</div>
-
diff --git a/lib/generators/curation_concerns/templates/catalog_controller.rb b/lib/generators/curation_concerns/templates/catalog_controller.rb
index 7b648d96b..457ca5df9 100644
--- a/lib/generators/curation_concerns/templates/catalog_controller.rb
+++ b/lib/generators/curation_concerns/templates/catalog_controller.rb
@@ -15,6 +15,7 @@ class CatalogController < ApplicationController
 
     config.index.thumbnail_method = :thumbnail_tag
     config.index.partials.delete(:thumbnail) # we render this inside _index_default.html.erb
+    config.index.partials += [:action_menu]
 
     # solr field configuration for document/show views
     # config.show.title_field = solr_name("title", :stored_searchable)