diff --git a/peachjam/static/stylesheets/_global.scss b/peachjam/static/stylesheets/_global.scss
index 138394e6d..b14982069 100644
--- a/peachjam/static/stylesheets/_global.scss
+++ b/peachjam/static/stylesheets/_global.scss
@@ -102,6 +102,12 @@ footer {
   @include button-size(0.125rem, 0.25rem, $btn-font-size-sm, $btn-border-radius-sm);
 }
 
+.btn-shrink-sm {
+  @include media-breakpoint-down(sm) {
+    @include button-size($btn-padding-y-sm, $btn-padding-x-sm, $btn-font-size-sm, $btn-border-radius-sm);
+  }
+}
+
 //Extra utility colors
 
 .facebook-forecolor {
diff --git a/peachjam/static/stylesheets/components/_document-content.scss b/peachjam/static/stylesheets/components/_document-content.scss
index e7cfe773c..34c866c69 100644
--- a/peachjam/static/stylesheets/components/_document-content.scss
+++ b/peachjam/static/stylesheets/components/_document-content.scss
@@ -392,6 +392,6 @@
 .to-the-top {
   position: fixed;
   right: 10px;
-  bottom: 0px;
+  bottom: 10px;
   z-index: 10;
 }
diff --git a/peachjam/templates/peachjam/_document_detail_toolbar.html b/peachjam/templates/peachjam/_document_detail_toolbar.html
new file mode 100644
index 000000000..d1028473f
--- /dev/null
+++ b/peachjam/templates/peachjam/_document_detail_toolbar.html
@@ -0,0 +1,56 @@
+{% load peachjam static i18n %}
+<div class="btn-toolbar justify-content-end mb-3"
+     role="toolbar"
+     aria-label="{% trans "Document toolbar" %}">
+  {% block edit-btn %}
+    {% if perms.peachjam.change_coredocument or perms.peachjam.can_edit_own_document %}
+      <a class="btn btn-outline-secondary btn-shrink-sm"
+         href="{{ document|admin_url:'change' }}">{% trans "Edit" %}</a>
+    {% endif %}
+  {% endblock %}
+  {% block download-btn %}
+    {% if document.source_file %}
+      <div class="btn-group dropdown-center ms-2">
+        <a href="{% url 'document_source' document.expression_frbr_uri|strip_first_character %}"
+           class="btn btn-primary btn-shrink-sm"
+           target="_blank">
+          {% trans "Download" %} {{ document.source_file.filename_extension|upper }}
+          ({{ document.source_file.size|filesizeformat }})
+        </a>
+        {% if document.source_file.filename_extension != "pdf" %}
+          <button type="button"
+                  class="btn btn-primary dropdown-toggle dropdown-toggle-split"
+                  data-bs-toggle="dropdown"
+                  aria-expanded="false">
+            <span class="visually-hidden">{% trans "Toggle dropdown" %}</span>
+          </button>
+          <ul class="dropdown-menu">
+            <li>
+              <a class="dropdown-item"
+                 href="{% url 'document_source_pdf' document.expression_frbr_uri|strip_first_character %}"
+                 target="_blank">{% trans "Download" %} PDF</a>
+            </li>
+          </ul>
+        {% endif %}
+      </div>
+    {% endif %}
+  {% endblock %}
+  {% block report-problem-btn %}
+    <div>
+      <button type="button"
+              class="btn btn-outline-secondary btn-shrink-sm ms-2"
+              data-bs-toggle="modal"
+              data-bs-target="#documentProblemModal">
+        <span class="d-inline d-sm-none">{% trans "Report" %}</span>
+        <span class="d-none d-sm-inline">{% trans 'Report a problem' %}</span>
+      </button>
+      <div class="modal fade"
+           id="documentProblemModal"
+           tabindex="-1"
+           aria-labelledby="documentProblemModalTitle"
+           aria-hidden="true"
+           data-vue-component="DocumentProblemModal">
+      </div>
+    </div>
+  {% endblock %}
+</div>
diff --git a/peachjam/templates/peachjam/_document_problem_modal.html b/peachjam/templates/peachjam/_document_problem_modal.html
deleted file mode 100644
index dc6933910..000000000
--- a/peachjam/templates/peachjam/_document_problem_modal.html
+++ /dev/null
@@ -1,16 +0,0 @@
-{% load static i18n %}
-<div class="d-flex justify-content-end mb-3">
-  <button type="button"
-          class="btn btn-outline-secondary"
-          data-bs-toggle="modal"
-          data-bs-target="#documentProblemModal">
-    {% trans 'Report a problem' %}
-  </button>
-</div>
-<div class="modal fade"
-     id="documentProblemModal"
-     tabindex="-1"
-     aria-labelledby="documentProblemModalTitle"
-     aria-hidden="true"
-     data-vue-component="DocumentProblemModal">
-</div>
diff --git a/peachjam/templates/peachjam/layouts/document_detail.html b/peachjam/templates/peachjam/layouts/document_detail.html
index 06a888356..ffc06a106 100644
--- a/peachjam/templates/peachjam/layouts/document_detail.html
+++ b/peachjam/templates/peachjam/layouts/document_detail.html
@@ -54,9 +54,7 @@ <h1>{{ document.title }}</h1>
           </div>
         {% endblock %}
         {% include 'peachjam/_notices.html' with messages=notices %}
-        {% if perms.peachjam.change_coredocument or perms.peachjam.can_edit_own_document %}
-          <a href="{{ document|admin_url:'change' }}">Edit</a>
-        {% endif %}
+        {% include "peachjam/_document_detail_toolbar.html" %}
         <ul class="nav nav-tabs border-bottom scroll-xs" role="tablist">
           {% block document-tabs %}
             <li class="nav-item" role="presentation">
@@ -141,22 +139,22 @@ <h1>{{ document.title }}</h1>
              aria-labelledby="document-detail-tab">
           <div class="container">
             {% block document-metadata %}
-              {% include "peachjam/_document_problem_modal.html" %}
               <div class="row">
                 <div class="col-md mb-3">
                   {% block document-metadata-content %}
                     <dl class="document-metadata-list">
                       {% block document-metadata-content-jurisdiction %}
-                        {% if document.jurisdiction %}
+                        {% if MULTIPLE_JURISDICTIONS or document.locality %}
                           <dt>
                             {% trans 'Jurisdiction' %}
                           </dt>
                           <dd class="text-muted">
-                            {{ document.jurisdiction }}
-                            {% if document.locality %}
-                              · {{ document.locality }}
-                            </dd>
-                          {% endif %}
+                            {% if MULTIPLE_JURISDICTIONS %}
+                              {{ document.jurisdiction }}
+                              {% if document.locality %}·{% endif %}
+                            {% endif %}
+                            {{ document.locality|default_if_none:'' }}
+                          </dd>
                         {% endif %}
                       {% endblock %}
                       {% block document-metadata-content-citation %}
@@ -323,26 +321,6 @@ <h1>{{ document.title }}</h1>
                           {% trans document.get_doc_type_display %}
                         </dd>
                       {% endblock %}
-                      {% block document-metadata-content-download %}
-                        {% if document.source_file %}
-                          <dt>
-                            {% translate 'Download' %}
-                          </dt>
-                          <dd>
-                            <div>
-                              <a href="{% url 'document_source' document.expression_frbr_uri|strip_first_character %}"
-                                 target="_blank">{% trans "Download" %} {{ document.source_file.filename_extension|upper }}</a>
-                              ({{ document.source_file.size|filesizeformat }})
-                            </div>
-                            {% if document.source_file.filename_extension != "pdf" %}
-                              <div>
-                                <a href="{% url 'document_source_pdf' document.expression_frbr_uri|strip_first_character %}"
-                                   target="_blank">{% trans "Download" %} PDF</a>
-                              </div>
-                            {% endif %}
-                          </dd>
-                        {% endif %}
-                      {% endblock %}
                       {% block document-metadata-media-summary-download %}
                         {% if document.attachedfiles_set %}
                           {% for attachedfile in document.attachedfiles_set.all %}
diff --git a/peachjam/views/generic_views.py b/peachjam/views/generic_views.py
index f2f2461ac..68ca8449d 100644
--- a/peachjam/views/generic_views.py
+++ b/peachjam/views/generic_views.py
@@ -213,6 +213,9 @@ def fetch_citation_docs(self, works):
             for doc_type, group in grouped_docs
         ]
 
+        # sort by size of group, descending
+        result.sort(key=lambda g: -len(g["docs"]))
+
         return result
 
     def add_relationships(self, context):