diff --git a/app/views/catalog/_document.html.erb b/app/views/catalog/_document.html.erb
index 6478c5e88e..d69e7e6fff 100644
--- a/app/views/catalog/_document.html.erb
+++ b/app/views/catalog/_document.html.erb
@@ -1,6 +1,8 @@
 <% # container for a single doc -%>
-<article class="document <%= render_document_class document %> document-position-<%= document_counter%> " data-document-counter="<%= document_counter %>" itemscope itemtype="<%= document.itemtype %>">
-  <%= render_document_partials document,
-    blacklight_config.view_config(document_index_view_type).partials,
-    document_counter: document_counter %>
-</article>
+<li>
+  <article class="document <%= render_document_class document %> document-position-<%= document_counter%> " data-document-counter="<%= document_counter %>" itemscope itemtype="<%= document.itemtype %>">
+    <%= render_document_partials document,
+                                 blacklight_config.view_config(document_index_view_type).partials,
+                                 document_counter: document_counter %>
+  </article>
+</li>
diff --git a/app/views/catalog/_document_list.html.erb b/app/views/catalog/_document_list.html.erb
index 80179d01f9..bef5b4f4ac 100644
--- a/app/views/catalog/_document_list.html.erb
+++ b/app/views/catalog/_document_list.html.erb
@@ -1,4 +1,6 @@
 <% # container for all documents in index list view -%>
 <div id="documents" class="documents-<%= document_index_view_type %>">
-  <%= render documents, :as => :document %>
+  <ol>
+    <%= render documents, :as => :document %>
+  </ol>
 </div>
diff --git a/app/views/catalog/_index_header.html.erb b/app/views/catalog/_index_header.html.erb
index cf80e15b16..a88e9f3a33 100644
--- a/app/views/catalog/_index_header.html.erb
+++ b/app/views/catalog/_index_header.html.erb
@@ -10,12 +10,7 @@
   <% end %>
 
   <h3 class="index_title document-title-heading <%= document_actions.present? ? "col-sm-9 col-lg-10" : "col-md-12" %>">
-    <% if counter = document_counter_with_offset(document_counter) %>
-      <span class="document-counter">
-        <%= t('blacklight.search.documents.counter', counter: counter) %>
-      </span>
-    <% end %>
-    <%= link_to_document document, document_show_link_field(document), counter: counter %>
+    <%= link_to_document document, document_show_link_field(document) %>
   </h3>
 
   <%= document_actions %>