diff --git a/build/plugins/anchors.html b/build/plugins/anchors.html
index 68f1225b..7149501b 100644
--- a/build/plugins/anchors.html
+++ b/build/plugins/anchors.html
@@ -10,7 +10,8 @@
 <script type="module">
   // which types of elements to add anchors next to, in "document.querySelector"
   // format
-  const typesQuery = 'h1, h2, h3, [id^="fig:"], [id^="tbl:"], [id^="eq:"]';
+  const typesQuery =
+    'h1, h2, h3, div[id^="fig:"], div[id^="tbl:"], span[id^="eq:"]';
 
   // start script
   function start() {
diff --git a/build/plugins/jump-to-first.html b/build/plugins/jump-to-first.html
index d2050933..da7df4a9 100644
--- a/build/plugins/jump-to-first.html
+++ b/build/plugins/jump-to-first.html
@@ -15,9 +15,11 @@
 
   // start script
   function start() {
-    if (references !== "false") makeButtons("ref-", "p", "reference");
-    if (figures !== "false") makeButtons("fig:", "figcaption", "figure");
-    if (tables !== "false") makeButtons("tbl:", "caption", "table");
+    if (references !== "false")
+      makeButtons(`div[id^="ref-"]`, ".csl-left-margin", "reference");
+    if (figures !== "false")
+      makeButtons(`div[id^="fig:"]`, "figcaption", "figure");
+    if (tables !== "false") makeButtons(`div[id^="tbl:"]`, "caption", "table");
   }
 
   // when jump button clicked
@@ -45,7 +47,7 @@
 
   // add button next to each reference entry, figure, or table
   function makeButtons(query, containerQuery, subject) {
-    const elements = document.querySelectorAll(`[id^="${query}"`);
+    const elements = document.querySelectorAll(query);
     for (const element of elements) {
       const id = element.id;
       const buttonContainer = element.querySelector(containerQuery);
diff --git a/build/plugins/tooltips.html b/build/plugins/tooltips.html
index b6fc5057..e023e3a7 100644
--- a/build/plugins/tooltips.html
+++ b/build/plugins/tooltips.html
@@ -230,6 +230,7 @@
       "data-selected",
       "data-highlighted",
       "data-glow",
+      "class",
     ];
     for (const attribute of attributes) {
       sourceCopy.removeAttribute(attribute);
@@ -290,9 +291,8 @@
     prevButton.classList.add("icon_button");
     nextButton.classList.add("icon_button");
     prevButton.innerHTML = document.querySelector(".icon_caret_left").innerHTML;
-    nextButton.innerHTML = document.querySelector(
-      ".icon_caret_right"
-    ).innerHTML;
+    nextButton.innerHTML =
+      document.querySelector(".icon_caret_right").innerHTML;
     navBar.appendChild(prevButton);
     navBar.appendChild(document.createTextNode(text));
     navBar.appendChild(nextButton);
@@ -336,7 +336,7 @@
     if (!target) return;
 
     // if ref or figure, modify target to get expected element
-    if (id.indexOf("ref-") === 0) target = target.querySelector("p");
+    if (id.indexOf("ref-") === 0) target = target.querySelector(":nth-child(2)");
     else if (id.indexOf("fig:") === 0) target = target.querySelector("figure");
 
     return target;
diff --git a/build/themes/default.html b/build/themes/default.html
index 2396cc4d..0c855a3f 100644
--- a/build/themes/default.html
+++ b/build/themes/default.html
@@ -267,8 +267,7 @@
   }
 
   /* table auto-number */
-  table > caption > span:first-of-type,
-  div.table_wrapper > table > caption > span:first-of-type {
+  table > caption > span:first-of-type {
     font-weight: bold;
     margin-right: 5px;
   }
@@ -495,6 +494,15 @@
     top: 0.125em;
   }
 
+  /* -------------------------------------------------- */
+  /* references */
+  /* -------------------------------------------------- */
+
+  .csl-entry {
+    margin-top: 20px;
+    margin-bottom: 20px;
+  }
+
   /* -------------------------------------------------- */
   /* print control */
   /* -------------------------------------------------- */
@@ -626,7 +634,6 @@
 
   /* tablenos wrapper */
   .tablenos {
-    /* show scrollbar on tables if necessary to prevent overflow */
     width: 100%;
     margin: 20px 0;
   }