diff --git a/src/css/labels.css b/src/css/labels.css
index 36c5e7ee..a6556a7f 100644
--- a/src/css/labels.css
+++ b/src/css/labels.css
@@ -9,6 +9,14 @@
   font-style: normal;
 }
 
+h2 > span.label,
+h3 > span.label,
+h4 > span.label,
+h5 > span.label,
+h6 > span.label {
+  float: right;
+}
+
 .tableblock .label {
   margin-top: 0.2rem;
 }
diff --git a/src/js/02-on-this-page.js b/src/js/02-on-this-page.js
index 580fb0ab..661391ad 100644
--- a/src/js/02-on-this-page.js
+++ b/src/js/02-on-this-page.js
@@ -20,7 +20,8 @@
   var links = {}
   var list = headings.reduce(function (accum, heading) {
     var link = document.createElement('a')
-    link.textContent = heading.textContent
+    var headingTextWithoutLabels = Array.from(heading.childNodes).filter((el) => el.nodeType === Node.TEXT_NODE).map((el) => el.textContent).join(' ').trim()
+    link.textContent = headingTextWithoutLabels
     links[(link.href = '#' + heading.id)] = link
     var listItem = document.createElement('li')
     listItem.dataset.level = parseInt(heading.nodeName.slice(1)) - 1