diff --git a/digitalrocks_assets/css/browse-datasets.css b/digitalrocks_assets/css/browse-datasets.css
index 30fc3c84..32450d4d 100644
--- a/digitalrocks_assets/css/browse-datasets.css
+++ b/digitalrocks_assets/css/browse-datasets.css
@@ -1,5 +1,8 @@
 @import url('https://cdn.jsdelivr.net/npm/@tacc/core-styles@2/dist/components/bootstrap.pagination.css');
 
-/* https://github.com/TACC/Core-CMS-Custom/pull/494 */
-@import url('https://cdn.jsdelivr.net/gh/TACC/Core-Portal@aef0da5/client/src/components/DataFiles/DataFilesForDPM/styles/components.global.css');
-@import url('https://cdn.jsdelivr.net/gh/TACC/Core-Portal@aef0da5/client/src/components/DataFiles/DataFilesForDPM/styles/customize-core-styles.global.css');
+/* https://github.com/TACC/Core-Portal/pull/1127 */
+@import url('https://cdn.jsdelivr.net/gh/TACC/Core-Portal@b49998b/client/src/styles/components/bootstrap.tooltip.css');
+
+/* https://github.com/TACC/Core-Portal/pull/1135 */
+@import url('https://cdn.jsdelivr.net/gh/TACC/Core-Portal@8ecac65/client/src/components/DataFiles/DataFilesForDPM/styles/components.global.css');
+@import url('https://cdn.jsdelivr.net/gh/TACC/Core-Portal@8ecac65/client/src/components/DataFiles/DataFilesForDPM/styles/customize-core-styles.global.css');
diff --git a/digitalrocks_assets/snippets/js-about.html b/digitalrocks_assets/snippets/js-about.html
index cdf07fc5..03c9bdbf 100644
--- a/digitalrocks_assets/snippets/js-about.html
+++ b/digitalrocks_assets/snippets/js-about.html
@@ -1,4 +1,4 @@
-<script id="js-about">
+<script type="module" id="js-about">
 /* FAQ: WYSIWYG (as of 2024-11) does not permit "reversed" attribute in markup */
 const lists = document.getElementById('cms-content').getElementsByTagName('ol');
 [ ...lists ].forEach( list => list.reversed = true );
diff --git a/digitalrocks_assets/snippets/js-bootstrap-tooltips.html b/digitalrocks_assets/snippets/js-bootstrap-tooltips.html
new file mode 100644
index 00000000..75f65bb4
--- /dev/null
+++ b/digitalrocks_assets/snippets/js-bootstrap-tooltips.html
@@ -0,0 +1,9 @@
+<script type="module" id="js-bootstrap-tooltips">
+let tooltipInstances = [];
+if (window.bootstrap && window.bootstrap.Tooltip) {
+    const tooltipTriggerList = document.querySelectorAll('[data-bs-toggle="tooltip"]');
+    tooltipInstances = [...tooltipTriggerList].map(
+    (el) => new window.bootstrap.Tooltip(el)
+    );
+}
+</script>
diff --git a/digitalrocks_assets/snippets/projects-000--citation-modal.html b/digitalrocks_assets/snippets/projects-000--citation-modal.html
index 254ade7e..b0a017ce 100644
--- a/digitalrocks_assets/snippets/projects-000--citation-modal.html
+++ b/digitalrocks_assets/snippets/projects-000--citation-modal.html
@@ -10,7 +10,7 @@ <h5 class="modal-title" id="project-metrics-modal-title">Dataset metrics</h5>
       </div>
       <div class="modal-body">
         <div class="metrics-tableset">
-          <table>
+          <table class="metrics-table">
             <thead>
               <tr>
                 <th>Aggregated Usage</th>
@@ -24,7 +24,11 @@ <h5 class="modal-title" id="project-metrics-modal-title">Dataset metrics</h5>
                   <small class="metrics-note">(views)</small>
                   <i
                     title="Refers to the number of one-hour sessions during which a user previewed/downloaded/copied files associated with this DOI."
-                    data-title="Unique Investigations (Views)">?</i>
+                    data-bs-toggle="tooltip"
+                    data-bs-placement="top"
+                  >
+                    ⓘ
+                  </i>
                 </td>
                 <td>0</td>
               </tr>
@@ -34,7 +38,11 @@ <h5 class="modal-title" id="project-metrics-modal-title">Dataset metrics</h5>
                   <small class="metrics-note">(downloads)</small>
                   <i
                     title="Refers to the number of one-hour sessions during which a user previewed/downloaded/copied files associated with this DOI."
-                    data-title="Unique Requests (Downloads)">?</i>
+                    data-bs-toggle="tooltip"
+                    data-bs-placement="top"
+                  >
+                    ⓘ
+                  </i>
                 </td>
                 <td>0</td>
               </tr>
@@ -43,13 +51,17 @@ <h5 class="modal-title" id="project-metrics-modal-title">Dataset metrics</h5>
                   Total Requests
                   <i
                     title="Refers to the number of one-hour sessions during which a user previewed/downloaded/copied files associated with this DOI."
-                    data-title="Total Requests">?</i>
+                    data-bs-toggle="tooltip"
+                    data-bs-placement="top"
+                  >
+                    ⓘ
+                  </i>
                 </td>
                 <td>0</td>
               </tr>
             </tbody>
           </table>
-          <table>
+          <table class="metrics-table">
             <thead>
               <tr>
                 <th>