diff --git a/static/css/app.css b/static/css/app.css
index bb4f4de..7668446 100644
--- a/static/css/app.css
+++ b/static/css/app.css
@@ -269,8 +269,14 @@ main > h3 {
 }
 
 .disc-table .language-col {
-    text-align: left;
-    max-width: 8.8em;
+    width: 5.75rem;
+    max-width: 5.75rem;
+    white-space: normal;
+    line-height: 1;
+}
+
+.disc-table td.language-col {
+    text-align: center;
 }
 
 .disc-table td.region-col {
@@ -289,14 +295,35 @@ main > h3 {
 
 /* Ellipsis truncation for Edition and Serial */
 .disc-table .truncate {
-    max-width: 10rem;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
 }
-.disc-table .version-col { max-width: 7rem; }
-.disc-table .edition-col { max-width: 7.5rem; }
-.disc-table .serial-col  { max-width: 7rem; }
+.disc-table .system-col {
+    width: 6rem;
+    max-width: 6rem;
+}
+.disc-table .version-col {
+    width: 5.25rem;
+    max-width: 5.25rem;
+    padding-right: 0.25rem;
+}
+.disc-table .edition-col {
+    width: 7.5rem;
+    max-width: 7.5rem;
+    padding-left: 0.25rem;
+}
+.disc-table .serial-col  {
+    width: 7rem;
+    max-width: 7rem;
+    padding-right: 0;
+}
+.disc-table .status-col {
+    width: 4.3rem;
+    max-width: 4.3rem;
+    padding-left: 0;
+    padding-right: 0;
+}
 
 /* Striped table rows — matches home page alternating row style */
 table.striped tbody tr:nth-child(odd) td {
@@ -410,9 +437,21 @@ details + p small {
     font-size: 0.8rem;
 }
 
-/* Center pagination */
+/* Align pagination with the left edge of its result table. */
+nav[aria-label="Pagination"] {
+    width: 100%;
+}
+nav[aria-label="Pagination"] ul {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: flex-start;
+    width: 100%;
+    margin-left: 0;
+    margin-right: 0;
+    padding-left: 0;
+}
 #disc-results nav[aria-label="Pagination"] ul {
-    justify-content: center;
+    justify-content: flex-start;
 }
 #disc-results nav[aria-label="Pagination"] ul li,
 #disc-results nav[aria-label="Pagination"] ul li a {
@@ -524,6 +563,16 @@ details + p small {
     max-width: 100%;
 }
 
+#filter-form.queue-filter-form {
+    grid-template-columns: max-content;
+    width: fit-content;
+    max-width: 100%;
+}
+
+#filter-form.queue-filter-form label {
+    grid-template-columns: 5rem max-content;
+}
+
 #filter-form > .advanced-search-toggle {
     -webkit-appearance: none;
     appearance: none;
