diff --git a/umap/static/umap/content.css b/umap/static/umap/content.css
index bade8061..e986c097 100644
--- a/umap/static/umap/content.css
+++ b/umap/static/umap/content.css
@@ -158,6 +158,7 @@ h2.tabs a {
     text-decoration: underline;
     text-decoration-thickness: 3px;
     text-decoration-skip-ink: none;
+    text-underline-offset: 7px;
     margin-right: 2rem;
 }
 h2.tabs a:not(.selected) {
@@ -439,8 +440,15 @@ ul.umap-autocomplete {
     width: 100%;
 }
 .table-wrapper table a,
-.table-wrapper table thead {
+.table-wrapper table thead tr th,
+.table-wrapper table th[scope="row"] {
     color: #263B58;
+    text-align: left;
+    padding-left: 2px;
+}
+.table-wrapper table thead tr th {
+    line-height: 1.2;
+    padding: 10px 5px;
 }
 .table-wrapper table thead th:last-of-type {
     min-width: 240px;
@@ -476,9 +484,6 @@ ul.umap-autocomplete {
 .table-wrapper table tbody tr:nth-child(odd) {
     background-color: #f4f4f4;
 }
-.table-wrapper table td {
-    text-align: center;
-}
 .table-wrapper table thead tr {
     line-height: 2em;
 }
@@ -515,6 +520,7 @@ dialog::backdrop {
     display: flex;
     flex-direction: row;
     justify-content: space-around;
+    margin-bottom: 3rem;
 }
 .pagination > * {
     padding: 1rem;
diff --git a/umap/static/umap/nav.css b/umap/static/umap/nav.css
index 1cb46488..3c754d3f 100644
--- a/umap/static/umap/nav.css
+++ b/umap/static/umap/nav.css
@@ -66,6 +66,7 @@ footer .i18n_switch {
 .umap-nav .button:hover {
     text-decoration: none;
     min-width: 150px;
+    margin-left: 1rem;
 }
 
 @media only screen and (min-width: 500px) {
diff --git a/umap/templates/umap/map_table.html b/umap/templates/umap/map_table.html
index 1a0b87c7..56309a4c 100644
--- a/umap/templates/umap/map_table.html
+++ b/umap/templates/umap/map_table.html
@@ -16,9 +16,9 @@
       {% for map_inst in maps %}
         {% with unique_id="map_"|addstr:map_inst.pk %}
           <tr>
-            <td>
+            <th scope="row">
               <a href="{{ map_inst.get_absolute_url }}">{{ map_inst.name }}</a>
-            </td>
+            </th>
             <td>
               {{ map_inst.preview_settings|json_script:unique_id }}
               <button class="map-icon map-opener" data-map-id="{{ unique_id }}"
@@ -82,8 +82,8 @@
     </tbody>
   </table>
 </div>
-{% if maps.has_other_pages %}
-  <div class="pagination">
+<div class="pagination">
+  {% if maps.has_other_pages %}
     {% if maps.has_previous %}
       <a href="?p=1{% if q %}&q={{ q }}{% endif %}">« {% translate "first" %}</a>
       <a href="?p={{ maps.previous_page_number }}{% if q %}&q={{ q }}{% endif %}">‹ {% translate "previous" %}</a>
@@ -119,8 +119,8 @@
       {{ count }} maps
       {% endblocktranslate %}
     </span>
-  </div>
-{% endif %}
+  {% endif %}
+</div>
 <script>
   !(function () {
     for (const deleteForm of document.querySelectorAll('form.map-delete')) {
diff --git a/umap/templates/umap/navigation.html b/umap/templates/umap/navigation.html
index 92434a22..349ad252 100644
--- a/umap/templates/umap/navigation.html
+++ b/umap/templates/umap/navigation.html
@@ -33,11 +33,11 @@
           <a href="{% url "logout" %}" class="logout">{% trans "Log out" %}</a>
         </li>
       {% endif %}
+      {% if not UMAP_READONLY %}
+        <li>
+          <a href="{% url "map_new" %}" class="button button-primary">{% trans "Create a map" %}</a>
+        </li>
+      {% endif %}
     </ul>
   </section>
-  <section>
-    {% if not UMAP_READONLY %}
-      <a href="{% url "map_new" %}" class="button button-primary">{% trans "Create a map" %}</a>
-    {% endif %}
-  </section>
 </nav>