diff --git a/umap/static/umap/js/modules/caption.js b/umap/static/umap/js/modules/caption.js
index ecda2cc0..30113708 100644
--- a/umap/static/umap/js/modules/caption.js
+++ b/umap/static/umap/js/modules/caption.js
@@ -8,9 +8,9 @@ const TEMPLATE = `
     <i class="icon icon-16 icon-caption icon-block"></i>
     <hgroup>
       <h3><span class="map-name" data-ref="name"></span></h3>
-      <h5 class="dates" data-ref="dates"></h5>
-      <h4 data-ref="author"></h4>
-      <h5><i class="icon icon-16 icon-star map-star" data-ref="star"></i><span class="map-stars"></span></h5>
+      <p class="dates" data-ref="dates"></p>
+      <p data-ref="author"></p>
+      <button type="button" data-ref="star"><i class="icon icon-16 icon-star map-star"></i><span class="map-stars"></span></button>
     </hgroup>
   </div>
   <div class="umap-map-description text" data-ref="description"></div>
diff --git a/umap/static/umap/map.css b/umap/static/umap/map.css
index aeaa125f..e91e2788 100644
--- a/umap/static/umap/map.css
+++ b/umap/static/umap/map.css
@@ -697,6 +697,11 @@ a.umap-control-caption,
 .umap-caption .header i.icon {
     flex-shrink: 0;
 }
+.umap-caption hgroup p,
+.umap-caption hgroup button {
+    margin: 0;
+    padding: 0;
+}
 .umap-browser .main-toolbox {
     padding-left: 4px; /* Align with toolbox below  */
     border-top: 1px solid var(--color-mediumGray);