@@ -688,6 +737,7 @@ details + p small {
     margin-right: auto;
     margin-top: 0;
     margin-bottom: 0.35rem;
+    padding-top: 0.25rem;
 }
 .letter-picker a {
     display: inline-flex;
@@ -1266,6 +1316,7 @@ details + p small {
     grid-template-columns: minmax(0, 1fr);
     align-items: center;
     gap: 0.5rem;
+    margin-top: 0.75rem;
     margin-bottom: 2.5rem;
 }
 .disc-title-row.has-title-action {
@@ -2223,6 +2274,17 @@ table.striped tbody tr.clickable-row.is-row-hover td {
 }
 
 /* Queue status dots */
+#queue-results {
+    width: max-content;
+    max-width: 100%;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+#queue-results > nav[aria-label="Pagination"] {
+    width: 100%;
+}
+
 .queue-table-scroll {
     width: 100%;
     text-align: center;
@@ -2242,6 +2304,10 @@ table.striped tbody tr.clickable-row.is-row-hover td {
     padding-inline-end: 0.75rem;
 }
 
+.queue-table .submission-title-col {
+    padding-inline-end: 1.5rem;
+}
+
 .queue-table th:last-child,
 .queue-table td:last-child {
     padding-inline-end: 0.35rem;
diff --git a/templates/discs.html b/templates/discs.html
index dc4d74d..dc866b0 100644
--- a/templates/discs.html
+++ b/templates/discs.html
@@ -139,10 +139,10 @@ <h3 class="disc-page-title">Disc Database</h3>
                 <th class="region-col"><a href="/discs?sort=region&amp;order={{ next_region_order }}&amp;system={{ filter_system }}&amp;region={{ filter_region }}&amp;status={{ filter_status }}&amp;letter={{ filter_letter }}&amp;q={{ self.url_encode(filter_q) }}{% if !filter_dumper.is_empty() %}&amp;dumper={{ filter_dumper_url }}{% endif %}{{ self.advanced_query_params() }}">Region{% if sort_column == "region" %} {% if sort_order == "asc" %}▼{% else %}▲{% endif %}{% endif %}</a></th>
                 <th class="title-col"><a href="/discs?sort=title&amp;order={{ next_title_order }}&amp;system={{ filter_system }}&amp;region={{ filter_region }}&amp;status={{ filter_status }}&amp;letter={{ filter_letter }}&amp;q={{ self.url_encode(filter_q) }}{% if !filter_dumper.is_empty() %}&amp;dumper={{ filter_dumper_url }}{% endif %}{{ self.advanced_query_params() }}">Title{% if sort_column == "title" %} {% if sort_order == "asc" %}▼{% else %}▲{% endif %}{% endif %}</a></th>
                 <th class="system-col"><a href="/discs?sort=system&amp;order={{ next_system_order }}&amp;system={{ filter_system }}&amp;region={{ filter_region }}&amp;status={{ filter_status }}&amp;letter={{ filter_letter }}&amp;q={{ self.url_encode(filter_q) }}{% if !filter_dumper.is_empty() %}&amp;dumper={{ filter_dumper_url }}{% endif %}{{ self.advanced_query_params() }}">System{% if sort_column == "system" %} {% if sort_order == "asc" %}▼{% else %}▲{% endif %}{% endif %}</a></th>
-                <th><a href="/discs?sort=version&amp;order={{ next_version_order }}&amp;system={{ filter_system }}&amp;region={{ filter_region }}&amp;status={{ filter_status }}&amp;letter={{ filter_letter }}&amp;q={{ self.url_encode(filter_q) }}{% if !filter_dumper.is_empty() %}&amp;dumper={{ filter_dumper_url }}{% endif %}{{ self.advanced_query_params() }}">Version{% if sort_column == "version" %} {% if sort_order == "asc" %}▼{% else %}▲{% endif %}{% endif %}</a></th>
-                <th><a href="/discs?sort=edition&amp;order={{ next_edition_order }}&amp;system={{ filter_system }}&amp;region={{ filter_region }}&amp;status={{ filter_status }}&amp;letter={{ filter_letter }}&amp;q={{ self.url_encode(filter_q) }}{% if !filter_dumper.is_empty() %}&amp;dumper={{ filter_dumper_url }}{% endif %}{{ self.advanced_query_params() }}">Edition{% if sort_column == "edition" %} {% if sort_order == "asc" %}▼{% else %}▲{% endif %}{% endif %}</a></th>
+                <th class="version-col"><a href="/discs?sort=version&amp;order={{ next_version_order }}&amp;system={{ filter_system }}&amp;region={{ filter_region }}&amp;status={{ filter_status }}&amp;letter={{ filter_letter }}&amp;q={{ self.url_encode(filter_q) }}{% if !filter_dumper.is_empty() %}&amp;dumper={{ filter_dumper_url }}{% endif %}{{ self.advanced_query_params() }}">Version{% if sort_column == "version" %} {% if sort_order == "asc" %}▼{% else %}▲{% endif %}{% endif %}</a></th>
+                <th class="edition-col"><a href="/discs?sort=edition&amp;order={{ next_edition_order }}&amp;system={{ filter_system }}&amp;region={{ filter_region }}&amp;status={{ filter_status }}&amp;letter={{ filter_letter }}&amp;q={{ self.url_encode(filter_q) }}{% if !filter_dumper.is_empty() %}&amp;dumper={{ filter_dumper_url }}{% endif %}{{ self.advanced_query_params() }}">Edition{% if sort_column == "edition" %} {% if sort_order == "asc" %}▼{% else %}▲{% endif %}{% endif %}</a></th>
                 <th class="language-col"><a href="/discs?sort=language&amp;order={{ next_language_order }}&amp;system={{ filter_system }}&amp;region={{ filter_region }}&amp;status={{ filter_status }}&amp;letter={{ filter_letter }}&amp;q={{ self.url_encode(filter_q) }}{% if !filter_dumper.is_empty() %}&amp;dumper={{ filter_dumper_url }}{% endif %}{{ self.advanced_query_params() }}">Language{% if sort_column == "language" %} {% if sort_order == "asc" %}▼{% else %}▲{% endif %}{% endif %}</a></th>
-                <th><a href="/discs?sort=serial&amp;order={{ next_serial_order }}&amp;system={{ filter_system }}&amp;region={{ filter_region }}&amp;status={{ filter_status }}&amp;letter={{ filter_letter }}&amp;q={{ self.url_encode(filter_q) }}{% if !filter_dumper.is_empty() %}&amp;dumper={{ filter_dumper_url }}{% endif %}{{ self.advanced_query_params() }}">Serial{% if sort_column == "serial" %} {% if sort_order == "asc" %}▼{% else %}▲{% endif %}{% endif %}</a></th>
+                <th class="serial-col"><a href="/discs?sort=serial&amp;order={{ next_serial_order }}&amp;system={{ filter_system }}&amp;region={{ filter_region }}&amp;status={{ filter_status }}&amp;letter={{ filter_letter }}&amp;q={{ self.url_encode(filter_q) }}{% if !filter_dumper.is_empty() %}&amp;dumper={{ filter_dumper_url }}{% endif %}{{ self.advanced_query_params() }}">Serial{% if sort_column == "serial" %} {% if sort_order == "asc" %}▼{% else %}▲{% endif %}{% endif %}</a></th>
                 <th class="status-col"><a href="/discs?sort=status&amp;order={{ next_status_order }}&amp;system={{ filter_system }}&amp;region={{ filter_region }}&amp;status={{ filter_status }}&amp;letter={{ filter_letter }}&amp;q={{ self.url_encode(filter_q) }}{% if !filter_dumper.is_empty() %}&amp;dumper={{ filter_dumper_url }}{% endif %}{{ self.advanced_query_params() }}">Status{% if sort_column == "status" %} {% if sort_order == "asc" %}▼{% else %}▲{% endif %}{% endif %}</a></th>
             </tr>
         </thead>
diff --git a/templates/main.html b/templates/main.html
index 0f2c88f..ca04a50 100644
--- a/templates/main.html
+++ b/templates/main.html
@@ -108,15 +108,21 @@ <h4><a href="{{ item.url }}">{{ item.title }}</a></h4>
 </div>
 <script>
 (function() {
+    var shouldScaleHomeTables = window.matchMedia('(max-width: 768px)');
+
     function scaleHomeTables() {
         document.querySelectorAll('.recent-dumps-scaler, .recent-changes-scaler').forEach(function(wrapper) {
         var table = wrapper && wrapper.querySelector('table');
         if (!table) return;
         table.style.transform = '';
         table.style.transformOrigin = '';
-        table.style.width = 'max-content';
+        table.style.width = '';
         wrapper.style.overflow = '';
         wrapper.style.height = '';
+        if (!shouldScaleHomeTables.matches) {
+            return;
+        }
+        table.style.width = 'max-content';
         var containerWidth = wrapper.clientWidth;
         var tableWidth = table.scrollWidth;
         var scale = 1;
@@ -133,6 +139,9 @@ <h4><a href="{{ item.url }}">{{ item.title }}</a></h4>
     }
     document.addEventListener('DOMContentLoaded', scaleHomeTables);
     window.addEventListener('resize', scaleHomeTables);
+    if (shouldScaleHomeTables.addEventListener) {
+        shouldScaleHomeTables.addEventListener('change', scaleHomeTables);
+    }
 })();
 </script>
 {% endblock %}