diff --git a/assets/css/default.css b/assets/css/default.css
index c9b967bdb3..5d239153d5 100644
--- a/assets/css/default.css
+++ b/assets/css/default.css
@@ -238,7 +238,7 @@ i.group-icon :hover {
 }
 
 .experiments .card-body {
-    background-color: #E8F6FF;
+    background-color: #FCFEFF;
 }
 
 .experiments .accordion-inner .dataset-list-header {
@@ -259,7 +259,7 @@ i.group-icon :hover {
 }
 
 .projects .card-body {
-    background-color: #E8F6FF;
+    background-color: #FCFEFF;
 }
 
 .projects .accordion-inner .exp-list-header {
diff --git a/assets/js/apps/badges/components/DatafileCountBadge.jsx b/assets/js/apps/badges/components/DatafileCountBadge.jsx
index 9b0956cac5..95bc30a6ba 100644
--- a/assets/js/apps/badges/components/DatafileCountBadge.jsx
+++ b/assets/js/apps/badges/components/DatafileCountBadge.jsx
@@ -16,7 +16,7 @@ const DatafileCountBadge = ({ experimentData }) => {
 
   return (
     <Fragment>
-      <Badge variant="info" title={title}>
+      <Badge bg="light" text="dark" title={title}>
         <i className="fa fa-file" />
 &nbsp;
         {datafileCount}
@@ -29,4 +29,4 @@ DatafileCountBadge.propTypes = {
   experimentData: PropTypes.object.isRequired,
 };
 
-export default DatafileCountBadge;
+export default DatafileCountBadge;
\ No newline at end of file
diff --git a/assets/js/apps/badges/components/DatasetCountBadge.jsx b/assets/js/apps/badges/components/DatasetCountBadge.jsx
index 4ed2cfd72b..9381341932 100644
--- a/assets/js/apps/badges/components/DatasetCountBadge.jsx
+++ b/assets/js/apps/badges/components/DatasetCountBadge.jsx
@@ -16,7 +16,7 @@ const DatasetCountBadge = ({ experimentData }) => {
 
   return (
     <Fragment>
-      <Badge variant="info" title={title}>
+      <Badge bg="light" text="dark" title={title}>
         <i className="fa fa-folder" />
 &nbsp;
         {datasetCount}
diff --git a/assets/js/apps/badges/components/DatasetDatafileCountBadge.jsx b/assets/js/apps/badges/components/DatasetDatafileCountBadge.jsx
index d1c5d1eb76..13c15493b4 100644
--- a/assets/js/apps/badges/components/DatasetDatafileCountBadge.jsx
+++ b/assets/js/apps/badges/components/DatasetDatafileCountBadge.jsx
@@ -15,7 +15,7 @@ const DatasetDatafileCountBadge = ({ datasetData }) => {
 
   return (
     <Fragment>
-      <Badge variant="info" title={title}>
+      <Badge bg="light" text="dark" title={title}>
         <i className="fa fa-file" />
 &nbsp;
         {count}
diff --git a/assets/js/apps/badges/components/DatasetExperimentCountBadge.jsx b/assets/js/apps/badges/components/DatasetExperimentCountBadge.jsx
index 8cf3b15182..3f3e76550a 100644
--- a/assets/js/apps/badges/components/DatasetExperimentCountBadge.jsx
+++ b/assets/js/apps/badges/components/DatasetExperimentCountBadge.jsx
@@ -15,7 +15,7 @@ const DatasetExperimentCountBadge = ({ datasetData }) => {
 
   return (
     <Fragment>
-      <Badge variant="info" title={title}>
+      <Badge bg="light" text="dark" title={title}>
         <i className="fa fa-cogs" />
 &nbsp;
         {count}
diff --git a/assets/js/apps/badges/components/DatasetSizeBadge.jsx b/assets/js/apps/badges/components/DatasetSizeBadge.jsx
index c408886d42..f98c48474f 100644
--- a/assets/js/apps/badges/components/DatasetSizeBadge.jsx
+++ b/assets/js/apps/badges/components/DatasetSizeBadge.jsx
@@ -16,7 +16,7 @@ const DatasetSizeBadge = ({ datasetData }) => {
 
   return (
     <Fragment>
-      <Badge variant="info" title={title}>
+      <Badge bg="light" text="dark" title={title}>
         {datasetSize}
       </Badge>
     </Fragment>
diff --git a/assets/js/apps/badges/components/ExperimentCountBadge.jsx b/assets/js/apps/badges/components/ExperimentCountBadge.jsx
index 52faef8656..3d18686a10 100644
--- a/assets/js/apps/badges/components/ExperimentCountBadge.jsx
+++ b/assets/js/apps/badges/components/ExperimentCountBadge.jsx
@@ -16,7 +16,7 @@ const ExperimentCountBadge = ({ projectData }) => {
 
   return (
     <Fragment>
-      <Badge variant="info" title={title}>
+      <Badge bg="light" text="dark" title={title}>
         <i className="fa fa-cogs" />
 &nbsp;
         {experimentCount}
diff --git a/assets/js/apps/badges/components/ExperimentLastUpdateBadge.jsx b/assets/js/apps/badges/components/ExperimentLastUpdateBadge.jsx
index b08e66f76a..5aba18e89b 100644
--- a/assets/js/apps/badges/components/ExperimentLastUpdateBadge.jsx
+++ b/assets/js/apps/badges/components/ExperimentLastUpdateBadge.jsx
@@ -20,7 +20,7 @@ const ExperimentLastUpdatedBadge = ({ experimentData }) => {
       {loading
         ? <span className=" float-end spinner-grow spinner-grow-sm" role="status" aria-hidden="true" />
         : (
-          <Badge variant="info" title={title}>
+          <Badge bg="light" text="dark" title={title}>
             <i className="fa fa-clock-o" />
 &nbsp;
             {lastUpdatedTime}
diff --git a/assets/js/apps/badges/components/ExperimentSizeBadge.jsx b/assets/js/apps/badges/components/ExperimentSizeBadge.jsx
index a480bc0766..9cf2607172 100644
--- a/assets/js/apps/badges/components/ExperimentSizeBadge.jsx
+++ b/assets/js/apps/badges/components/ExperimentSizeBadge.jsx
@@ -15,7 +15,7 @@ const ExperimentSizeBadge = ({ experimentData }) => {
   }, []);
   return (
     <Fragment>
-      <Badge variant="info" title={title}>
+      <Badge bg="light" text="dark" title={title}>
         {experimentSize}
       </Badge>
     </Fragment>
diff --git a/assets/js/apps/badges/components/HSMDataFileCountBadge.jsx b/assets/js/apps/badges/components/HSMDataFileCountBadge.jsx
index 8d502e5b05..99fd542acc 100644
--- a/assets/js/apps/badges/components/HSMDataFileCountBadge.jsx
+++ b/assets/js/apps/badges/components/HSMDataFileCountBadge.jsx
@@ -16,7 +16,7 @@ const HSMDataFileCountBadge = ({ datasetId }) => {
 
   return (
     <Fragment>
-      <Badge variant="info" title={`${onlineFilesCount} of ${totalFileCount} Files online`}>
+      <Badge bg="light" text="dark" title={`${onlineFilesCount} of ${totalFileCount} Files online`}>
         <i className="fa fa-file" />
 &nbsp;
         {totalFileCount}
diff --git a/assets/js/apps/badges/components/PublicAccessBadge.jsx b/assets/js/apps/badges/components/PublicAccessBadge.jsx
index c211d505d3..3f286a8655 100644
--- a/assets/js/apps/badges/components/PublicAccessBadge.jsx
+++ b/assets/js/apps/badges/components/PublicAccessBadge.jsx
@@ -12,26 +12,27 @@ const PublicAccessBadge = ({ experimentData }) => {
     if (accessType === 1) {
       setPublicAccess(' Private');
       setTitle(' No public access');
-      setvariantType('secondary');
+      setvariantType('light');
     } else if (accessType === 100) {
       setPublicAccess(' Public');
       setTitle(' All data is public');
-      setvariantType('success');
+      setvariantType('light');
     } else if (accessType === 25) {
       setPublicAccess(' [PUBLICATION] Awaiting release');
       setTitle(' Under embargo and awaiting release');
-      setvariantType('secondary');
+      setvariantType('light');
     } else if (accessType === 50) {
       setPublicAccess(' Metadata');
       setTitle(' Only descriptions are public, not data');
-      setvariantType('success');
+      setvariantType('light');
     }
   }, [experimentData]);
 
   return (
     <Fragment>
       <Badge
-        variant={variantType}
+        bg={variantType}
+        text="dark"
         content={title}
         title={title}
       >
diff --git a/assets/js/apps/badges/components/__tests__/DatasetViewPageBadges.spec.jsx b/assets/js/apps/badges/components/__tests__/DatasetViewPageBadges.spec.jsx
index ec7a932a91..691bb1997b 100644
--- a/assets/js/apps/badges/components/__tests__/DatasetViewPageBadges.spec.jsx
+++ b/assets/js/apps/badges/components/__tests__/DatasetViewPageBadges.spec.jsx
@@ -73,6 +73,6 @@ describe('renders badges on experiment view page', () => {
       ReactDOM.render(<DatasetViewPageBadges datasetID="123" hsmEnabled />, container);
     });
     expect(container.querySelectorAll('span')[4].textContent.trim())
-      .toEqual('13.56 MB');
+      .toEqual('13.56 MiB');
   });
 });
diff --git a/assets/js/apps/badges/components/__tests__/__snapshots__/DatasetViewPageBadges.spec.jsx.snap b/assets/js/apps/badges/components/__tests__/__snapshots__/DatasetViewPageBadges.spec.jsx.snap
index 00768de731..3443dad2f1 100644
--- a/assets/js/apps/badges/components/__tests__/__snapshots__/DatasetViewPageBadges.spec.jsx.snap
+++ b/assets/js/apps/badges/components/__tests__/__snapshots__/DatasetViewPageBadges.spec.jsx.snap
@@ -9,7 +9,7 @@ exports[`renders badges on experiment view page should render all badges 1`] = `
     class="mr-2"
   >
     <span
-      class="badge badge-info"
+      class="badge text-dark bg-light"
       title="In 3 experiments"
     >
       <i
@@ -23,7 +23,7 @@ exports[`renders badges on experiment view page should render all badges 1`] = `
     class="mr-2"
   >
     <span
-      class="badge badge-info"
+      class="badge text-dark bg-light"
       title="4 of 4 Files online"
     >
       <i
@@ -37,10 +37,10 @@ exports[`renders badges on experiment view page should render all badges 1`] = `
     class="mr-2"
   >
     <span
-      class="badge badge-info"
+      class="badge text-dark bg-light"
       title="Dataset size is"
     >
-      13.56 MB
+      13.56 MiB
     </span>
   </span>
 </div>
diff --git a/assets/js/apps/badges/components/__tests__/__snapshots__/ExperimentViewPageBadges.spec.jsx.snap b/assets/js/apps/badges/components/__tests__/__snapshots__/ExperimentViewPageBadges.spec.jsx.snap
index 7edcf81fe1..7ffd481777 100644
--- a/assets/js/apps/badges/components/__tests__/__snapshots__/ExperimentViewPageBadges.spec.jsx.snap
+++ b/assets/js/apps/badges/components/__tests__/__snapshots__/ExperimentViewPageBadges.spec.jsx.snap
@@ -9,7 +9,7 @@ exports[`renders badges on experiment view page should render all badges 1`] = `
     class="mr-2"
   >
     <span
-      class="badge badge-info"
+      class="badge text-dark bg-light"
       title="1 dataset"
     >
       <i
@@ -23,7 +23,7 @@ exports[`renders badges on experiment view page should render all badges 1`] = `
     class="mr-2"
   >
     <span
-      class="badge badge-info"
+      class="badge text-dark bg-light"
       title="100 files"
     >
       <i
@@ -37,17 +37,17 @@ exports[`renders badges on experiment view page should render all badges 1`] = `
     class="mr-2"
   >
     <span
-      class="badge badge-info"
-      title="Experiment size is ~ 1 KB"
+      class="badge text-dark bg-light"
+      title="Experiment size is ~ 1 KiB"
     >
-      1 KB
+      1 KiB
     </span>
   </span>
   <span
     class="mr-2"
   >
     <span
-      class="badge badge-info"
+      class="badge text-dark bg-light"
       title="Last updated: Mon, Jan 13, 2020 2:00 PM"
     >
       <i
@@ -61,7 +61,7 @@ exports[`renders badges on experiment view page should render all badges 1`] = `
     class="mr-2"
   >
     <span
-      class="badge badge-secondary"
+      class="badge text-dark bg-light"
       content=" No public access"
       title=" No public access"
     >
diff --git a/assets/js/apps/badges/components/__tests__/__snapshots__/IndexPageBadges.spec.jsx.snap b/assets/js/apps/badges/components/__tests__/__snapshots__/IndexPageBadges.spec.jsx.snap
index f38546bc6b..8da8f3bdfa 100644
--- a/assets/js/apps/badges/components/__tests__/__snapshots__/IndexPageBadges.spec.jsx.snap
+++ b/assets/js/apps/badges/components/__tests__/__snapshots__/IndexPageBadges.spec.jsx.snap
@@ -9,7 +9,7 @@ exports[`renders badges on index page should render correctly 1`] = `
       class="mr-1 list-inline-item"
     >
       <span
-        class="badge badge-info"
+        class="badge text-dark bg-light"
         title="Last updated: Mon, Jan 13, 2020 2:00 PM"
       >
         <i
@@ -23,7 +23,7 @@ exports[`renders badges on index page should render correctly 1`] = `
       class="mr-1 list-inline-item"
     >
       <span
-        class="badge badge-info"
+        class="badge text-dark bg-light"
         title="1 dataset"
       >
         <i
@@ -37,7 +37,7 @@ exports[`renders badges on index page should render correctly 1`] = `
       class="mr-1 list-inline-item"
     >
       <span
-        class="badge badge-info"
+        class="badge text-dark bg-light"
         title="100 files"
       >
         <i
@@ -51,7 +51,7 @@ exports[`renders badges on index page should render correctly 1`] = `
       class="mr-1 list-inline-item"
     >
       <span
-        class="badge badge-secondary"
+        class="badge text-dark bg-light"
         content=" No public access"
         title=" No public access"
       >
diff --git a/assets/js/apps/projects/view/init.js b/assets/js/apps/projects/view/init.js
index 3793876710..92852bcd09 100644
--- a/assets/js/apps/projects/view/init.js
+++ b/assets/js/apps/projects/view/init.js
@@ -40,7 +40,7 @@ $(document).on("change", "#schemaselect", function(e) {
     var $jqmContentDiv = $this.closest(".modal-body");
 
     var type = $this.attr("data-type");
-    var parentObjectId = $this.attr("data-parent_object_id");
+    var parentObjectId = $this.attr("data-bs-parent_object_id");
     var href = "/project/ajax/add_" + type + "_parameters/" + parentObjectId + "/?schema_id=" + $this.val();
     $.get(href, function(data) {
         $jqmContentDiv.html(data);
@@ -73,7 +73,7 @@ $(document).on("submit", "#add_metadata_form", function(e) {
 
     var schemaId = $("#schemaselect").val();
     var type = form.attr("data-type");
-    var parentObjectId = form.attr("data-parent_object_id");
+    var parentObjectId = form.attr("data-bs-parent_object_id");
     var href = "/project/ajax/add_" + type + "_parameters/" + parentObjectId + "/?schema_id=" + schemaId;
 
     $.ajax({
diff --git a/assets/js/apps/search/__snapshots__/Storyshots.spec.jsx.snap b/assets/js/apps/search/__snapshots__/Storyshots.spec.jsx.snap
index addddf0903..b1f9b71277 100644
--- a/assets/js/apps/search/__snapshots__/Storyshots.spec.jsx.snap
+++ b/assets/js/apps/search/__snapshots__/Storyshots.spec.jsx.snap
@@ -114,9 +114,12 @@ exports[`Storyshots EntryPreviewCard Data File 1`] = `
       >
         <a
           className="preview-card__button--right btn btn-primary"
+          disabled={false}
           href="idk/"
           onClick={[Function]}
           onKeyDown={[Function]}
+          role="button"
+          tabIndex={0}
           target="_blank"
         >
           View details
@@ -257,9 +260,12 @@ exports[`Storyshots EntryPreviewCard Data Set 1`] = `
       >
         <a
           className="preview-card__button--right btn btn-primary"
+          disabled={false}
           href="idk/"
           onClick={[Function]}
           onKeyDown={[Function]}
+          role="button"
+          tabIndex={0}
           target="_blank"
         >
           View details
@@ -541,9 +547,12 @@ exports[`Storyshots EntryPreviewCard Experiment 1`] = `
       >
         <a
           className="preview-card__button--right btn btn-primary"
+          disabled={false}
           href="idk/"
           onClick={[Function]}
           onKeyDown={[Function]}
+          role="button"
+          tabIndex={0}
           target="_blank"
         >
           View details
@@ -704,9 +713,12 @@ exports[`Storyshots EntryPreviewCard No Children 1`] = `
       >
         <a
           className="preview-card__button--right btn btn-primary"
+          disabled={false}
           href="idk/"
           onClick={[Function]}
           onKeyDown={[Function]}
+          role="button"
+          tabIndex={0}
           target="_blank"
         >
           View details
@@ -861,9 +873,12 @@ exports[`Storyshots EntryPreviewCard No Date 1`] = `
       >
         <a
           className="preview-card__button--right btn btn-primary"
+          disabled={false}
           href="idk/"
           onClick={[Function]}
           onKeyDown={[Function]}
+          role="button"
+          tabIndex={0}
           target="_blank"
         >
           View details
@@ -1040,9 +1055,12 @@ exports[`Storyshots EntryPreviewCard Project 1`] = `
       >
         <a
           className="preview-card__button--right btn btn-primary"
+          disabled={false}
           href="idk/"
           onClick={[Function]}
           onKeyDown={[Function]}
+          role="button"
+          tabIndex={0}
           target="_blank"
         >
           View details
@@ -1231,121 +1249,144 @@ exports[`Storyshots Filter sidebar Default 1`] = `
     className="filter-sidebar"
   >
     <section>
-      <nav
+      <ul
         className="nav nav-tabs"
+        id="filters-section"
         onKeyDown={[Function]}
         role="tablist"
       >
-        <a
-          aria-controls="filters-section-tabpane-project"
-          aria-selected={true}
-          className="nav-item nav-link active"
-          data-rb-event-key="project"
-          href="#"
-          id="filters-section-tab-project"
-          onClick={[Function]}
-          onKeyDown={[Function]}
-          role="tab"
+        <li
+          className="nav-item"
+          role="presentation"
         >
-          <div
-            className="tab-sticker"
-            style={
-              {
-                "backgroundColor": "#f7db8d",
-              }
-            }
+          <button
+            aria-controls="filters-section-tabpane-project"
+            aria-selected={true}
+            className="nav-link active"
+            data-rr-ui-event-key="project"
+            disabled={false}
+            id="filters-section-tab-project"
+            onClick={[Function]}
+            role="tab"
+            type="button"
           >
             <div
-              className="tab-stick--content"
+              className="tab-sticker"
+              style={
+                {
+                  "backgroundColor": "#f7db8d",
+                }
+              }
             >
-              P
+              <div
+                className="tab-stick--content"
+              >
+                P
+              </div>
             </div>
-          </div>
-        </a>
-        <a
-          aria-controls="filters-section-tabpane-experiment"
-          aria-selected={false}
-          className="nav-item nav-link"
-          data-rb-event-key="experiment"
-          href="#"
-          id="filters-section-tab-experiment"
-          onClick={[Function]}
-          onKeyDown={[Function]}
-          role="tab"
+          </button>
+        </li>
+        <li
+          className="nav-item"
+          role="presentation"
         >
-          <div
-            className="tab-sticker"
-            style={
-              {
-                "backgroundColor": "#abe2ff",
-              }
-            }
+          <button
+            aria-controls="filters-section-tabpane-experiment"
+            aria-selected={false}
+            className="nav-link"
+            data-rr-ui-event-key="experiment"
+            disabled={false}
+            id="filters-section-tab-experiment"
+            onClick={[Function]}
+            role="tab"
+            tabIndex={-1}
+            type="button"
           >
             <div
-              className="tab-stick--content"
+              className="tab-sticker"
+              style={
+                {
+                  "backgroundColor": "#abe2ff",
+                }
+              }
             >
-              E
+              <div
+                className="tab-stick--content"
+              >
+                E
+              </div>
             </div>
-          </div>
-        </a>
-        <a
-          aria-controls="filters-section-tabpane-dataset"
-          aria-selected={false}
-          className="nav-item nav-link"
-          data-rb-event-key="dataset"
-          href="#"
-          id="filters-section-tab-dataset"
-          onClick={[Function]}
-          onKeyDown={[Function]}
-          role="tab"
+          </button>
+        </li>
+        <li
+          className="nav-item"
+          role="presentation"
         >
-          <div
-            className="tab-sticker"
-            style={
-              {
-                "backgroundColor": "#ffcce8",
-              }
-            }
+          <button
+            aria-controls="filters-section-tabpane-dataset"
+            aria-selected={false}
+            className="nav-link"
+            data-rr-ui-event-key="dataset"
+            disabled={false}
+            id="filters-section-tab-dataset"
+            onClick={[Function]}
+            role="tab"
+            tabIndex={-1}
+            type="button"
           >
             <div
-              className="tab-stick--content"
+              className="tab-sticker"
+              style={
+                {
+                  "backgroundColor": "#ffcce8",
+                }
+              }
             >
-              DS
+              <div
+                className="tab-stick--content"
+              >
+                DS
+              </div>
             </div>
-          </div>
-        </a>
-        <a
-          aria-controls="filters-section-tabpane-datafile"
-          aria-selected={false}
-          className="nav-item nav-link"
-          data-rb-event-key="datafile"
-          href="#"
-          id="filters-section-tab-datafile"
-          onClick={[Function]}
-          onKeyDown={[Function]}
-          role="tab"
+          </button>
+        </li>
+        <li
+          className="nav-item"
+          role="presentation"
         >
-          <div
-            className="tab-sticker"
-            style={
-              {
-                "backgroundColor": "#70ffae",
-              }
-            }
+          <button
+            aria-controls="filters-section-tabpane-datafile"
+            aria-selected={false}
+            className="nav-link"
+            data-rr-ui-event-key="datafile"
+            disabled={false}
+            id="filters-section-tab-datafile"
+            onClick={[Function]}
+            role="tab"
+            tabIndex={-1}
+            type="button"
           >
             <div
-              className="tab-stick--content"
+              className="tab-sticker"
+              style={
+                {
+                  "backgroundColor": "#70ffae",
+                }
+              }
             >
-              DF
+              <div
+                className="tab-stick--content"
+              >
+                DF
+              </div>
             </div>
-          </div>
-        </a>
-      </nav>
+          </button>
+        </li>
+      </ul>
       <div
         className="tab-content"
       >
         <div
-          aria-hidden={false}
           aria-labelledby="filters-section-tab-project"
           className="fade tab-pane active show"
           id="filters-section-tabpane-project"
@@ -1392,18 +1433,14 @@ exports[`Storyshots Filter sidebar Default 1`] = `
                   placeholder=""
                   value=""
                 />
-                <div
-                  className="input-group-append"
+                <button
+                  aria-label="Filter results"
+                  className="btn btn-outline-secondary"
+                  disabled={false}
+                  type="submit"
                 >
-                  <button
-                    aria-label="Filter results"
-                    className="btn btn-outline-secondary"
-                    disabled={false}
-                    type="submit"
-                  >
-                    Filter
-                  </button>
-                </div>
+                  Filter
+                </button>
               </div>
             </form>
           </section>
@@ -1419,7 +1456,7 @@ exports[`Storyshots Filter sidebar Default 1`] = `
               onSubmit={[Function]}
             >
               <div
-                className="date-range-filter__field form-group"
+                className="date-range-filter__field"
               >
                 <label
                   className="form-label"
@@ -1911,7 +1948,7 @@ exports[`Storyshots Filter sidebar Default 1`] = `
                 </div>
               </div>
               <div
-                className="date-range-filter__field form-group"
+                className="date-range-filter__field"
               >
                 <label
                   className="form-label"
@@ -2404,7 +2441,7 @@ exports[`Storyshots Filter sidebar Default 1`] = `
               </div>
               <button
                 aria-label="Filter results"
-                className="date-range-filter__button btn btn-outline-secondary"
+                className="date-range-filter__button mt-3 btn btn-outline-secondary"
                 disabled={false}
                 type="submit"
               >
@@ -2433,18 +2470,14 @@ exports[`Storyshots Filter sidebar Default 1`] = `
                   placeholder=""
                   value=""
                 />
-                <div
-                  className="input-group-append"
+                <button
+                  aria-label="Filter results"
+                  className="btn btn-outline-secondary"
+                  disabled={false}
+                  type="submit"
                 >
-                  <button
-                    aria-label="Filter results"
-                    className="btn btn-outline-secondary"
-                    disabled={false}
-                    type="submit"
-                  >
-                    Filter
-                  </button>
-                </div>
+                  Filter
+                </button>
               </div>
             </form>
           </section>
@@ -2455,9 +2488,7 @@ exports[`Storyshots Filter sidebar Default 1`] = `
             >
               Schemas
             </h3>
-            <div
-              className="form-group"
-            >
+            <div>
               <div
                 className="form-check"
               >
@@ -2501,26 +2532,27 @@ exports[`Storyshots Filter sidebar Default 1`] = `
               className="accordion"
             >
               <div
-                className="card"
+                className="accordion-item"
               >
-                <div
-                  className="card-header"
+                <h2
+                  className="accordion-header"
                 >
                   <button
-                    className="btn btn-link"
+                    aria-expanded={true}
+                    className="accordion-button"
                     onClick={[Function]}
                     type="button"
                   >
                     Raw data
                      filters
                   </button>
-                </div>
+                </h2>
                 <div
                   aria-expanded={null}
-                  className="collapse"
+                  className="accordion-collapse collapse show"
                 >
                   <div
-                    className="card-body"
+                    className="accordion-body"
                   >
                     <section
                       className="single-schema-list__filter"
@@ -2544,18 +2576,14 @@ exports[`Storyshots Filter sidebar Default 1`] = `
                             placeholder=""
                             value=""
                           />
-                          <div
-                            className="input-group-append"
-                          >
-                            <button
-                              aria-label="Filter results"
-                              className="btn btn-outline-secondary"
-                              disabled={false}
-                              type="submit"
-                            >
-                              Filter
-                            </button>
-                          </div>
+                          <button
+                            aria-label="Filter results"
+                            className="btn btn-outline-secondary"
+                            disabled={false}
+                            type="submit"
+                          >
+                            Filter
+                          </button>
                         </div>
                       </form>
                       <hr />
@@ -2582,18 +2610,14 @@ exports[`Storyshots Filter sidebar Default 1`] = `
                             placeholder=""
                             value=""
                           />
-                          <div
-                            className="input-group-append"
-                          >
-                            <button
-                              aria-label="Filter results"
-                              className="btn btn-outline-secondary"
-                              disabled={false}
-                              type="submit"
-                            >
-                              Filter
-                            </button>
-                          </div>
+                          <button
+                            aria-label="Filter results"
+                            className="btn btn-outline-secondary"
+                            disabled={false}
+                            type="submit"
+                          >
+                            Filter
+                          </button>
                         </div>
                       </form>
                       <hr />
@@ -2620,18 +2644,14 @@ exports[`Storyshots Filter sidebar Default 1`] = `
                             placeholder=""
                             value=""
                           />
-                          <div
-                            className="input-group-append"
-                          >
-                            <button
-                              aria-label="Filter results"
-                              className="btn btn-outline-secondary"
-                              disabled={false}
-                              type="submit"
-                            >
-                              Filter
-                            </button>
-                          </div>
+                          <button
+                            aria-label="Filter results"
+                            className="btn btn-outline-secondary"
+                            disabled={false}
+                            type="submit"
+                          >
+                            Filter
+                          </button>
                         </div>
                       </form>
                       <hr />
@@ -2643,7 +2663,6 @@ exports[`Storyshots Filter sidebar Default 1`] = `
           </section>
         </div>
         <div
-          aria-hidden={true}
           aria-labelledby="filters-section-tab-experiment"
           className="fade tab-pane"
           id="filters-section-tabpane-experiment"
@@ -2690,18 +2709,14 @@ exports[`Storyshots Filter sidebar Default 1`] = `
                   placeholder=""
                   value=""
                 />
-                <div
-                  className="input-group-append"
+                <button
+                  aria-label="Filter results"
+                  className="btn btn-outline-secondary"
+                  disabled={false}
+                  type="submit"
                 >
-                  <button
-                    aria-label="Filter results"
-                    className="btn btn-outline-secondary"
-                    disabled={false}
-                    type="submit"
-                  >
-                    Filter
-                  </button>
-                </div>
+                  Filter
+                </button>
               </div>
             </form>
           </section>
@@ -2717,7 +2732,7 @@ exports[`Storyshots Filter sidebar Default 1`] = `
               onSubmit={[Function]}
             >
               <div
-                className="date-range-filter__field form-group"
+                className="date-range-filter__field"
               >
                 <label
                   className="form-label"
@@ -3209,7 +3224,7 @@ exports[`Storyshots Filter sidebar Default 1`] = `
                 </div>
               </div>
               <div
-                className="date-range-filter__field form-group"
+                className="date-range-filter__field"
               >
                 <label
                   className="form-label"
@@ -3702,7 +3717,7 @@ exports[`Storyshots Filter sidebar Default 1`] = `
               </div>
               <button
                 aria-label="Filter results"
-                className="date-range-filter__button btn btn-outline-secondary"
+                className="date-range-filter__button mt-3 btn btn-outline-secondary"
                 disabled={false}
                 type="submit"
               >
@@ -3731,18 +3746,14 @@ exports[`Storyshots Filter sidebar Default 1`] = `
                   placeholder=""
                   value=""
                 />
-                <div
-                  className="input-group-append"
+                <button
+                  aria-label="Filter results"
+                  className="btn btn-outline-secondary"
+                  disabled={false}
+                  type="submit"
                 >
-                  <button
-                    aria-label="Filter results"
-                    className="btn btn-outline-secondary"
-                    disabled={false}
-                    type="submit"
-                  >
-                    Filter
-                  </button>
-                </div>
+                  Filter
+                </button>
               </div>
             </form>
           </section>
@@ -3753,9 +3764,7 @@ exports[`Storyshots Filter sidebar Default 1`] = `
             >
               Schemas
             </h3>
-            <div
-              className="form-group"
-            >
+            <div>
               <div
                 className="form-check"
               >
@@ -3799,26 +3808,27 @@ exports[`Storyshots Filter sidebar Default 1`] = `
               className="accordion"
             >
               <div
-                className="card"
+                className="accordion-item"
               >
-                <div
-                  className="card-header"
+                <h2
+                  className="accordion-header"
                 >
                   <button
-                    className="btn btn-link"
+                    aria-expanded={true}
+                    className="accordion-button"
                     onClick={[Function]}
                     type="button"
                   >
                     Biopipeline Output
                      filters
                   </button>
-                </div>
+                </h2>
                 <div
                   aria-expanded={null}
-                  className="collapse"
+                  className="accordion-collapse collapse show"
                 >
                   <div
-                    className="card-body"
+                    className="accordion-body"
                   >
                     <section
                       className="single-schema-list__filter"
@@ -3842,18 +3852,14 @@ exports[`Storyshots Filter sidebar Default 1`] = `
                             placeholder=""
                             value=""
                           />
-                          <div
-                            className="input-group-append"
-                          >
-                            <button
-                              aria-label="Filter results"
-                              className="btn btn-outline-secondary"
-                              disabled={false}
-                              type="submit"
-                            >
-                              Filter
-                            </button>
-                          </div>
+                          <button
+                            aria-label="Filter results"
+                            className="btn btn-outline-secondary"
+                            disabled={false}
+                            type="submit"
+                          >
+                            Filter
+                          </button>
                         </div>
                       </form>
                       <hr />
@@ -3880,18 +3886,14 @@ exports[`Storyshots Filter sidebar Default 1`] = `
                             placeholder=""
                             value=""
                           />
-                          <div
-                            className="input-group-append"
-                          >
-                            <button
-                              aria-label="Filter results"
-                              className="btn btn-outline-secondary"
-                              disabled={false}
-                              type="submit"
-                            >
-                              Filter
-                            </button>
-                          </div>
+                          <button
+                            aria-label="Filter results"
+                            className="btn btn-outline-secondary"
+                            disabled={false}
+                            type="submit"
+                          >
+                            Filter
+                          </button>
                         </div>
                       </form>
                       <hr />
@@ -3918,18 +3920,14 @@ exports[`Storyshots Filter sidebar Default 1`] = `
                             placeholder=""
                             value=""
                           />
-                          <div
-                            className="input-group-append"
-                          >
-                            <button
-                              aria-label="Filter results"
-                              className="btn btn-outline-secondary"
-                              disabled={false}
-                              type="submit"
-                            >
-                              Filter
-                            </button>
-                          </div>
+                          <button
+                            aria-label="Filter results"
+                            className="btn btn-outline-secondary"
+                            disabled={false}
+                            type="submit"
+                          >
+                            Filter
+                          </button>
                         </div>
                       </form>
                       <hr />
@@ -3941,7 +3939,6 @@ exports[`Storyshots Filter sidebar Default 1`] = `
           </section>
         </div>
         <div
-          aria-hidden={true}
           aria-labelledby="filters-section-tab-dataset"
           className="fade tab-pane"
           id="filters-section-tabpane-dataset"
@@ -3988,18 +3985,14 @@ exports[`Storyshots Filter sidebar Default 1`] = `
                   placeholder=""
                   value=""
                 />
-                <div
-                  className="input-group-append"
+                <button
+                  aria-label="Filter results"
+                  className="btn btn-outline-secondary"
+                  disabled={false}
+                  type="submit"
                 >
-                  <button
-                    aria-label="Filter results"
-                    className="btn btn-outline-secondary"
-                    disabled={false}
-                    type="submit"
-                  >
-                    Filter
-                  </button>
-                </div>
+                  Filter
+                </button>
               </div>
             </form>
           </section>
@@ -4015,7 +4008,7 @@ exports[`Storyshots Filter sidebar Default 1`] = `
               onSubmit={[Function]}
             >
               <div
-                className="date-range-filter__field form-group"
+                className="date-range-filter__field"
               >
                 <label
                   className="form-label"
@@ -4507,7 +4500,7 @@ exports[`Storyshots Filter sidebar Default 1`] = `
                 </div>
               </div>
               <div
-                className="date-range-filter__field form-group"
+                className="date-range-filter__field"
               >
                 <label
                   className="form-label"
@@ -5000,7 +4993,7 @@ exports[`Storyshots Filter sidebar Default 1`] = `
               </div>
               <button
                 aria-label="Filter results"
-                className="date-range-filter__button btn btn-outline-secondary"
+                className="date-range-filter__button mt-3 btn btn-outline-secondary"
                 disabled={false}
                 type="submit"
               >
@@ -5029,18 +5022,14 @@ exports[`Storyshots Filter sidebar Default 1`] = `
                   placeholder=""
                   value=""
                 />
-                <div
-                  className="input-group-append"
+                <button
+                  aria-label="Filter results"
+                  className="btn btn-outline-secondary"
+                  disabled={false}
+                  type="submit"
                 >
-                  <button
-                    aria-label="Filter results"
-                    className="btn btn-outline-secondary"
-                    disabled={false}
-                    type="submit"
-                  >
-                    Filter
-                  </button>
-                </div>
+                  Filter
+                </button>
               </div>
             </form>
           </section>
@@ -5051,9 +5040,7 @@ exports[`Storyshots Filter sidebar Default 1`] = `
             >
               Schemas
             </h3>
-            <div
-              className="form-group"
-            >
+            <div>
               <div
                 className="form-check"
               >
@@ -5097,26 +5084,27 @@ exports[`Storyshots Filter sidebar Default 1`] = `
               className="accordion"
             >
               <div
-                className="card"
+                className="accordion-item"
               >
-                <div
-                  className="card-header"
+                <h2
+                  className="accordion-header"
                 >
                   <button
-                    className="btn btn-link"
+                    aria-expanded={true}
+                    className="accordion-button"
                     onClick={[Function]}
                     type="button"
                   >
                     Raw data
                      filters
                   </button>
-                </div>
+                </h2>
                 <div
                   aria-expanded={null}
-                  className="collapse"
+                  className="accordion-collapse collapse show"
                 >
                   <div
-                    className="card-body"
+                    className="accordion-body"
                   >
                     <section
                       className="single-schema-list__filter"
@@ -5140,18 +5128,14 @@ exports[`Storyshots Filter sidebar Default 1`] = `
                             placeholder=""
                             value=""
                           />
-                          <div
-                            className="input-group-append"
-                          >
-                            <button
-                              aria-label="Filter results"
-                              className="btn btn-outline-secondary"
-                              disabled={false}
-                              type="submit"
-                            >
-                              Filter
-                            </button>
-                          </div>
+                          <button
+                            aria-label="Filter results"
+                            className="btn btn-outline-secondary"
+                            disabled={false}
+                            type="submit"
+                          >
+                            Filter
+                          </button>
                         </div>
                       </form>
                       <hr />
@@ -5178,18 +5162,14 @@ exports[`Storyshots Filter sidebar Default 1`] = `
                             placeholder=""
                             value=""
                           />
-                          <div
-                            className="input-group-append"
-                          >
-                            <button
-                              aria-label="Filter results"
-                              className="btn btn-outline-secondary"
-                              disabled={false}
-                              type="submit"
-                            >
-                              Filter
-                            </button>
-                          </div>
+                          <button
+                            aria-label="Filter results"
+                            className="btn btn-outline-secondary"
+                            disabled={false}
+                            type="submit"
+                          >
+                            Filter
+                          </button>
                         </div>
                       </form>
                       <hr />
@@ -5216,18 +5196,14 @@ exports[`Storyshots Filter sidebar Default 1`] = `
                             placeholder=""
                             value=""
                           />
-                          <div
-                            className="input-group-append"
-                          >
-                            <button
-                              aria-label="Filter results"
-                              className="btn btn-outline-secondary"
-                              disabled={false}
-                              type="submit"
-                            >
-                              Filter
-                            </button>
-                          </div>
+                          <button
+                            aria-label="Filter results"
+                            className="btn btn-outline-secondary"
+                            disabled={false}
+                            type="submit"
+                          >
+                            Filter
+                          </button>
                         </div>
                       </form>
                       <hr />
@@ -5239,7 +5215,6 @@ exports[`Storyshots Filter sidebar Default 1`] = `
           </section>
         </div>
         <div
-          aria-hidden={true}
           aria-labelledby="filters-section-tab-datafile"
           className="fade tab-pane"
           id="filters-section-tabpane-datafile"
@@ -5286,18 +5261,14 @@ exports[`Storyshots Filter sidebar Default 1`] = `
                   placeholder=""
                   value=""
                 />
-                <div
-                  className="input-group-append"
+                <button
+                  aria-label="Filter results"
+                  className="btn btn-outline-secondary"
+                  disabled={false}
+                  type="submit"
                 >
-                  <button
-                    aria-label="Filter results"
-                    className="btn btn-outline-secondary"
-                    disabled={false}
-                    type="submit"
-                  >
-                    Filter
-                  </button>
-                </div>
+                  Filter
+                </button>
               </div>
             </form>
           </section>
@@ -5313,7 +5284,7 @@ exports[`Storyshots Filter sidebar Default 1`] = `
               onSubmit={[Function]}
             >
               <div
-                className="date-range-filter__field form-group"
+                className="date-range-filter__field"
               >
                 <label
                   className="form-label"
@@ -5805,7 +5776,7 @@ exports[`Storyshots Filter sidebar Default 1`] = `
                 </div>
               </div>
               <div
-                className="date-range-filter__field form-group"
+                className="date-range-filter__field"
               >
                 <label
                   className="form-label"
@@ -6298,7 +6269,7 @@ exports[`Storyshots Filter sidebar Default 1`] = `
               </div>
               <button
                 aria-label="Filter results"
-                className="date-range-filter__button btn btn-outline-secondary"
+                className="date-range-filter__button mt-3 btn btn-outline-secondary"
                 disabled={false}
                 type="submit"
               >
@@ -6327,18 +6298,14 @@ exports[`Storyshots Filter sidebar Default 1`] = `
                   placeholder=""
                   value=""
                 />
-                <div
-                  className="input-group-append"
+                <button
+                  aria-label="Filter results"
+                  className="btn btn-outline-secondary"
+                  disabled={false}
+                  type="submit"
                 >
-                  <button
-                    aria-label="Filter results"
-                    className="btn btn-outline-secondary"
-                    disabled={false}
-                    type="submit"
-                  >
-                    Filter
-                  </button>
-                </div>
+                  Filter
+                </button>
               </div>
             </form>
           </section>
@@ -6349,9 +6316,7 @@ exports[`Storyshots Filter sidebar Default 1`] = `
             >
               Schemas
             </h3>
-            <div
-              className="form-group"
-            >
+            <div>
               <div
                 className="form-check"
               >
@@ -6395,26 +6360,27 @@ exports[`Storyshots Filter sidebar Default 1`] = `
               className="accordion"
             >
               <div
-                className="card"
+                className="accordion-item"
               >
-                <div
-                  className="card-header"
+                <h2
+                  className="accordion-header"
                 >
                   <button
-                    className="btn btn-link"
+                    aria-expanded={true}
+                    className="accordion-button"
                     onClick={[Function]}
                     type="button"
                   >
                     Raw data
                      filters
                   </button>
-                </div>
+                </h2>
                 <div
                   aria-expanded={null}
-                  className="collapse"
+                  className="accordion-collapse collapse show"
                 >
                   <div
-                    className="card-body"
+                    className="accordion-body"
                   >
                     <section
                       className="single-schema-list__filter"
@@ -6438,18 +6404,14 @@ exports[`Storyshots Filter sidebar Default 1`] = `
                             placeholder=""
                             value=""
                           />
-                          <div
-                            className="input-group-append"
-                          >
-                            <button
-                              aria-label="Filter results"
-                              className="btn btn-outline-secondary"
-                              disabled={false}
-                              type="submit"
-                            >
-                              Filter
-                            </button>
-                          </div>
+                          <button
+                            aria-label="Filter results"
+                            className="btn btn-outline-secondary"
+                            disabled={false}
+                            type="submit"
+                          >
+                            Filter
+                          </button>
                         </div>
                       </form>
                       <hr />
@@ -6476,18 +6438,14 @@ exports[`Storyshots Filter sidebar Default 1`] = `
                             placeholder=""
                             value=""
                           />
-                          <div
-                            className="input-group-append"
-                          >
-                            <button
-                              aria-label="Filter results"
-                              className="btn btn-outline-secondary"
-                              disabled={false}
-                              type="submit"
-                            >
-                              Filter
-                            </button>
-                          </div>
+                          <button
+                            aria-label="Filter results"
+                            className="btn btn-outline-secondary"
+                            disabled={false}
+                            type="submit"
+                          >
+                            Filter
+                          </button>
                         </div>
                       </form>
                       <hr />
@@ -6514,18 +6472,14 @@ exports[`Storyshots Filter sidebar Default 1`] = `
                             placeholder=""
                             value=""
                           />
-                          <div
-                            className="input-group-append"
-                          >
-                            <button
-                              aria-label="Filter results"
-                              className="btn btn-outline-secondary"
-                              disabled={false}
-                              type="submit"
-                            >
-                              Filter
-                            </button>
-                          </div>
+                          <button
+                            aria-label="Filter results"
+                            className="btn btn-outline-secondary"
+                            disabled={false}
+                            type="submit"
+                          >
+                            Filter
+                          </button>
                         </div>
                       </form>
                       <hr />
@@ -6534,26 +6488,27 @@ exports[`Storyshots Filter sidebar Default 1`] = `
                 </div>
               </div>
               <div
-                className="card"
+                className="accordion-item"
               >
-                <div
-                  className="card-header"
+                <h2
+                  className="accordion-header"
                 >
                   <button
-                    className="btn btn-link"
+                    aria-expanded={true}
+                    className="accordion-button"
                     onClick={[Function]}
                     type="button"
                   >
                     Biopipeline Output
                      filters
                   </button>
-                </div>
+                </h2>
                 <div
                   aria-expanded={null}
-                  className="collapse"
+                  className="accordion-collapse collapse show"
                 >
                   <div
-                    className="card-body"
+                    className="accordion-body"
                   >
                     <section
                       className="single-schema-list__filter"
@@ -6577,18 +6532,14 @@ exports[`Storyshots Filter sidebar Default 1`] = `
                             placeholder=""
                             value=""
                           />
-                          <div
-                            className="input-group-append"
-                          >
-                            <button
-                              aria-label="Filter results"
-                              className="btn btn-outline-secondary"
-                              disabled={false}
-                              type="submit"
-                            >
-                              Filter
-                            </button>
-                          </div>
+                          <button
+                            aria-label="Filter results"
+                            className="btn btn-outline-secondary"
+                            disabled={false}
+                            type="submit"
+                          >
+                            Filter
+                          </button>
                         </div>
                       </form>
                       <hr />
@@ -6615,18 +6566,14 @@ exports[`Storyshots Filter sidebar Default 1`] = `
                             placeholder=""
                             value=""
                           />
-                          <div
-                            className="input-group-append"
-                          >
-                            <button
-                              aria-label="Filter results"
-                              className="btn btn-outline-secondary"
-                              disabled={false}
-                              type="submit"
-                            >
-                              Filter
-                            </button>
-                          </div>
+                          <button
+                            aria-label="Filter results"
+                            className="btn btn-outline-secondary"
+                            disabled={false}
+                            type="submit"
+                          >
+                            Filter
+                          </button>
                         </div>
                       </form>
                       <hr />
@@ -6653,18 +6600,14 @@ exports[`Storyshots Filter sidebar Default 1`] = `
                             placeholder=""
                             value=""
                           />
-                          <div
-                            className="input-group-append"
-                          >
-                            <button
-                              aria-label="Filter results"
-                              className="btn btn-outline-secondary"
-                              disabled={false}
-                              type="submit"
-                            >
-                              Filter
-                            </button>
-                          </div>
+                          <button
+                            aria-label="Filter results"
+                            className="btn btn-outline-secondary"
+                            disabled={false}
+                            type="submit"
+                          >
+                            Filter
+                          </button>
                         </div>
                       </form>
                       <hr />
@@ -6705,17 +6648,17 @@ exports[`Storyshots Filter summary box Default 1`] = `
           className="filter-summary-box__badge-group"
         >
           <span
-            className="filter-summary-box__badge badge badge-secondary"
+            className="filter-summary-box__badge badge bg-secondary"
           >
             Project.Schema
           </span>
           <span
-            className="filter-summary-box__badge filter-summarybox__badge--op badge badge-secondary"
+            className="filter-summary-box__badge filter-summarybox__badge--op badge bg-secondary"
           >
             is
           </span>
           <span
-            className="filter-summary-box__badge badge badge-secondary"
+            className="filter-summary-box__badge badge bg-secondary"
           >
             1
           </span>
@@ -6729,17 +6672,17 @@ exports[`Storyshots Filter summary box Default 1`] = `
           className="filter-summary-box__badge-group"
         >
           <span
-            className="filter-summary-box__badge badge badge-secondary"
+            className="filter-summary-box__badge badge bg-secondary"
           >
             Experiment.Schema
           </span>
           <span
-            className="filter-summary-box__badge filter-summarybox__badge--op badge badge-secondary"
+            className="filter-summary-box__badge filter-summarybox__badge--op badge bg-secondary"
           >
             is
           </span>
           <span
-            className="filter-summary-box__badge badge badge-secondary"
+            className="filter-summary-box__badge badge bg-secondary"
           >
             2
           </span>
@@ -6753,17 +6696,17 @@ exports[`Storyshots Filter summary box Default 1`] = `
           className="filter-summary-box__badge-group"
         >
           <span
-            className="filter-summary-box__badge badge badge-secondary"
+            className="filter-summary-box__badge badge bg-secondary"
           >
             Dataset.Schema
           </span>
           <span
-            className="filter-summary-box__badge filter-summarybox__badge--op badge badge-secondary"
+            className="filter-summary-box__badge filter-summarybox__badge--op badge bg-secondary"
           >
             is
           </span>
           <span
-            className="filter-summary-box__badge badge badge-secondary"
+            className="filter-summary-box__badge badge bg-secondary"
           >
             1
           </span>
@@ -6777,22 +6720,22 @@ exports[`Storyshots Filter summary box Default 1`] = `
           className="filter-summary-box__badge-group"
         >
           <span
-            className="filter-summary-box__badge badge badge-secondary"
+            className="filter-summary-box__badge badge bg-secondary"
           >
             Datafile.Schema
           </span>
           <span
-            className="filter-summary-box__badge filter-summarybox__badge--op badge badge-secondary"
+            className="filter-summary-box__badge filter-summarybox__badge--op badge bg-secondary"
           >
             is
           </span>
           <span
-            className="filter-summary-box__badge badge badge-secondary"
+            className="filter-summary-box__badge badge bg-secondary"
           >
             1
           </span>
           <span
-            className="filter-summary-box__badge badge badge-secondary"
+            className="filter-summary-box__badge badge bg-secondary"
           >
             2
           </span>
@@ -6821,9 +6764,7 @@ exports[`Storyshots Filters/Category filter Check All By Default 1`] = `
     }
   }
 >
-  <div
-    className="form-group"
-  >
+  <div>
     <div
       className="form-check"
     >
@@ -6894,9 +6835,7 @@ exports[`Storyshots Filters/Category filter Default 1`] = `
     }
   }
 >
-  <div
-    className="form-group"
-  >
+  <div>
     <div
       className="form-check"
     >
@@ -6967,9 +6906,7 @@ exports[`Storyshots Filters/Category filter None Selected 1`] = `
     }
   }
 >
-  <div
-    className="form-group"
-  >
+  <div>
     <div
       className="form-check"
     >
@@ -7045,7 +6982,7 @@ exports[`Storyshots Filters/Date range filter Default 1`] = `
     onSubmit={[Function]}
   >
     <div
-      className="date-range-filter__field form-group"
+      className="date-range-filter__field"
     >
       <label
         className="form-label"
@@ -7537,7 +7474,7 @@ exports[`Storyshots Filters/Date range filter Default 1`] = `
       </div>
     </div>
     <div
-      className="date-range-filter__field form-group"
+      className="date-range-filter__field"
     >
       <label
         className="form-label"
@@ -8030,7 +7967,7 @@ exports[`Storyshots Filters/Date range filter Default 1`] = `
     </div>
     <button
       aria-label="Filter results"
-      className="date-range-filter__button btn btn-secondary"
+      className="date-range-filter__button mt-3 btn btn-secondary"
       disabled={false}
       type="submit"
     >
@@ -8054,7 +7991,7 @@ exports[`Storyshots Filters/Date range filter Empty 1`] = `
     onSubmit={[Function]}
   >
     <div
-      className="date-range-filter__field form-group"
+      className="date-range-filter__field"
     >
       <label
         className="form-label"
@@ -8546,7 +8483,7 @@ exports[`Storyshots Filters/Date range filter Empty 1`] = `
       </div>
     </div>
     <div
-      className="date-range-filter__field form-group"
+      className="date-range-filter__field"
     >
       <label
         className="form-label"
@@ -9039,7 +8976,7 @@ exports[`Storyshots Filters/Date range filter Empty 1`] = `
     </div>
     <button
       aria-label="Filter results"
-      className="date-range-filter__button btn btn-outline-secondary"
+      className="date-range-filter__button mt-3 btn btn-outline-secondary"
       disabled={false}
       type="submit"
     >
@@ -9063,10 +9000,10 @@ exports[`Storyshots Filters/Date range filter No Labels 1`] = `
     onSubmit={[Function]}
   >
     <div
-      className="date-range-filter__field form-group"
+      className="date-range-filter__field"
     >
       <label
-        className="form-label sr-only"
+        className="form-label visually-hidden"
         htmlFor="start-cidEnergy"
       >
         Start
@@ -9555,10 +9492,10 @@ exports[`Storyshots Filters/Date range filter No Labels 1`] = `
       </div>
     </div>
     <div
-      className="date-range-filter__field form-group"
+      className="date-range-filter__field"
     >
       <label
-        className="form-label sr-only"
+        className="form-label visually-hidden"
         htmlFor="end-cidEnergy"
       >
         End
@@ -10048,7 +9985,7 @@ exports[`Storyshots Filters/Date range filter No Labels 1`] = `
     </div>
     <button
       aria-label="Filter results"
-      className="date-range-filter__button btn btn-secondary"
+      className="date-range-filter__button mt-3 btn btn-secondary"
       disabled={false}
       type="submit"
     >
@@ -10072,7 +10009,7 @@ exports[`Storyshots Filters/Date range filter Only Show End 1`] = `
     onSubmit={[Function]}
   >
     <div
-      className="date-range-filter__field form-group"
+      className="date-range-filter__field"
     >
       <label
         className="form-label"
@@ -10565,7 +10502,7 @@ exports[`Storyshots Filters/Date range filter Only Show End 1`] = `
     </div>
     <button
       aria-label="Filter results"
-      className="date-range-filter__button btn btn-secondary"
+      className="date-range-filter__button mt-3 btn btn-secondary"
       disabled={false}
       type="submit"
     >
@@ -10589,7 +10526,7 @@ exports[`Storyshots Filters/Date range filter Only Show Start 1`] = `
     onSubmit={[Function]}
   >
     <div
-      className="date-range-filter__field form-group"
+      className="date-range-filter__field"
     >
       <label
         className="form-label"
@@ -11082,7 +11019,7 @@ exports[`Storyshots Filters/Date range filter Only Show Start 1`] = `
     </div>
     <button
       aria-label="Filter results"
-      className="date-range-filter__button btn btn-secondary"
+      className="date-range-filter__button mt-3 btn btn-secondary"
       disabled={false}
       type="submit"
     >
@@ -11102,121 +11039,144 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
   }
 >
   <section>
-    <nav
+    <ul
       className="nav nav-tabs"
+      id="filters-section"
       onKeyDown={[Function]}
       role="tablist"
     >
-      <a
-        aria-controls="filters-section-tabpane-project"
-        aria-selected={true}
-        className="nav-item nav-link active"
-        data-rb-event-key="project"
-        href="#"
-        id="filters-section-tab-project"
-        onClick={[Function]}
-        onKeyDown={[Function]}
-        role="tab"
+      <li
+        className="nav-item"
+        role="presentation"
       >
-        <div
-          className="tab-sticker"
-          style={
-            {
-              "backgroundColor": "#f7db8d",
-            }
-          }
+        <button
+          aria-controls="filters-section-tabpane-project"
+          aria-selected={true}
+          className="nav-link active"
+          data-rr-ui-event-key="project"
+          disabled={false}
+          id="filters-section-tab-project"
+          onClick={[Function]}
+          role="tab"
+          type="button"
         >
           <div
-            className="tab-stick--content"
+            className="tab-sticker"
+            style={
+              {
+                "backgroundColor": "#f7db8d",
+              }
+            }
           >
-            P
+            <div
+              className="tab-stick--content"
+            >
+              P
+            </div>
           </div>
-        </div>
-      </a>
-      <a
-        aria-controls="filters-section-tabpane-experiment"
-        aria-selected={false}
-        className="nav-item nav-link"
-        data-rb-event-key="experiment"
-        href="#"
-        id="filters-section-tab-experiment"
-        onClick={[Function]}
-        onKeyDown={[Function]}
-        role="tab"
+        </button>
+      </li>
+      <li
+        className="nav-item"
+        role="presentation"
       >
-        <div
-          className="tab-sticker"
-          style={
-            {
-              "backgroundColor": "#abe2ff",
-            }
-          }
+        <button
+          aria-controls="filters-section-tabpane-experiment"
+          aria-selected={false}
+          className="nav-link"
+          data-rr-ui-event-key="experiment"
+          disabled={false}
+          id="filters-section-tab-experiment"
+          onClick={[Function]}
+          role="tab"
+          tabIndex={-1}
+          type="button"
         >
           <div
-            className="tab-stick--content"
+            className="tab-sticker"
+            style={
+              {
+                "backgroundColor": "#abe2ff",
+              }
+            }
           >
-            E
+            <div
+              className="tab-stick--content"
+            >
+              E
+            </div>
           </div>
-        </div>
-      </a>
-      <a
-        aria-controls="filters-section-tabpane-dataset"
-        aria-selected={false}
-        className="nav-item nav-link"
-        data-rb-event-key="dataset"
-        href="#"
-        id="filters-section-tab-dataset"
-        onClick={[Function]}
-        onKeyDown={[Function]}
-        role="tab"
+        </button>
+      </li>
+      <li
+        className="nav-item"
+        role="presentation"
       >
-        <div
-          className="tab-sticker"
-          style={
-            {
-              "backgroundColor": "#ffcce8",
-            }
-          }
+        <button
+          aria-controls="filters-section-tabpane-dataset"
+          aria-selected={false}
+          className="nav-link"
+          data-rr-ui-event-key="dataset"
+          disabled={false}
+          id="filters-section-tab-dataset"
+          onClick={[Function]}
+          role="tab"
+          tabIndex={-1}
+          type="button"
         >
           <div
-            className="tab-stick--content"
+            className="tab-sticker"
+            style={
+              {
+                "backgroundColor": "#ffcce8",
+              }
+            }
           >
-            DS
+            <div
+              className="tab-stick--content"
+            >
+              DS
+            </div>
           </div>
-        </div>
-      </a>
-      <a
-        aria-controls="filters-section-tabpane-datafile"
-        aria-selected={false}
-        className="nav-item nav-link"
-        data-rb-event-key="datafile"
-        href="#"
-        id="filters-section-tab-datafile"
-        onClick={[Function]}
-        onKeyDown={[Function]}
-        role="tab"
+        </button>
+      </li>
+      <li
+        className="nav-item"
+        role="presentation"
       >
-        <div
-          className="tab-sticker"
-          style={
-            {
-              "backgroundColor": "#70ffae",
-            }
-          }
+        <button
+          aria-controls="filters-section-tabpane-datafile"
+          aria-selected={false}
+          className="nav-link"
+          data-rr-ui-event-key="datafile"
+          disabled={false}
+          id="filters-section-tab-datafile"
+          onClick={[Function]}
+          role="tab"
+          tabIndex={-1}
+          type="button"
         >
           <div
-            className="tab-stick--content"
+            className="tab-sticker"
+            style={
+              {
+                "backgroundColor": "#70ffae",
+              }
+            }
           >
-            DF
+            <div
+              className="tab-stick--content"
+            >
+              DF
+            </div>
           </div>
-        </div>
-      </a>
-    </nav>
+        </button>
+      </li>
+    </ul>
     <div
       className="tab-content"
     >
       <div
-        aria-hidden={false}
         aria-labelledby="filters-section-tab-project"
         className="fade tab-pane active show"
         id="filters-section-tabpane-project"
@@ -11263,18 +11223,14 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
                 placeholder=""
                 value=""
               />
-              <div
-                className="input-group-append"
+              <button
+                aria-label="Filter results"
+                className="btn btn-outline-secondary"
+                disabled={false}
+                type="submit"
               >
-                <button
-                  aria-label="Filter results"
-                  className="btn btn-outline-secondary"
-                  disabled={false}
-                  type="submit"
-                >
-                  Filter
-                </button>
-              </div>
+                Filter
+              </button>
             </div>
           </form>
         </section>
@@ -11290,7 +11246,7 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
             onSubmit={[Function]}
           >
             <div
-              className="date-range-filter__field form-group"
+              className="date-range-filter__field"
             >
               <label
                 className="form-label"
@@ -11782,7 +11738,7 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
               </div>
             </div>
             <div
-              className="date-range-filter__field form-group"
+              className="date-range-filter__field"
             >
               <label
                 className="form-label"
@@ -12275,7 +12231,7 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
             </div>
             <button
               aria-label="Filter results"
-              className="date-range-filter__button btn btn-outline-secondary"
+              className="date-range-filter__button mt-3 btn btn-outline-secondary"
               disabled={false}
               type="submit"
             >
@@ -12304,18 +12260,14 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
                 placeholder=""
                 value=""
               />
-              <div
-                className="input-group-append"
+              <button
+                aria-label="Filter results"
+                className="btn btn-outline-secondary"
+                disabled={false}
+                type="submit"
               >
-                <button
-                  aria-label="Filter results"
-                  className="btn btn-outline-secondary"
-                  disabled={false}
-                  type="submit"
-                >
-                  Filter
-                </button>
-              </div>
+                Filter
+              </button>
             </div>
           </form>
         </section>
@@ -12326,9 +12278,7 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
           >
             Schemas
           </h3>
-          <div
-            className="form-group"
-          >
+          <div>
             <div
               className="form-check"
             >
@@ -12372,26 +12322,27 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
             className="accordion"
           >
             <div
-              className="card"
+              className="accordion-item"
             >
-              <div
-                className="card-header"
+              <h2
+                className="accordion-header"
               >
                 <button
-                  className="btn btn-link"
+                  aria-expanded={true}
+                  className="accordion-button"
                   onClick={[Function]}
                   type="button"
                 >
                   Raw data
                    filters
                 </button>
-              </div>
+              </h2>
               <div
                 aria-expanded={null}
-                className="collapse"
+                className="accordion-collapse collapse show"
               >
                 <div
-                  className="card-body"
+                  className="accordion-body"
                 >
                   <section
                     className="single-schema-list__filter"
@@ -12415,18 +12366,14 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
                           placeholder=""
                           value=""
                         />
-                        <div
-                          className="input-group-append"
+                        <button
+                          aria-label="Filter results"
+                          className="btn btn-outline-secondary"
+                          disabled={false}
+                          type="submit"
                         >
-                          <button
-                            aria-label="Filter results"
-                            className="btn btn-outline-secondary"
-                            disabled={false}
-                            type="submit"
-                          >
-                            Filter
-                          </button>
-                        </div>
+                          Filter
+                        </button>
                       </div>
                     </form>
                     <hr />
@@ -12453,18 +12400,14 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
                           placeholder=""
                           value=""
                         />
-                        <div
-                          className="input-group-append"
+                        <button
+                          aria-label="Filter results"
+                          className="btn btn-outline-secondary"
+                          disabled={false}
+                          type="submit"
                         >
-                          <button
-                            aria-label="Filter results"
-                            className="btn btn-outline-secondary"
-                            disabled={false}
-                            type="submit"
-                          >
-                            Filter
-                          </button>
-                        </div>
+                          Filter
+                        </button>
                       </div>
                     </form>
                     <hr />
@@ -12491,18 +12434,14 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
                           placeholder=""
                           value=""
                         />
-                        <div
-                          className="input-group-append"
+                        <button
+                          aria-label="Filter results"
+                          className="btn btn-outline-secondary"
+                          disabled={false}
+                          type="submit"
                         >
-                          <button
-                            aria-label="Filter results"
-                            className="btn btn-outline-secondary"
-                            disabled={false}
-                            type="submit"
-                          >
-                            Filter
-                          </button>
-                        </div>
+                          Filter
+                        </button>
                       </div>
                     </form>
                     <hr />
@@ -12514,7 +12453,6 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
         </section>
       </div>
       <div
-        aria-hidden={true}
         aria-labelledby="filters-section-tab-experiment"
         className="fade tab-pane"
         id="filters-section-tabpane-experiment"
@@ -12561,18 +12499,14 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
                 placeholder=""
                 value=""
               />
-              <div
-                className="input-group-append"
+              <button
+                aria-label="Filter results"
+                className="btn btn-outline-secondary"
+                disabled={false}
+                type="submit"
               >
-                <button
-                  aria-label="Filter results"
-                  className="btn btn-outline-secondary"
-                  disabled={false}
-                  type="submit"
-                >
-                  Filter
-                </button>
-              </div>
+                Filter
+              </button>
             </div>
           </form>
         </section>
@@ -12588,7 +12522,7 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
             onSubmit={[Function]}
           >
             <div
-              className="date-range-filter__field form-group"
+              className="date-range-filter__field"
             >
               <label
                 className="form-label"
@@ -13080,7 +13014,7 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
               </div>
             </div>
             <div
-              className="date-range-filter__field form-group"
+              className="date-range-filter__field"
             >
               <label
                 className="form-label"
@@ -13573,7 +13507,7 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
             </div>
             <button
               aria-label="Filter results"
-              className="date-range-filter__button btn btn-outline-secondary"
+              className="date-range-filter__button mt-3 btn btn-outline-secondary"
               disabled={false}
               type="submit"
             >
@@ -13602,18 +13536,14 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
                 placeholder=""
                 value=""
               />
-              <div
-                className="input-group-append"
+              <button
+                aria-label="Filter results"
+                className="btn btn-outline-secondary"
+                disabled={false}
+                type="submit"
               >
-                <button
-                  aria-label="Filter results"
-                  className="btn btn-outline-secondary"
-                  disabled={false}
-                  type="submit"
-                >
-                  Filter
-                </button>
-              </div>
+                Filter
+              </button>
             </div>
           </form>
         </section>
@@ -13624,9 +13554,7 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
           >
             Schemas
           </h3>
-          <div
-            className="form-group"
-          >
+          <div>
             <div
               className="form-check"
             >
@@ -13670,26 +13598,27 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
             className="accordion"
           >
             <div
-              className="card"
+              className="accordion-item"
             >
-              <div
-                className="card-header"
+              <h2
+                className="accordion-header"
               >
                 <button
-                  className="btn btn-link"
+                  aria-expanded={true}
+                  className="accordion-button"
                   onClick={[Function]}
                   type="button"
                 >
                   Biopipeline Output
                    filters
                 </button>
-              </div>
+              </h2>
               <div
                 aria-expanded={null}
-                className="collapse"
+                className="accordion-collapse collapse show"
               >
                 <div
-                  className="card-body"
+                  className="accordion-body"
                 >
                   <section
                     className="single-schema-list__filter"
@@ -13713,18 +13642,14 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
                           placeholder=""
                           value=""
                         />
-                        <div
-                          className="input-group-append"
+                        <button
+                          aria-label="Filter results"
+                          className="btn btn-outline-secondary"
+                          disabled={false}
+                          type="submit"
                         >
-                          <button
-                            aria-label="Filter results"
-                            className="btn btn-outline-secondary"
-                            disabled={false}
-                            type="submit"
-                          >
-                            Filter
-                          </button>
-                        </div>
+                          Filter
+                        </button>
                       </div>
                     </form>
                     <hr />
@@ -13751,18 +13676,14 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
                           placeholder=""
                           value=""
                         />
-                        <div
-                          className="input-group-append"
+                        <button
+                          aria-label="Filter results"
+                          className="btn btn-outline-secondary"
+                          disabled={false}
+                          type="submit"
                         >
-                          <button
-                            aria-label="Filter results"
-                            className="btn btn-outline-secondary"
-                            disabled={false}
-                            type="submit"
-                          >
-                            Filter
-                          </button>
-                        </div>
+                          Filter
+                        </button>
                       </div>
                     </form>
                     <hr />
@@ -13789,18 +13710,14 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
                           placeholder=""
                           value=""
                         />
-                        <div
-                          className="input-group-append"
+                        <button
+                          aria-label="Filter results"
+                          className="btn btn-outline-secondary"
+                          disabled={false}
+                          type="submit"
                         >
-                          <button
-                            aria-label="Filter results"
-                            className="btn btn-outline-secondary"
-                            disabled={false}
-                            type="submit"
-                          >
-                            Filter
-                          </button>
-                        </div>
+                          Filter
+                        </button>
                       </div>
                     </form>
                     <hr />
@@ -13812,7 +13729,6 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
         </section>
       </div>
       <div
-        aria-hidden={true}
         aria-labelledby="filters-section-tab-dataset"
         className="fade tab-pane"
         id="filters-section-tabpane-dataset"
@@ -13859,18 +13775,14 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
                 placeholder=""
                 value=""
               />
-              <div
-                className="input-group-append"
+              <button
+                aria-label="Filter results"
+                className="btn btn-outline-secondary"
+                disabled={false}
+                type="submit"
               >
-                <button
-                  aria-label="Filter results"
-                  className="btn btn-outline-secondary"
-                  disabled={false}
-                  type="submit"
-                >
-                  Filter
-                </button>
-              </div>
+                Filter
+              </button>
             </div>
           </form>
         </section>
@@ -13886,7 +13798,7 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
             onSubmit={[Function]}
           >
             <div
-              className="date-range-filter__field form-group"
+              className="date-range-filter__field"
             >
               <label
                 className="form-label"
@@ -14378,7 +14290,7 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
               </div>
             </div>
             <div
-              className="date-range-filter__field form-group"
+              className="date-range-filter__field"
             >
               <label
                 className="form-label"
@@ -14871,7 +14783,7 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
             </div>
             <button
               aria-label="Filter results"
-              className="date-range-filter__button btn btn-outline-secondary"
+              className="date-range-filter__button mt-3 btn btn-outline-secondary"
               disabled={false}
               type="submit"
             >
@@ -14900,18 +14812,14 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
                 placeholder=""
                 value=""
               />
-              <div
-                className="input-group-append"
+              <button
+                aria-label="Filter results"
+                className="btn btn-outline-secondary"
+                disabled={false}
+                type="submit"
               >
-                <button
-                  aria-label="Filter results"
-                  className="btn btn-outline-secondary"
-                  disabled={false}
-                  type="submit"
-                >
-                  Filter
-                </button>
-              </div>
+                Filter
+              </button>
             </div>
           </form>
         </section>
@@ -14922,9 +14830,7 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
           >
             Schemas
           </h3>
-          <div
-            className="form-group"
-          >
+          <div>
             <div
               className="form-check"
             >
@@ -14968,26 +14874,27 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
             className="accordion"
           >
             <div
-              className="card"
+              className="accordion-item"
             >
-              <div
-                className="card-header"
+              <h2
+                className="accordion-header"
               >
                 <button
-                  className="btn btn-link"
+                  aria-expanded={true}
+                  className="accordion-button"
                   onClick={[Function]}
                   type="button"
                 >
                   Raw data
                    filters
                 </button>
-              </div>
+              </h2>
               <div
                 aria-expanded={null}
-                className="collapse"
+                className="accordion-collapse collapse show"
               >
                 <div
-                  className="card-body"
+                  className="accordion-body"
                 >
                   <section
                     className="single-schema-list__filter"
@@ -15011,18 +14918,14 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
                           placeholder=""
                           value=""
                         />
-                        <div
-                          className="input-group-append"
+                        <button
+                          aria-label="Filter results"
+                          className="btn btn-outline-secondary"
+                          disabled={false}
+                          type="submit"
                         >
-                          <button
-                            aria-label="Filter results"
-                            className="btn btn-outline-secondary"
-                            disabled={false}
-                            type="submit"
-                          >
-                            Filter
-                          </button>
-                        </div>
+                          Filter
+                        </button>
                       </div>
                     </form>
                     <hr />
@@ -15049,18 +14952,14 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
                           placeholder=""
                           value=""
                         />
-                        <div
-                          className="input-group-append"
+                        <button
+                          aria-label="Filter results"
+                          className="btn btn-outline-secondary"
+                          disabled={false}
+                          type="submit"
                         >
-                          <button
-                            aria-label="Filter results"
-                            className="btn btn-outline-secondary"
-                            disabled={false}
-                            type="submit"
-                          >
-                            Filter
-                          </button>
-                        </div>
+                          Filter
+                        </button>
                       </div>
                     </form>
                     <hr />
@@ -15087,18 +14986,14 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
                           placeholder=""
                           value=""
                         />
-                        <div
-                          className="input-group-append"
+                        <button
+                          aria-label="Filter results"
+                          className="btn btn-outline-secondary"
+                          disabled={false}
+                          type="submit"
                         >
-                          <button
-                            aria-label="Filter results"
-                            className="btn btn-outline-secondary"
-                            disabled={false}
-                            type="submit"
-                          >
-                            Filter
-                          </button>
-                        </div>
+                          Filter
+                        </button>
                       </div>
                     </form>
                     <hr />
@@ -15110,7 +15005,6 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
         </section>
       </div>
       <div
-        aria-hidden={true}
         aria-labelledby="filters-section-tab-datafile"
         className="fade tab-pane"
         id="filters-section-tabpane-datafile"
@@ -15157,18 +15051,14 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
                 placeholder=""
                 value=""
               />
-              <div
-                className="input-group-append"
+              <button
+                aria-label="Filter results"
+                className="btn btn-outline-secondary"
+                disabled={false}
+                type="submit"
               >
-                <button
-                  aria-label="Filter results"
-                  className="btn btn-outline-secondary"
-                  disabled={false}
-                  type="submit"
-                >
-                  Filter
-                </button>
-              </div>
+                Filter
+              </button>
             </div>
           </form>
         </section>
@@ -15184,7 +15074,7 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
             onSubmit={[Function]}
           >
             <div
-              className="date-range-filter__field form-group"
+              className="date-range-filter__field"
             >
               <label
                 className="form-label"
@@ -15676,7 +15566,7 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
               </div>
             </div>
             <div
-              className="date-range-filter__field form-group"
+              className="date-range-filter__field"
             >
               <label
                 className="form-label"
@@ -16169,7 +16059,7 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
             </div>
             <button
               aria-label="Filter results"
-              className="date-range-filter__button btn btn-outline-secondary"
+              className="date-range-filter__button mt-3 btn btn-outline-secondary"
               disabled={false}
               type="submit"
             >
@@ -16198,18 +16088,14 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
                 placeholder=""
                 value=""
               />
-              <div
-                className="input-group-append"
+              <button
+                aria-label="Filter results"
+                className="btn btn-outline-secondary"
+                disabled={false}
+                type="submit"
               >
-                <button
-                  aria-label="Filter results"
-                  className="btn btn-outline-secondary"
-                  disabled={false}
-                  type="submit"
-                >
-                  Filter
-                </button>
-              </div>
+                Filter
+              </button>
             </div>
           </form>
         </section>
@@ -16220,9 +16106,7 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
           >
             Schemas
           </h3>
-          <div
-            className="form-group"
-          >
+          <div>
             <div
               className="form-check"
             >
@@ -16266,26 +16150,27 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
             className="accordion"
           >
             <div
-              className="card"
+              className="accordion-item"
             >
-              <div
-                className="card-header"
+              <h2
+                className="accordion-header"
               >
                 <button
-                  className="btn btn-link"
+                  aria-expanded={true}
+                  className="accordion-button"
                   onClick={[Function]}
                   type="button"
                 >
                   Raw data
                    filters
                 </button>
-              </div>
+              </h2>
               <div
                 aria-expanded={null}
-                className="collapse"
+                className="accordion-collapse collapse show"
               >
                 <div
-                  className="card-body"
+                  className="accordion-body"
                 >
                   <section
                     className="single-schema-list__filter"
@@ -16309,18 +16194,14 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
                           placeholder=""
                           value=""
                         />
-                        <div
-                          className="input-group-append"
+                        <button
+                          aria-label="Filter results"
+                          className="btn btn-outline-secondary"
+                          disabled={false}
+                          type="submit"
                         >
-                          <button
-                            aria-label="Filter results"
-                            className="btn btn-outline-secondary"
-                            disabled={false}
-                            type="submit"
-                          >
-                            Filter
-                          </button>
-                        </div>
+                          Filter
+                        </button>
                       </div>
                     </form>
                     <hr />
@@ -16347,18 +16228,14 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
                           placeholder=""
                           value=""
                         />
-                        <div
-                          className="input-group-append"
+                        <button
+                          aria-label="Filter results"
+                          className="btn btn-outline-secondary"
+                          disabled={false}
+                          type="submit"
                         >
-                          <button
-                            aria-label="Filter results"
-                            className="btn btn-outline-secondary"
-                            disabled={false}
-                            type="submit"
-                          >
-                            Filter
-                          </button>
-                        </div>
+                          Filter
+                        </button>
                       </div>
                     </form>
                     <hr />
@@ -16385,18 +16262,14 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
                           placeholder=""
                           value=""
                         />
-                        <div
-                          className="input-group-append"
+                        <button
+                          aria-label="Filter results"
+                          className="btn btn-outline-secondary"
+                          disabled={false}
+                          type="submit"
                         >
-                          <button
-                            aria-label="Filter results"
-                            className="btn btn-outline-secondary"
-                            disabled={false}
-                            type="submit"
-                          >
-                            Filter
-                          </button>
-                        </div>
+                          Filter
+                        </button>
                       </div>
                     </form>
                     <hr />
@@ -16405,26 +16278,27 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
               </div>
             </div>
             <div
-              className="card"
+              className="accordion-item"
             >
-              <div
-                className="card-header"
+              <h2
+                className="accordion-header"
               >
                 <button
-                  className="btn btn-link"
+                  aria-expanded={true}
+                  className="accordion-button"
                   onClick={[Function]}
                   type="button"
                 >
                   Biopipeline Output
                    filters
                 </button>
-              </div>
+              </h2>
               <div
                 aria-expanded={null}
-                className="collapse"
+                className="accordion-collapse collapse show"
               >
                 <div
-                  className="card-body"
+                  className="accordion-body"
                 >
                   <section
                     className="single-schema-list__filter"
@@ -16448,18 +16322,14 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
                           placeholder=""
                           value=""
                         />
-                        <div
-                          className="input-group-append"
+                        <button
+                          aria-label="Filter results"
+                          className="btn btn-outline-secondary"
+                          disabled={false}
+                          type="submit"
                         >
-                          <button
-                            aria-label="Filter results"
-                            className="btn btn-outline-secondary"
-                            disabled={false}
-                            type="submit"
-                          >
-                            Filter
-                          </button>
-                        </div>
+                          Filter
+                        </button>
                       </div>
                     </form>
                     <hr />
@@ -16486,18 +16356,14 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
                           placeholder=""
                           value=""
                         />
-                        <div
-                          className="input-group-append"
+                        <button
+                          aria-label="Filter results"
+                          className="btn btn-outline-secondary"
+                          disabled={false}
+                          type="submit"
                         >
-                          <button
-                            aria-label="Filter results"
-                            className="btn btn-outline-secondary"
-                            disabled={false}
-                            type="submit"
-                          >
-                            Filter
-                          </button>
-                        </div>
+                          Filter
+                        </button>
                       </div>
                     </form>
                     <hr />
@@ -16524,18 +16390,14 @@ exports[`Storyshots Filters/Filters section Default 1`] = `
                           placeholder=""
                           value=""
                         />
-                        <div
-                          className="input-group-append"
+                        <button
+                          aria-label="Filter results"
+                          className="btn btn-outline-secondary"
+                          disabled={false}
+                          type="submit"
                         >
-                          <button
-                            aria-label="Filter results"
-                            className="btn btn-outline-secondary"
-                            disabled={false}
-                            type="submit"
-                          >
-                            Filter
-                          </button>
-                        </div>
+                          Filter
+                        </button>
                       </div>
                     </form>
                     <hr />
@@ -16606,7 +16468,7 @@ exports[`Storyshots Filters/Number range filter Default 1`] = `
     onSubmit={[Function]}
   >
     <div
-      className="num-range-filter__field form-group"
+      className="num-range-filter__field"
     >
       <label
         className="form-label"
@@ -16623,7 +16485,7 @@ exports[`Storyshots Filters/Number range filter Default 1`] = `
       />
     </div>
     <div
-      className="num-range-filter__field form-group"
+      className="num-range-filter__field"
     >
       <label
         className="form-label"
@@ -16665,7 +16527,7 @@ exports[`Storyshots Filters/Number range filter Empty 1`] = `
     onSubmit={[Function]}
   >
     <div
-      className="num-range-filter__field form-group"
+      className="num-range-filter__field"
     >
       <label
         className="form-label"
@@ -16682,7 +16544,7 @@ exports[`Storyshots Filters/Number range filter Empty 1`] = `
       />
     </div>
     <div
-      className="num-range-filter__field form-group"
+      className="num-range-filter__field"
     >
       <label
         className="form-label"
@@ -16732,18 +16594,14 @@ exports[`Storyshots Filters/Text filter Default 1`] = `
         placeholder="Name of the dataset (e.g. NET-Plasma.)"
         value="text"
       />
-      <div
-        className="input-group-append"
+      <button
+        aria-label="Filter results"
+        className="btn btn-secondary"
+        disabled={false}
+        type="submit"
       >
-        <button
-          aria-label="Filter results"
-          className="btn btn-secondary"
-          disabled={false}
-          type="submit"
-        >
-          Filter
-        </button>
-      </div>
+        Filter
+      </button>
     </div>
   </form>
 </div>
@@ -16771,18 +16629,14 @@ exports[`Storyshots Filters/Text filter Empty 1`] = `
         placeholder="Name of the dataset (e.g. NET-Plasma.)"
         value=""
       />
-      <div
-        className="input-group-append"
+      <button
+        aria-label="Filter results"
+        className="btn btn-outline-secondary"
+        disabled={false}
+        type="submit"
       >
-        <button
-          aria-label="Filter results"
-          className="btn btn-outline-secondary"
-          disabled={false}
-          type="submit"
-        >
-          Filter
-        </button>
-      </div>
+        Filter
+      </button>
     </div>
   </form>
 </div>
@@ -16803,9 +16657,7 @@ exports[`Storyshots Filters/Type schema list Default 1`] = `
     >
       Schemas
     </h3>
-    <div
-      className="form-group"
-    >
+    <div>
       <div
         className="form-check"
       >
@@ -16849,26 +16701,27 @@ exports[`Storyshots Filters/Type schema list Default 1`] = `
       className="accordion"
     >
       <div
-        className="card"
+        className="accordion-item"
       >
-        <div
-          className="card-header"
+        <h2
+          className="accordion-header"
         >
           <button
-            className="btn btn-link"
+            aria-expanded={true}
+            className="accordion-button"
             onClick={[Function]}
             type="button"
           >
             Raw data
              filters
           </button>
-        </div>
+        </h2>
         <div
           aria-expanded={null}
-          className="collapse"
+          className="accordion-collapse collapse show"
         >
           <div
-            className="card-body"
+            className="accordion-body"
           >
             <section
               className="single-schema-list__filter"
@@ -16892,18 +16745,14 @@ exports[`Storyshots Filters/Type schema list Default 1`] = `
                     placeholder=""
                     value=""
                   />
-                  <div
-                    className="input-group-append"
+                  <button
+                    aria-label="Filter results"
+                    className="btn btn-outline-secondary"
+                    disabled={false}
+                    type="submit"
                   >
-                    <button
-                      aria-label="Filter results"
-                      className="btn btn-outline-secondary"
-                      disabled={false}
-                      type="submit"
-                    >
-                      Filter
-                    </button>
-                  </div>
+                    Filter
+                  </button>
                 </div>
               </form>
               <hr />
@@ -16930,18 +16779,14 @@ exports[`Storyshots Filters/Type schema list Default 1`] = `
                     placeholder=""
                     value=""
                   />
-                  <div
-                    className="input-group-append"
+                  <button
+                    aria-label="Filter results"
+                    className="btn btn-outline-secondary"
+                    disabled={false}
+                    type="submit"
                   >
-                    <button
-                      aria-label="Filter results"
-                      className="btn btn-outline-secondary"
-                      disabled={false}
-                      type="submit"
-                    >
-                      Filter
-                    </button>
-                  </div>
+                    Filter
+                  </button>
                 </div>
               </form>
               <hr />
@@ -16968,18 +16813,14 @@ exports[`Storyshots Filters/Type schema list Default 1`] = `
                     placeholder=""
                     value=""
                   />
-                  <div
-                    className="input-group-append"
+                  <button
+                    aria-label="Filter results"
+                    className="btn btn-outline-secondary"
+                    disabled={false}
+                    type="submit"
                   >
-                    <button
-                      aria-label="Filter results"
-                      className="btn btn-outline-secondary"
-                      disabled={false}
-                      type="submit"
-                    >
-                      Filter
-                    </button>
-                  </div>
+                    Filter
+                  </button>
                 </div>
               </form>
               <hr />
@@ -16988,26 +16829,27 @@ exports[`Storyshots Filters/Type schema list Default 1`] = `
         </div>
       </div>
       <div
-        className="card"
+        className="accordion-item"
       >
-        <div
-          className="card-header"
+        <h2
+          className="accordion-header"
         >
           <button
-            className="btn btn-link"
+            aria-expanded={true}
+            className="accordion-button"
             onClick={[Function]}
             type="button"
           >
             Biopipeline Output
              filters
           </button>
-        </div>
+        </h2>
         <div
           aria-expanded={null}
-          className="collapse"
+          className="accordion-collapse collapse show"
         >
           <div
-            className="card-body"
+            className="accordion-body"
           >
             <section
               className="single-schema-list__filter"
@@ -17031,18 +16873,14 @@ exports[`Storyshots Filters/Type schema list Default 1`] = `
                     placeholder=""
                     value=""
                   />
-                  <div
-                    className="input-group-append"
+                  <button
+                    aria-label="Filter results"
+                    className="btn btn-outline-secondary"
+                    disabled={false}
+                    type="submit"
                   >
-                    <button
-                      aria-label="Filter results"
-                      className="btn btn-outline-secondary"
-                      disabled={false}
-                      type="submit"
-                    >
-                      Filter
-                    </button>
-                  </div>
+                    Filter
+                  </button>
                 </div>
               </form>
               <hr />
@@ -17069,18 +16907,14 @@ exports[`Storyshots Filters/Type schema list Default 1`] = `
                     placeholder=""
                     value=""
                   />
-                  <div
-                    className="input-group-append"
+                  <button
+                    aria-label="Filter results"
+                    className="btn btn-outline-secondary"
+                    disabled={false}
+                    type="submit"
                   >
-                    <button
-                      aria-label="Filter results"
-                      className="btn btn-outline-secondary"
-                      disabled={false}
-                      type="submit"
-                    >
-                      Filter
-                    </button>
-                  </div>
+                    Filter
+                  </button>
                 </div>
               </form>
               <hr />
@@ -17107,18 +16941,14 @@ exports[`Storyshots Filters/Type schema list Default 1`] = `
                     placeholder=""
                     value=""
                   />
-                  <div
-                    className="input-group-append"
+                  <button
+                    aria-label="Filter results"
+                    className="btn btn-outline-secondary"
+                    disabled={false}
+                    type="submit"
                   >
-                    <button
-                      aria-label="Filter results"
-                      className="btn btn-outline-secondary"
-                      disabled={false}
-                      type="submit"
-                    >
-                      Filter
-                    </button>
-                  </div>
+                    Filter
+                  </button>
                 </div>
               </form>
               <hr />
@@ -17146,9 +16976,7 @@ exports[`Storyshots Filters/Type schema list No Schema Selected 1`] = `
     >
       Schemas
     </h3>
-    <div
-      className="form-group"
-    >
+    <div>
       <div
         className="form-check"
       >
@@ -17192,26 +17020,27 @@ exports[`Storyshots Filters/Type schema list No Schema Selected 1`] = `
       className="accordion"
     >
       <div
-        className="card"
+        className="accordion-item"
       >
-        <div
-          className="card-header"
+        <h2
+          className="accordion-header"
         >
           <button
-            className="btn btn-link"
+            aria-expanded={true}
+            className="accordion-button"
             onClick={[Function]}
             type="button"
           >
             Raw data
              filters
           </button>
-        </div>
+        </h2>
         <div
           aria-expanded={null}
-          className="collapse"
+          className="accordion-collapse collapse show"
         >
           <div
-            className="card-body"
+            className="accordion-body"
           >
             <section
               className="single-schema-list__filter"
@@ -17235,18 +17064,14 @@ exports[`Storyshots Filters/Type schema list No Schema Selected 1`] = `
                     placeholder=""
                     value=""
                   />
-                  <div
-                    className="input-group-append"
+                  <button
+                    aria-label="Filter results"
+                    className="btn btn-outline-secondary"
+                    disabled={false}
+                    type="submit"
                   >
-                    <button
-                      aria-label="Filter results"
-                      className="btn btn-outline-secondary"
-                      disabled={false}
-                      type="submit"
-                    >
-                      Filter
-                    </button>
-                  </div>
+                    Filter
+                  </button>
                 </div>
               </form>
               <hr />
@@ -17273,18 +17098,14 @@ exports[`Storyshots Filters/Type schema list No Schema Selected 1`] = `
                     placeholder=""
                     value=""
                   />
-                  <div
-                    className="input-group-append"
+                  <button
+                    aria-label="Filter results"
+                    className="btn btn-outline-secondary"
+                    disabled={false}
+                    type="submit"
                   >
-                    <button
-                      aria-label="Filter results"
-                      className="btn btn-outline-secondary"
-                      disabled={false}
-                      type="submit"
-                    >
-                      Filter
-                    </button>
-                  </div>
+                    Filter
+                  </button>
                 </div>
               </form>
               <hr />
@@ -17311,18 +17132,14 @@ exports[`Storyshots Filters/Type schema list No Schema Selected 1`] = `
                     placeholder=""
                     value=""
                   />
-                  <div
-                    className="input-group-append"
+                  <button
+                    aria-label="Filter results"
+                    className="btn btn-outline-secondary"
+                    disabled={false}
+                    type="submit"
                   >
-                    <button
-                      aria-label="Filter results"
-                      className="btn btn-outline-secondary"
-                      disabled={false}
-                      type="submit"
-                    >
-                      Filter
-                    </button>
-                  </div>
+                    Filter
+                  </button>
                 </div>
               </form>
               <hr />
@@ -17331,26 +17148,27 @@ exports[`Storyshots Filters/Type schema list No Schema Selected 1`] = `
         </div>
       </div>
       <div
-        className="card"
+        className="accordion-item"
       >
-        <div
-          className="card-header"
+        <h2
+          className="accordion-header"
         >
           <button
-            className="btn btn-link"
+            aria-expanded={true}
+            className="accordion-button"
             onClick={[Function]}
             type="button"
           >
             Biopipeline Output
              filters
           </button>
-        </div>
+        </h2>
         <div
           aria-expanded={null}
-          className="collapse"
+          className="accordion-collapse collapse show"
         >
           <div
-            className="card-body"
+            className="accordion-body"
           >
             <section
               className="single-schema-list__filter"
@@ -17374,18 +17192,14 @@ exports[`Storyshots Filters/Type schema list No Schema Selected 1`] = `
                     placeholder=""
                     value=""
                   />
-                  <div
-                    className="input-group-append"
+                  <button
+                    aria-label="Filter results"
+                    className="btn btn-outline-secondary"
+                    disabled={false}
+                    type="submit"
                   >
-                    <button
-                      aria-label="Filter results"
-                      className="btn btn-outline-secondary"
-                      disabled={false}
-                      type="submit"
-                    >
-                      Filter
-                    </button>
-                  </div>
+                    Filter
+                  </button>
                 </div>
               </form>
               <hr />
@@ -17412,18 +17226,14 @@ exports[`Storyshots Filters/Type schema list No Schema Selected 1`] = `
                     placeholder=""
                     value=""
                   />
-                  <div
-                    className="input-group-append"
+                  <button
+                    aria-label="Filter results"
+                    className="btn btn-outline-secondary"
+                    disabled={false}
+                    type="submit"
                   >
-                    <button
-                      aria-label="Filter results"
-                      className="btn btn-outline-secondary"
-                      disabled={false}
-                      type="submit"
-                    >
-                      Filter
-                    </button>
-                  </div>
+                    Filter
+                  </button>
                 </div>
               </form>
               <hr />
@@ -17450,18 +17260,14 @@ exports[`Storyshots Filters/Type schema list No Schema Selected 1`] = `
                     placeholder=""
                     value=""
                   />
-                  <div
-                    className="input-group-append"
+                  <button
+                    aria-label="Filter results"
+                    className="btn btn-outline-secondary"
+                    disabled={false}
+                    type="submit"
                   >
-                    <button
-                      aria-label="Filter results"
-                      className="btn btn-outline-secondary"
-                      disabled={false}
-                      type="submit"
-                    >
-                      Filter
-                    </button>
-                  </div>
+                    Filter
+                  </button>
                 </div>
               </form>
               <hr />
@@ -17500,9 +17306,7 @@ exports[`Storyshots Filters/Type schema list Only One Selected 1`] = `
     >
       Schemas
     </h3>
-    <div
-      className="form-group"
-    >
+    <div>
       <div
         className="form-check"
       >
@@ -17546,26 +17350,27 @@ exports[`Storyshots Filters/Type schema list Only One Selected 1`] = `
       className="accordion"
     >
       <div
-        className="card"
+        className="accordion-item"
       >
-        <div
-          className="card-header"
+        <h2
+          className="accordion-header"
         >
           <button
-            className="btn btn-link"
+            aria-expanded={true}
+            className="accordion-button"
             onClick={[Function]}
             type="button"
           >
             Raw data
              filters
           </button>
-        </div>
+        </h2>
         <div
           aria-expanded={null}
-          className="collapse"
+          className="accordion-collapse collapse show"
         >
           <div
-            className="card-body"
+            className="accordion-body"
           >
             <section
               className="single-schema-list__filter"
@@ -17589,18 +17394,14 @@ exports[`Storyshots Filters/Type schema list Only One Selected 1`] = `
                     placeholder=""
                     value=""
                   />
-                  <div
-                    className="input-group-append"
+                  <button
+                    aria-label="Filter results"
+                    className="btn btn-outline-secondary"
+                    disabled={false}
+                    type="submit"
                   >
-                    <button
-                      aria-label="Filter results"
-                      className="btn btn-outline-secondary"
-                      disabled={false}
-                      type="submit"
-                    >
-                      Filter
-                    </button>
-                  </div>
+                    Filter
+                  </button>
                 </div>
               </form>
               <hr />
@@ -17627,18 +17428,14 @@ exports[`Storyshots Filters/Type schema list Only One Selected 1`] = `
                     placeholder=""
                     value=""
                   />
-                  <div
-                    className="input-group-append"
+                  <button
+                    aria-label="Filter results"
+                    className="btn btn-outline-secondary"
+                    disabled={false}
+                    type="submit"
                   >
-                    <button
-                      aria-label="Filter results"
-                      className="btn btn-outline-secondary"
-                      disabled={false}
-                      type="submit"
-                    >
-                      Filter
-                    </button>
-                  </div>
+                    Filter
+                  </button>
                 </div>
               </form>
               <hr />
@@ -17665,18 +17462,14 @@ exports[`Storyshots Filters/Type schema list Only One Selected 1`] = `
                     placeholder=""
                     value=""
                   />
-                  <div
-                    className="input-group-append"
+                  <button
+                    aria-label="Filter results"
+                    className="btn btn-outline-secondary"
+                    disabled={false}
+                    type="submit"
                   >
-                    <button
-                      aria-label="Filter results"
-                      className="btn btn-outline-secondary"
-                      disabled={false}
-                      type="submit"
-                    >
-                      Filter
-                    </button>
-                  </div>
+                    Filter
+                  </button>
                 </div>
               </form>
               <hr />
@@ -17713,7 +17506,6 @@ exports[`Storyshots Pager Default 1`] = `
       >
         <button
           aria-expanded={false}
-          aria-haspopup={true}
           className="dropdown-toggle btn btn-outline-primary"
           disabled={false}
           id="experiment-pagesize--dropdown"
@@ -17743,6 +17535,7 @@ exports[`Storyshots Pager Default 1`] = `
           onClick={[Function]}
           onKeyDown={[Function]}
           role="button"
+          tabIndex={0}
         >
           <span
             aria-hidden="true"
@@ -17750,7 +17543,7 @@ exports[`Storyshots Pager Default 1`] = `
             «
           </span>
           <span
-            className="sr-only"
+            className="visually-hidden"
           >
             First
           </span>
@@ -17765,6 +17558,7 @@ exports[`Storyshots Pager Default 1`] = `
           onClick={[Function]}
           onKeyDown={[Function]}
           role="button"
+          tabIndex={0}
         >
           <span
             aria-hidden="true"
@@ -17772,7 +17566,7 @@ exports[`Storyshots Pager Default 1`] = `
             ‹
           </span>
           <span
-            className="sr-only"
+            className="visually-hidden"
           >
             Previous
           </span>
@@ -17787,6 +17581,7 @@ exports[`Storyshots Pager Default 1`] = `
           onClick={[Function]}
           onKeyDown={[Function]}
           role="button"
+          tabIndex={0}
         >
           <span
             aria-hidden="true"
@@ -17794,7 +17589,7 @@ exports[`Storyshots Pager Default 1`] = `
             …
           </span>
           <span
-            className="sr-only"
+            className="visually-hidden"
           >
             More
           </span>
@@ -17809,6 +17604,7 @@ exports[`Storyshots Pager Default 1`] = `
           onClick={[Function]}
           onKeyDown={[Function]}
           role="button"
+          tabIndex={0}
         >
           3
         </a>
@@ -17822,6 +17618,7 @@ exports[`Storyshots Pager Default 1`] = `
           onClick={[Function]}
           onKeyDown={[Function]}
           role="button"
+          tabIndex={0}
         >
           4
         </a>
@@ -17831,12 +17628,11 @@ exports[`Storyshots Pager Default 1`] = `
       >
         <span
           className="page-link"
-          disabled={false}
           onClick={[Function]}
         >
           5
           <span
-            className="sr-only"
+            className="visually-hidden"
           >
             (current)
           </span>
@@ -17851,6 +17647,7 @@ exports[`Storyshots Pager Default 1`] = `
           onClick={[Function]}
           onKeyDown={[Function]}
           role="button"
+          tabIndex={0}
         >
           6
         </a>
@@ -17864,6 +17661,7 @@ exports[`Storyshots Pager Default 1`] = `
           onClick={[Function]}
           onKeyDown={[Function]}
           role="button"
+          tabIndex={0}
         >
           7
         </a>
@@ -17877,6 +17675,7 @@ exports[`Storyshots Pager Default 1`] = `
           onClick={[Function]}
           onKeyDown={[Function]}
           role="button"
+          tabIndex={0}
         >
           <span
             aria-hidden="true"
@@ -17884,7 +17683,7 @@ exports[`Storyshots Pager Default 1`] = `
             …
           </span>
           <span
-            className="sr-only"
+            className="visually-hidden"
           >
             More
           </span>
@@ -17899,6 +17698,7 @@ exports[`Storyshots Pager Default 1`] = `
           onClick={[Function]}
           onKeyDown={[Function]}
           role="button"
+          tabIndex={0}
         >
           10
            
@@ -17918,6 +17718,7 @@ exports[`Storyshots Pager Default 1`] = `
           onClick={[Function]}
           onKeyDown={[Function]}
           role="button"
+          tabIndex={0}
         >
           <span
             aria-hidden="true"
@@ -17925,7 +17726,7 @@ exports[`Storyshots Pager Default 1`] = `
             ›
           </span>
           <span
-            className="sr-only"
+            className="visually-hidden"
           >
             Next
           </span>
@@ -17940,6 +17741,7 @@ exports[`Storyshots Pager Default 1`] = `
           onClick={[Function]}
           onKeyDown={[Function]}
           role="button"
+          tabIndex={0}
         >
           <span
             aria-hidden="true"
@@ -17947,7 +17749,7 @@ exports[`Storyshots Pager Default 1`] = `
             »
           </span>
           <span
-            className="sr-only"
+            className="visually-hidden"
           >
             Last
           </span>
@@ -17988,7 +17790,6 @@ exports[`Storyshots Pager Last Page 1`] = `
       >
         <button
           aria-expanded={false}
-          aria-haspopup={true}
           className="dropdown-toggle btn btn-outline-primary"
           disabled={false}
           id="experiment-pagesize--dropdown"
@@ -18018,6 +17819,7 @@ exports[`Storyshots Pager Last Page 1`] = `
           onClick={[Function]}
           onKeyDown={[Function]}
           role="button"
+          tabIndex={0}
         >
           <span
             aria-hidden="true"
@@ -18025,7 +17827,7 @@ exports[`Storyshots Pager Last Page 1`] = `
             «
           </span>
           <span
-            className="sr-only"
+            className="visually-hidden"
           >
             First
           </span>
@@ -18040,6 +17842,7 @@ exports[`Storyshots Pager Last Page 1`] = `
           onClick={[Function]}
           onKeyDown={[Function]}
           role="button"
+          tabIndex={0}
         >
           <span
             aria-hidden="true"
@@ -18047,7 +17850,7 @@ exports[`Storyshots Pager Last Page 1`] = `
             ‹
           </span>
           <span
-            className="sr-only"
+            className="visually-hidden"
           >
             Previous
           </span>
@@ -18062,6 +17865,7 @@ exports[`Storyshots Pager Last Page 1`] = `
           onClick={[Function]}
           onKeyDown={[Function]}
           role="button"
+          tabIndex={0}
         >
           <span
             aria-hidden="true"
@@ -18069,7 +17873,7 @@ exports[`Storyshots Pager Last Page 1`] = `
             …
           </span>
           <span
-            className="sr-only"
+            className="visually-hidden"
           >
             More
           </span>
@@ -18084,6 +17888,7 @@ exports[`Storyshots Pager Last Page 1`] = `
           onClick={[Function]}
           onKeyDown={[Function]}
           role="button"
+          tabIndex={0}
         >
           6
         </a>
@@ -18097,6 +17902,7 @@ exports[`Storyshots Pager Last Page 1`] = `
           onClick={[Function]}
           onKeyDown={[Function]}
           role="button"
+          tabIndex={0}
         >
           7
         </a>
@@ -18110,6 +17916,7 @@ exports[`Storyshots Pager Last Page 1`] = `
           onClick={[Function]}
           onKeyDown={[Function]}
           role="button"
+          tabIndex={0}
         >
           8
         </a>
@@ -18123,6 +17930,7 @@ exports[`Storyshots Pager Last Page 1`] = `
           onClick={[Function]}
           onKeyDown={[Function]}
           role="button"
+          tabIndex={0}
         >
           9
         </a>
@@ -18132,12 +17940,11 @@ exports[`Storyshots Pager Last Page 1`] = `
       >
         <span
           className="page-link"
-          disabled={false}
           onClick={[Function]}
         >
           10
           <span
-            className="sr-only"
+            className="visually-hidden"
           >
             (current)
           </span>
@@ -18152,6 +17959,7 @@ exports[`Storyshots Pager Last Page 1`] = `
           onClick={[Function]}
           onKeyDown={[Function]}
           role="button"
+          tabIndex={0}
         >
           <span
             aria-hidden="true"
@@ -18159,7 +17967,7 @@ exports[`Storyshots Pager Last Page 1`] = `
             ›
           </span>
           <span
-            className="sr-only"
+            className="visually-hidden"
           >
             Next
           </span>
@@ -18174,6 +17982,7 @@ exports[`Storyshots Pager Last Page 1`] = `
           onClick={[Function]}
           onKeyDown={[Function]}
           role="button"
+          tabIndex={0}
         >
           <span
             aria-hidden="true"
@@ -18181,7 +17990,7 @@ exports[`Storyshots Pager Last Page 1`] = `
             »
           </span>
           <span
-            className="sr-only"
+            className="visually-hidden"
           >
             Last
           </span>
@@ -18222,7 +18031,6 @@ exports[`Storyshots Pager Less Than Five Pages 1`] = `
       >
         <button
           aria-expanded={false}
-          aria-haspopup={true}
           className="dropdown-toggle btn btn-outline-primary"
           disabled={false}
           id="experiment-pagesize--dropdown"
@@ -18252,6 +18060,7 @@ exports[`Storyshots Pager Less Than Five Pages 1`] = `
           onClick={[Function]}
           onKeyDown={[Function]}
           role="button"
+          tabIndex={0}
         >
           <span
             aria-hidden="true"
@@ -18259,7 +18068,7 @@ exports[`Storyshots Pager Less Than Five Pages 1`] = `
             «
           </span>
           <span
-            className="sr-only"
+            className="visually-hidden"
           >
             First
           </span>
@@ -18274,6 +18083,7 @@ exports[`Storyshots Pager Less Than Five Pages 1`] = `
           onClick={[Function]}
           onKeyDown={[Function]}
           role="button"
+          tabIndex={0}
         >
           <span
             aria-hidden="true"
@@ -18281,7 +18091,7 @@ exports[`Storyshots Pager Less Than Five Pages 1`] = `
             ‹
           </span>
           <span
-            className="sr-only"
+            className="visually-hidden"
           >
             Previous
           </span>
@@ -18292,12 +18102,11 @@ exports[`Storyshots Pager Less Than Five Pages 1`] = `
       >
         <span
           className="page-link"
-          disabled={false}
           onClick={[Function]}
         >
           1
           <span
-            className="sr-only"
+            className="visually-hidden"
           >
             (current)
           </span>
@@ -18312,6 +18121,7 @@ exports[`Storyshots Pager Less Than Five Pages 1`] = `
           onClick={[Function]}
           onKeyDown={[Function]}
           role="button"
+          tabIndex={0}
         >
           2
         </a>
@@ -18325,6 +18135,7 @@ exports[`Storyshots Pager Less Than Five Pages 1`] = `
           onClick={[Function]}
           onKeyDown={[Function]}
           role="button"
+          tabIndex={0}
         >
           3
         </a>
@@ -18338,6 +18149,7 @@ exports[`Storyshots Pager Less Than Five Pages 1`] = `
           onClick={[Function]}
           onKeyDown={[Function]}
           role="button"
+          tabIndex={0}
         >
           4
         </a>
@@ -18351,6 +18163,7 @@ exports[`Storyshots Pager Less Than Five Pages 1`] = `
           onClick={[Function]}
           onKeyDown={[Function]}
           role="button"
+          tabIndex={0}
         >
           <span
             aria-hidden="true"
@@ -18358,7 +18171,7 @@ exports[`Storyshots Pager Less Than Five Pages 1`] = `
             ›
           </span>
           <span
-            className="sr-only"
+            className="visually-hidden"
           >
             Next
           </span>
@@ -18373,6 +18186,7 @@ exports[`Storyshots Pager Less Than Five Pages 1`] = `
           onClick={[Function]}
           onKeyDown={[Function]}
           role="button"
+          tabIndex={0}
         >
           <span
             aria-hidden="true"
@@ -18380,7 +18194,7 @@ exports[`Storyshots Pager Less Than Five Pages 1`] = `
             »
           </span>
           <span
-            className="sr-only"
+            className="visually-hidden"
           >
             Last
           </span>
@@ -18421,7 +18235,6 @@ exports[`Storyshots Pager No Pages 1`] = `
       >
         <button
           aria-expanded={false}
-          aria-haspopup={true}
           className="dropdown-toggle btn btn-outline-primary"
           disabled={false}
           id="experiment-pagesize--dropdown"
@@ -18451,6 +18264,7 @@ exports[`Storyshots Pager No Pages 1`] = `
           onClick={[Function]}
           onKeyDown={[Function]}
           role="button"
+          tabIndex={0}
         >
           <span
             aria-hidden="true"
@@ -18458,7 +18272,7 @@ exports[`Storyshots Pager No Pages 1`] = `
             «
           </span>
           <span
-            className="sr-only"
+            className="visually-hidden"
           >
             First
           </span>
@@ -18473,6 +18287,7 @@ exports[`Storyshots Pager No Pages 1`] = `
           onClick={[Function]}
           onKeyDown={[Function]}
           role="button"
+          tabIndex={0}
         >
           <span
             aria-hidden="true"
@@ -18480,7 +18295,7 @@ exports[`Storyshots Pager No Pages 1`] = `
             ‹
           </span>
           <span
-            className="sr-only"
+            className="visually-hidden"
           >
             Previous
           </span>
@@ -18495,6 +18310,7 @@ exports[`Storyshots Pager No Pages 1`] = `
           onClick={[Function]}
           onKeyDown={[Function]}
           role="button"
+          tabIndex={0}
         >
           <span
             aria-hidden="true"
@@ -18502,7 +18318,7 @@ exports[`Storyshots Pager No Pages 1`] = `
             ›
           </span>
           <span
-            className="sr-only"
+            className="visually-hidden"
           >
             Next
           </span>
@@ -18517,6 +18333,7 @@ exports[`Storyshots Pager No Pages 1`] = `
           onClick={[Function]}
           onKeyDown={[Function]}
           role="button"
+          tabIndex={0}
         >
           <span
             aria-hidden="true"
@@ -18524,7 +18341,7 @@ exports[`Storyshots Pager No Pages 1`] = `
             »
           </span>
           <span
-            className="sr-only"
+            className="visually-hidden"
           >
             Last
           </span>
@@ -18565,7 +18382,6 @@ exports[`Storyshots Pager One Page 1`] = `
       >
         <button
           aria-expanded={false}
-          aria-haspopup={true}
           className="dropdown-toggle btn btn-outline-primary"
           disabled={false}
           id="experiment-pagesize--dropdown"
@@ -18595,6 +18411,7 @@ exports[`Storyshots Pager One Page 1`] = `
           onClick={[Function]}
           onKeyDown={[Function]}
           role="button"
+          tabIndex={0}
         >
           <span
             aria-hidden="true"
@@ -18602,7 +18419,7 @@ exports[`Storyshots Pager One Page 1`] = `
             «
           </span>
           <span
-            className="sr-only"
+            className="visually-hidden"
           >
             First
           </span>
@@ -18617,6 +18434,7 @@ exports[`Storyshots Pager One Page 1`] = `
           onClick={[Function]}
           onKeyDown={[Function]}
           role="button"
+          tabIndex={0}
         >
           <span
             aria-hidden="true"
@@ -18624,7 +18442,7 @@ exports[`Storyshots Pager One Page 1`] = `
             ‹
           </span>
           <span
-            className="sr-only"
+            className="visually-hidden"
           >
             Previous
           </span>
@@ -18635,12 +18453,11 @@ exports[`Storyshots Pager One Page 1`] = `
       >
         <span
           className="page-link"
-          disabled={false}
           onClick={[Function]}
         >
           1
           <span
-            className="sr-only"
+            className="visually-hidden"
           >
             (current)
           </span>
@@ -18655,6 +18472,7 @@ exports[`Storyshots Pager One Page 1`] = `
           onClick={[Function]}
           onKeyDown={[Function]}
           role="button"
+          tabIndex={0}
         >
           <span
             aria-hidden="true"
@@ -18662,7 +18480,7 @@ exports[`Storyshots Pager One Page 1`] = `
             ›
           </span>
           <span
-            className="sr-only"
+            className="visually-hidden"
           >
             Next
           </span>
@@ -18677,6 +18495,7 @@ exports[`Storyshots Pager One Page 1`] = `
           onClick={[Function]}
           onKeyDown={[Function]}
           role="button"
+          tabIndex={0}
         >
           <span
             aria-hidden="true"
@@ -18684,7 +18503,7 @@ exports[`Storyshots Pager One Page 1`] = `
             »
           </span>
           <span
-            className="sr-only"
+            className="visually-hidden"
           >
             Last
           </span>
@@ -19333,11 +19152,13 @@ exports[`Storyshots Result tabs Default 1`] = `
     >
       <a
         className="nav-link active"
-        data-rb-event-key="project"
+        data-rr-ui-event-key="project"
         href="#"
         onClick={[Function]}
         onKeyDown={[Function]}
+        onSelect={[Function]}
         role="button"
+        tabIndex={0}
       >
         <span
           className="text-capitalize"
@@ -19363,11 +19184,13 @@ exports[`Storyshots Result tabs Default 1`] = `
     >
       <a
         className="nav-link"
-        data-rb-event-key="experiment"
+        data-rr-ui-event-key="experiment"
         href="#"
         onClick={[Function]}
         onKeyDown={[Function]}
+        onSelect={[Function]}
         role="button"
+        tabIndex={0}
       >
         <span
           className="text-capitalize"
@@ -19393,11 +19216,13 @@ exports[`Storyshots Result tabs Default 1`] = `
     >
       <a
         className="nav-link"
-        data-rb-event-key="dataset"
+        data-rr-ui-event-key="dataset"
         href="#"
         onClick={[Function]}
         onKeyDown={[Function]}
+        onSelect={[Function]}
         role="button"
+        tabIndex={0}
       >
         <span
           className="text-capitalize"
@@ -19423,11 +19248,13 @@ exports[`Storyshots Result tabs Default 1`] = `
     >
       <a
         className="nav-link"
-        data-rb-event-key="datafile"
+        data-rr-ui-event-key="datafile"
         href="#"
         onClick={[Function]}
         onKeyDown={[Function]}
+        onSelect={[Function]}
         role="button"
+        tabIndex={0}
       >
         <span
           className="text-capitalize"
@@ -19469,11 +19296,13 @@ exports[`Storyshots Result tabs Empty Counts 1`] = `
     >
       <a
         className="nav-link active"
-        data-rb-event-key="project"
+        data-rr-ui-event-key="project"
         href="#"
         onClick={[Function]}
         onKeyDown={[Function]}
+        onSelect={[Function]}
         role="button"
+        tabIndex={0}
       >
         <span
           className="text-capitalize"
@@ -19498,11 +19327,13 @@ exports[`Storyshots Result tabs Empty Counts 1`] = `
     >
       <a
         className="nav-link"
-        data-rb-event-key="experiment"
+        data-rr-ui-event-key="experiment"
         href="#"
         onClick={[Function]}
         onKeyDown={[Function]}
+        onSelect={[Function]}
         role="button"
+        tabIndex={0}
       >
         <span
           className="text-capitalize"
@@ -19527,11 +19358,13 @@ exports[`Storyshots Result tabs Empty Counts 1`] = `
     >
       <a
         className="nav-link"
-        data-rb-event-key="dataset"
+        data-rr-ui-event-key="dataset"
         href="#"
         onClick={[Function]}
         onKeyDown={[Function]}
+        onSelect={[Function]}
         role="button"
+        tabIndex={0}
       >
         <span
           className="text-capitalize"
@@ -19556,11 +19389,13 @@ exports[`Storyshots Result tabs Empty Counts 1`] = `
     >
       <a
         className="nav-link"
-        data-rb-event-key="datafile"
+        data-rr-ui-event-key="datafile"
         href="#"
         onClick={[Function]}
         onKeyDown={[Function]}
+        onSelect={[Function]}
         role="button"
+        tabIndex={0}
       >
         <span
           className="text-capitalize"
@@ -19598,121 +19433,144 @@ exports[`Storyshots Search page Default 1`] = `
         className="filter-sidebar"
       >
         <section>
-          <nav
+          <ul
             className="nav nav-tabs"
+            id="filters-section"
             onKeyDown={[Function]}
             role="tablist"
           >
-            <a
-              aria-controls="filters-section-tabpane-project"
-              aria-selected={true}
-              className="nav-item nav-link active"
-              data-rb-event-key="project"
-              href="#"
-              id="filters-section-tab-project"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="tab"
+            <li
+              className="nav-item"
+              role="presentation"
             >
-              <div
-                className="tab-sticker"
-                style={
-                  {
-                    "backgroundColor": "#f7db8d",
-                  }
-                }
+              <button
+                aria-controls="filters-section-tabpane-project"
+                aria-selected={true}
+                className="nav-link active"
+                data-rr-ui-event-key="project"
+                disabled={false}
+                id="filters-section-tab-project"
+                onClick={[Function]}
+                role="tab"
+                type="button"
               >
                 <div
-                  className="tab-stick--content"
+                  className="tab-sticker"
+                  style={
+                    {
+                      "backgroundColor": "#f7db8d",
+                    }
+                  }
                 >
-                  P
+                  <div
+                    className="tab-stick--content"
+                  >
+                    P
+                  </div>
                 </div>
-              </div>
-            </a>
-            <a
-              aria-controls="filters-section-tabpane-experiment"
-              aria-selected={false}
-              className="nav-item nav-link"
-              data-rb-event-key="experiment"
-              href="#"
-              id="filters-section-tab-experiment"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="tab"
+              </button>
+            </li>
+            <li
+              className="nav-item"
+              role="presentation"
             >
-              <div
-                className="tab-sticker"
-                style={
-                  {
-                    "backgroundColor": "#abe2ff",
-                  }
-                }
+              <button
+                aria-controls="filters-section-tabpane-experiment"
+                aria-selected={false}
+                className="nav-link"
+                data-rr-ui-event-key="experiment"
+                disabled={false}
+                id="filters-section-tab-experiment"
+                onClick={[Function]}
+                role="tab"
+                tabIndex={-1}
+                type="button"
               >
                 <div
-                  className="tab-stick--content"
+                  className="tab-sticker"
+                  style={
+                    {
+                      "backgroundColor": "#abe2ff",
+                    }
+                  }
                 >
-                  E
+                  <div
+                    className="tab-stick--content"
+                  >
+                    E
+                  </div>
                 </div>
-              </div>
-            </a>
-            <a
-              aria-controls="filters-section-tabpane-dataset"
-              aria-selected={false}
-              className="nav-item nav-link"
-              data-rb-event-key="dataset"
-              href="#"
-              id="filters-section-tab-dataset"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="tab"
+              </button>
+            </li>
+            <li
+              className="nav-item"
+              role="presentation"
             >
-              <div
-                className="tab-sticker"
-                style={
-                  {
-                    "backgroundColor": "#ffcce8",
-                  }
-                }
+              <button
+                aria-controls="filters-section-tabpane-dataset"
+                aria-selected={false}
+                className="nav-link"
+                data-rr-ui-event-key="dataset"
+                disabled={false}
+                id="filters-section-tab-dataset"
+                onClick={[Function]}
+                role="tab"
+                tabIndex={-1}
+                type="button"
               >
                 <div
-                  className="tab-stick--content"
+                  className="tab-sticker"
+                  style={
+                    {
+                      "backgroundColor": "#ffcce8",
+                    }
+                  }
                 >
-                  DS
+                  <div
+                    className="tab-stick--content"
+                  >
+                    DS
+                  </div>
                 </div>
-              </div>
-            </a>
-            <a
-              aria-controls="filters-section-tabpane-datafile"
-              aria-selected={false}
-              className="nav-item nav-link"
-              data-rb-event-key="datafile"
-              href="#"
-              id="filters-section-tab-datafile"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="tab"
+              </button>
+            </li>
+            <li
+              className="nav-item"
+              role="presentation"
             >
-              <div
-                className="tab-sticker"
-                style={
-                  {
-                    "backgroundColor": "#70ffae",
-                  }
-                }
+              <button
+                aria-controls="filters-section-tabpane-datafile"
+                aria-selected={false}
+                className="nav-link"
+                data-rr-ui-event-key="datafile"
+                disabled={false}
+                id="filters-section-tab-datafile"
+                onClick={[Function]}
+                role="tab"
+                tabIndex={-1}
+                type="button"
               >
                 <div
-                  className="tab-stick--content"
+                  className="tab-sticker"
+                  style={
+                    {
+                      "backgroundColor": "#70ffae",
+                    }
+                  }
                 >
-                  DF
+                  <div
+                    className="tab-stick--content"
+                  >
+                    DF
+                  </div>
                 </div>
-              </div>
-            </a>
-          </nav>
+              </button>
+            </li>
+          </ul>
           <div
             className="tab-content"
           >
             <div
-              aria-hidden={false}
               aria-labelledby="filters-section-tab-project"
               className="fade tab-pane active show"
               id="filters-section-tabpane-project"
@@ -19759,18 +19617,14 @@ exports[`Storyshots Search page Default 1`] = `
                       placeholder=""
                       value=""
                     />
-                    <div
-                      className="input-group-append"
+                    <button
+                      aria-label="Filter results"
+                      className="btn btn-outline-secondary"
+                      disabled={false}
+                      type="submit"
                     >
-                      <button
-                        aria-label="Filter results"
-                        className="btn btn-outline-secondary"
-                        disabled={false}
-                        type="submit"
-                      >
-                        Filter
-                      </button>
-                    </div>
+                      Filter
+                    </button>
                   </div>
                 </form>
               </section>
@@ -19786,7 +19640,7 @@ exports[`Storyshots Search page Default 1`] = `
                   onSubmit={[Function]}
                 >
                   <div
-                    className="date-range-filter__field form-group"
+                    className="date-range-filter__field"
                   >
                     <label
                       className="form-label"
@@ -20278,7 +20132,7 @@ exports[`Storyshots Search page Default 1`] = `
                     </div>
                   </div>
                   <div
-                    className="date-range-filter__field form-group"
+                    className="date-range-filter__field"
                   >
                     <label
                       className="form-label"
@@ -20771,7 +20625,7 @@ exports[`Storyshots Search page Default 1`] = `
                   </div>
                   <button
                     aria-label="Filter results"
-                    className="date-range-filter__button btn btn-outline-secondary"
+                    className="date-range-filter__button mt-3 btn btn-outline-secondary"
                     disabled={false}
                     type="submit"
                   >
@@ -20800,18 +20654,14 @@ exports[`Storyshots Search page Default 1`] = `
                       placeholder=""
                       value=""
                     />
-                    <div
-                      className="input-group-append"
+                    <button
+                      aria-label="Filter results"
+                      className="btn btn-outline-secondary"
+                      disabled={false}
+                      type="submit"
                     >
-                      <button
-                        aria-label="Filter results"
-                        className="btn btn-outline-secondary"
-                        disabled={false}
-                        type="submit"
-                      >
-                        Filter
-                      </button>
-                    </div>
+                      Filter
+                    </button>
                   </div>
                 </form>
               </section>
@@ -20822,9 +20672,7 @@ exports[`Storyshots Search page Default 1`] = `
                 >
                   Schemas
                 </h3>
-                <div
-                  className="form-group"
-                >
+                <div>
                   <div
                     className="form-check"
                   >
@@ -20868,26 +20716,27 @@ exports[`Storyshots Search page Default 1`] = `
                   className="accordion"
                 >
                   <div
-                    className="card"
+                    className="accordion-item"
                   >
-                    <div
-                      className="card-header"
+                    <h2
+                      className="accordion-header"
                     >
                       <button
-                        className="btn btn-link"
+                        aria-expanded={true}
+                        className="accordion-button"
                         onClick={[Function]}
                         type="button"
                       >
                         Raw data
                          filters
                       </button>
-                    </div>
+                    </h2>
                     <div
                       aria-expanded={null}
-                      className="collapse"
+                      className="accordion-collapse collapse show"
                     >
                       <div
-                        className="card-body"
+                        className="accordion-body"
                       >
                         <section
                           className="single-schema-list__filter"
@@ -20911,18 +20760,14 @@ exports[`Storyshots Search page Default 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -20949,18 +20794,14 @@ exports[`Storyshots Search page Default 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -20987,18 +20828,14 @@ exports[`Storyshots Search page Default 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -21010,7 +20847,6 @@ exports[`Storyshots Search page Default 1`] = `
               </section>
             </div>
             <div
-              aria-hidden={true}
               aria-labelledby="filters-section-tab-experiment"
               className="fade tab-pane"
               id="filters-section-tabpane-experiment"
@@ -21057,18 +20893,14 @@ exports[`Storyshots Search page Default 1`] = `
                       placeholder=""
                       value=""
                     />
-                    <div
-                      className="input-group-append"
+                    <button
+                      aria-label="Filter results"
+                      className="btn btn-outline-secondary"
+                      disabled={false}
+                      type="submit"
                     >
-                      <button
-                        aria-label="Filter results"
-                        className="btn btn-outline-secondary"
-                        disabled={false}
-                        type="submit"
-                      >
-                        Filter
-                      </button>
-                    </div>
+                      Filter
+                    </button>
                   </div>
                 </form>
               </section>
@@ -21084,7 +20916,7 @@ exports[`Storyshots Search page Default 1`] = `
                   onSubmit={[Function]}
                 >
                   <div
-                    className="date-range-filter__field form-group"
+                    className="date-range-filter__field"
                   >
                     <label
                       className="form-label"
@@ -21576,7 +21408,7 @@ exports[`Storyshots Search page Default 1`] = `
                     </div>
                   </div>
                   <div
-                    className="date-range-filter__field form-group"
+                    className="date-range-filter__field"
                   >
                     <label
                       className="form-label"
@@ -22069,7 +21901,7 @@ exports[`Storyshots Search page Default 1`] = `
                   </div>
                   <button
                     aria-label="Filter results"
-                    className="date-range-filter__button btn btn-outline-secondary"
+                    className="date-range-filter__button mt-3 btn btn-outline-secondary"
                     disabled={false}
                     type="submit"
                   >
@@ -22098,18 +21930,14 @@ exports[`Storyshots Search page Default 1`] = `
                       placeholder=""
                       value=""
                     />
-                    <div
-                      className="input-group-append"
+                    <button
+                      aria-label="Filter results"
+                      className="btn btn-outline-secondary"
+                      disabled={false}
+                      type="submit"
                     >
-                      <button
-                        aria-label="Filter results"
-                        className="btn btn-outline-secondary"
-                        disabled={false}
-                        type="submit"
-                      >
-                        Filter
-                      </button>
-                    </div>
+                      Filter
+                    </button>
                   </div>
                 </form>
               </section>
@@ -22120,9 +21948,7 @@ exports[`Storyshots Search page Default 1`] = `
                 >
                   Schemas
                 </h3>
-                <div
-                  className="form-group"
-                >
+                <div>
                   <div
                     className="form-check"
                   >
@@ -22166,26 +21992,27 @@ exports[`Storyshots Search page Default 1`] = `
                   className="accordion"
                 >
                   <div
-                    className="card"
+                    className="accordion-item"
                   >
-                    <div
-                      className="card-header"
+                    <h2
+                      className="accordion-header"
                     >
                       <button
-                        className="btn btn-link"
+                        aria-expanded={true}
+                        className="accordion-button"
                         onClick={[Function]}
                         type="button"
                       >
                         Biopipeline Output
                          filters
                       </button>
-                    </div>
+                    </h2>
                     <div
                       aria-expanded={null}
-                      className="collapse"
+                      className="accordion-collapse collapse show"
                     >
                       <div
-                        className="card-body"
+                        className="accordion-body"
                       >
                         <section
                           className="single-schema-list__filter"
@@ -22209,18 +22036,14 @@ exports[`Storyshots Search page Default 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -22247,18 +22070,14 @@ exports[`Storyshots Search page Default 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -22285,18 +22104,14 @@ exports[`Storyshots Search page Default 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -22308,7 +22123,6 @@ exports[`Storyshots Search page Default 1`] = `
               </section>
             </div>
             <div
-              aria-hidden={true}
               aria-labelledby="filters-section-tab-dataset"
               className="fade tab-pane"
               id="filters-section-tabpane-dataset"
@@ -22355,18 +22169,14 @@ exports[`Storyshots Search page Default 1`] = `
                       placeholder=""
                       value=""
                     />
-                    <div
-                      className="input-group-append"
+                    <button
+                      aria-label="Filter results"
+                      className="btn btn-outline-secondary"
+                      disabled={false}
+                      type="submit"
                     >
-                      <button
-                        aria-label="Filter results"
-                        className="btn btn-outline-secondary"
-                        disabled={false}
-                        type="submit"
-                      >
-                        Filter
-                      </button>
-                    </div>
+                      Filter
+                    </button>
                   </div>
                 </form>
               </section>
@@ -22382,7 +22192,7 @@ exports[`Storyshots Search page Default 1`] = `
                   onSubmit={[Function]}
                 >
                   <div
-                    className="date-range-filter__field form-group"
+                    className="date-range-filter__field"
                   >
                     <label
                       className="form-label"
@@ -22874,7 +22684,7 @@ exports[`Storyshots Search page Default 1`] = `
                     </div>
                   </div>
                   <div
-                    className="date-range-filter__field form-group"
+                    className="date-range-filter__field"
                   >
                     <label
                       className="form-label"
@@ -23367,7 +23177,7 @@ exports[`Storyshots Search page Default 1`] = `
                   </div>
                   <button
                     aria-label="Filter results"
-                    className="date-range-filter__button btn btn-outline-secondary"
+                    className="date-range-filter__button mt-3 btn btn-outline-secondary"
                     disabled={false}
                     type="submit"
                   >
@@ -23396,18 +23206,14 @@ exports[`Storyshots Search page Default 1`] = `
                       placeholder=""
                       value=""
                     />
-                    <div
-                      className="input-group-append"
+                    <button
+                      aria-label="Filter results"
+                      className="btn btn-outline-secondary"
+                      disabled={false}
+                      type="submit"
                     >
-                      <button
-                        aria-label="Filter results"
-                        className="btn btn-outline-secondary"
-                        disabled={false}
-                        type="submit"
-                      >
-                        Filter
-                      </button>
-                    </div>
+                      Filter
+                    </button>
                   </div>
                 </form>
               </section>
@@ -23418,9 +23224,7 @@ exports[`Storyshots Search page Default 1`] = `
                 >
                   Schemas
                 </h3>
-                <div
-                  className="form-group"
-                >
+                <div>
                   <div
                     className="form-check"
                   >
@@ -23464,26 +23268,27 @@ exports[`Storyshots Search page Default 1`] = `
                   className="accordion"
                 >
                   <div
-                    className="card"
+                    className="accordion-item"
                   >
-                    <div
-                      className="card-header"
+                    <h2
+                      className="accordion-header"
                     >
                       <button
-                        className="btn btn-link"
+                        aria-expanded={true}
+                        className="accordion-button"
                         onClick={[Function]}
                         type="button"
                       >
                         Raw data
                          filters
                       </button>
-                    </div>
+                    </h2>
                     <div
                       aria-expanded={null}
-                      className="collapse"
+                      className="accordion-collapse collapse show"
                     >
                       <div
-                        className="card-body"
+                        className="accordion-body"
                       >
                         <section
                           className="single-schema-list__filter"
@@ -23507,18 +23312,14 @@ exports[`Storyshots Search page Default 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -23545,18 +23346,14 @@ exports[`Storyshots Search page Default 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -23583,18 +23380,14 @@ exports[`Storyshots Search page Default 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -23606,7 +23399,6 @@ exports[`Storyshots Search page Default 1`] = `
               </section>
             </div>
             <div
-              aria-hidden={true}
               aria-labelledby="filters-section-tab-datafile"
               className="fade tab-pane"
               id="filters-section-tabpane-datafile"
@@ -23653,18 +23445,14 @@ exports[`Storyshots Search page Default 1`] = `
                       placeholder=""
                       value=""
                     />
-                    <div
-                      className="input-group-append"
+                    <button
+                      aria-label="Filter results"
+                      className="btn btn-outline-secondary"
+                      disabled={false}
+                      type="submit"
                     >
-                      <button
-                        aria-label="Filter results"
-                        className="btn btn-outline-secondary"
-                        disabled={false}
-                        type="submit"
-                      >
-                        Filter
-                      </button>
-                    </div>
+                      Filter
+                    </button>
                   </div>
                 </form>
               </section>
@@ -23680,7 +23468,7 @@ exports[`Storyshots Search page Default 1`] = `
                   onSubmit={[Function]}
                 >
                   <div
-                    className="date-range-filter__field form-group"
+                    className="date-range-filter__field"
                   >
                     <label
                       className="form-label"
@@ -24172,7 +23960,7 @@ exports[`Storyshots Search page Default 1`] = `
                     </div>
                   </div>
                   <div
-                    className="date-range-filter__field form-group"
+                    className="date-range-filter__field"
                   >
                     <label
                       className="form-label"
@@ -24665,7 +24453,7 @@ exports[`Storyshots Search page Default 1`] = `
                   </div>
                   <button
                     aria-label="Filter results"
-                    className="date-range-filter__button btn btn-outline-secondary"
+                    className="date-range-filter__button mt-3 btn btn-outline-secondary"
                     disabled={false}
                     type="submit"
                   >
@@ -24694,18 +24482,14 @@ exports[`Storyshots Search page Default 1`] = `
                       placeholder=""
                       value=""
                     />
-                    <div
-                      className="input-group-append"
+                    <button
+                      aria-label="Filter results"
+                      className="btn btn-outline-secondary"
+                      disabled={false}
+                      type="submit"
                     >
-                      <button
-                        aria-label="Filter results"
-                        className="btn btn-outline-secondary"
-                        disabled={false}
-                        type="submit"
-                      >
-                        Filter
-                      </button>
-                    </div>
+                      Filter
+                    </button>
                   </div>
                 </form>
               </section>
@@ -24716,9 +24500,7 @@ exports[`Storyshots Search page Default 1`] = `
                 >
                   Schemas
                 </h3>
-                <div
-                  className="form-group"
-                >
+                <div>
                   <div
                     className="form-check"
                   >
@@ -24762,26 +24544,27 @@ exports[`Storyshots Search page Default 1`] = `
                   className="accordion"
                 >
                   <div
-                    className="card"
+                    className="accordion-item"
                   >
-                    <div
-                      className="card-header"
+                    <h2
+                      className="accordion-header"
                     >
                       <button
-                        className="btn btn-link"
+                        aria-expanded={true}
+                        className="accordion-button"
                         onClick={[Function]}
                         type="button"
                       >
                         Raw data
                          filters
                       </button>
-                    </div>
+                    </h2>
                     <div
                       aria-expanded={null}
-                      className="collapse"
+                      className="accordion-collapse collapse show"
                     >
                       <div
-                        className="card-body"
+                        className="accordion-body"
                       >
                         <section
                           className="single-schema-list__filter"
@@ -24805,18 +24588,14 @@ exports[`Storyshots Search page Default 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -24843,18 +24622,14 @@ exports[`Storyshots Search page Default 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -24881,18 +24656,14 @@ exports[`Storyshots Search page Default 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -24901,26 +24672,27 @@ exports[`Storyshots Search page Default 1`] = `
                     </div>
                   </div>
                   <div
-                    className="card"
+                    className="accordion-item"
                   >
-                    <div
-                      className="card-header"
+                    <h2
+                      className="accordion-header"
                     >
                       <button
-                        className="btn btn-link"
+                        aria-expanded={true}
+                        className="accordion-button"
                         onClick={[Function]}
                         type="button"
                       >
                         Biopipeline Output
                          filters
                       </button>
-                    </div>
+                    </h2>
                     <div
                       aria-expanded={null}
-                      className="collapse"
+                      className="accordion-collapse collapse show"
                     >
                       <div
-                        className="card-body"
+                        className="accordion-body"
                       >
                         <section
                           className="single-schema-list__filter"
@@ -24944,18 +24716,14 @@ exports[`Storyshots Search page Default 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -24982,18 +24750,14 @@ exports[`Storyshots Search page Default 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -25020,18 +24784,14 @@ exports[`Storyshots Search page Default 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -25066,17 +24826,17 @@ exports[`Storyshots Search page Default 1`] = `
               className="filter-summary-box__badge-group"
             >
               <span
-                className="filter-summary-box__badge badge badge-secondary"
+                className="filter-summary-box__badge badge bg-secondary"
               >
                 Project.Schema
               </span>
               <span
-                className="filter-summary-box__badge filter-summarybox__badge--op badge badge-secondary"
+                className="filter-summary-box__badge filter-summarybox__badge--op badge bg-secondary"
               >
                 is
               </span>
               <span
-                className="filter-summary-box__badge badge badge-secondary"
+                className="filter-summary-box__badge badge bg-secondary"
               >
                 1
               </span>
@@ -25090,17 +24850,17 @@ exports[`Storyshots Search page Default 1`] = `
               className="filter-summary-box__badge-group"
             >
               <span
-                className="filter-summary-box__badge badge badge-secondary"
+                className="filter-summary-box__badge badge bg-secondary"
               >
                 Experiment.Schema
               </span>
               <span
-                className="filter-summary-box__badge filter-summarybox__badge--op badge badge-secondary"
+                className="filter-summary-box__badge filter-summarybox__badge--op badge bg-secondary"
               >
                 is
               </span>
               <span
-                className="filter-summary-box__badge badge badge-secondary"
+                className="filter-summary-box__badge badge bg-secondary"
               >
                 2
               </span>
@@ -25114,17 +24874,17 @@ exports[`Storyshots Search page Default 1`] = `
               className="filter-summary-box__badge-group"
             >
               <span
-                className="filter-summary-box__badge badge badge-secondary"
+                className="filter-summary-box__badge badge bg-secondary"
               >
                 Dataset.Schema
               </span>
               <span
-                className="filter-summary-box__badge filter-summarybox__badge--op badge badge-secondary"
+                className="filter-summary-box__badge filter-summarybox__badge--op badge bg-secondary"
               >
                 is
               </span>
               <span
-                className="filter-summary-box__badge badge badge-secondary"
+                className="filter-summary-box__badge badge bg-secondary"
               >
                 1
               </span>
@@ -25138,22 +24898,22 @@ exports[`Storyshots Search page Default 1`] = `
               className="filter-summary-box__badge-group"
             >
               <span
-                className="filter-summary-box__badge badge badge-secondary"
+                className="filter-summary-box__badge badge bg-secondary"
               >
                 Datafile.Schema
               </span>
               <span
-                className="filter-summary-box__badge filter-summarybox__badge--op badge badge-secondary"
+                className="filter-summary-box__badge filter-summarybox__badge--op badge bg-secondary"
               >
                 is
               </span>
               <span
-                className="filter-summary-box__badge badge badge-secondary"
+                className="filter-summary-box__badge badge bg-secondary"
               >
                 1
               </span>
               <span
-                className="filter-summary-box__badge badge badge-secondary"
+                className="filter-summary-box__badge badge bg-secondary"
               >
                 2
               </span>
@@ -25183,11 +24943,13 @@ exports[`Storyshots Search page Default 1`] = `
           >
             <a
               className="nav-link"
-              data-rb-event-key="project"
+              data-rr-ui-event-key="project"
               href="#"
               onClick={[Function]}
               onKeyDown={[Function]}
+              onSelect={[Function]}
               role="button"
+              tabIndex={0}
             >
               <span
                 className="text-capitalize"
@@ -25213,11 +24975,13 @@ exports[`Storyshots Search page Default 1`] = `
           >
             <a
               className="nav-link active"
-              data-rb-event-key="experiment"
+              data-rr-ui-event-key="experiment"
               href="#"
               onClick={[Function]}
               onKeyDown={[Function]}
+              onSelect={[Function]}
               role="button"
+              tabIndex={0}
             >
               <span
                 className="text-capitalize"
@@ -25243,11 +25007,13 @@ exports[`Storyshots Search page Default 1`] = `
           >
             <a
               className="nav-link"
-              data-rb-event-key="dataset"
+              data-rr-ui-event-key="dataset"
               href="#"
               onClick={[Function]}
               onKeyDown={[Function]}
+              onSelect={[Function]}
               role="button"
+              tabIndex={0}
             >
               <span
                 className="text-capitalize"
@@ -25273,11 +25039,13 @@ exports[`Storyshots Search page Default 1`] = `
           >
             <a
               className="nav-link"
-              data-rb-event-key="datafile"
+              data-rr-ui-event-key="datafile"
               href="#"
               onClick={[Function]}
               onKeyDown={[Function]}
+              onSelect={[Function]}
               role="button"
+              tabIndex={0}
             >
               <span
                 className="text-capitalize"
@@ -25322,7 +25090,6 @@ exports[`Storyshots Search page Default 1`] = `
           >
             <button
               aria-expanded={false}
-              aria-haspopup={true}
               className="dropdown-toggle btn btn-primary"
               disabled={false}
               onClick={[Function]}
@@ -25544,7 +25311,6 @@ exports[`Storyshots Search page Default 1`] = `
               >
                 <button
                   aria-expanded={false}
-                  aria-haspopup={true}
                   className="dropdown-toggle btn btn-outline-primary"
                   disabled={false}
                   id="experiment-pagesize--dropdown"
@@ -25574,6 +25340,7 @@ exports[`Storyshots Search page Default 1`] = `
                   onClick={[Function]}
                   onKeyDown={[Function]}
                   role="button"
+                  tabIndex={0}
                 >
                   <span
                     aria-hidden="true"
@@ -25581,7 +25348,7 @@ exports[`Storyshots Search page Default 1`] = `
                     «
                   </span>
                   <span
-                    className="sr-only"
+                    className="visually-hidden"
                   >
                     First
                   </span>
@@ -25596,6 +25363,7 @@ exports[`Storyshots Search page Default 1`] = `
                   onClick={[Function]}
                   onKeyDown={[Function]}
                   role="button"
+                  tabIndex={0}
                 >
                   <span
                     aria-hidden="true"
@@ -25603,7 +25371,7 @@ exports[`Storyshots Search page Default 1`] = `
                     ‹
                   </span>
                   <span
-                    className="sr-only"
+                    className="visually-hidden"
                   >
                     Previous
                   </span>
@@ -25614,12 +25382,11 @@ exports[`Storyshots Search page Default 1`] = `
               >
                 <span
                   className="page-link"
-                  disabled={false}
                   onClick={[Function]}
                 >
                   1
                   <span
-                    className="sr-only"
+                    className="visually-hidden"
                   >
                     (current)
                   </span>
@@ -25634,6 +25401,7 @@ exports[`Storyshots Search page Default 1`] = `
                   onClick={[Function]}
                   onKeyDown={[Function]}
                   role="button"
+                  tabIndex={0}
                 >
                   <span
                     aria-hidden="true"
@@ -25641,7 +25409,7 @@ exports[`Storyshots Search page Default 1`] = `
                     ›
                   </span>
                   <span
-                    className="sr-only"
+                    className="visually-hidden"
                   >
                     Next
                   </span>
@@ -25656,6 +25424,7 @@ exports[`Storyshots Search page Default 1`] = `
                   onClick={[Function]}
                   onKeyDown={[Function]}
                   role="button"
+                  tabIndex={0}
                 >
                   <span
                     aria-hidden="true"
@@ -25663,7 +25432,7 @@ exports[`Storyshots Search page Default 1`] = `
                     »
                   </span>
                   <span
-                    className="sr-only"
+                    className="visually-hidden"
                   >
                     Last
                   </span>
@@ -25699,121 +25468,144 @@ exports[`Storyshots Search page Error 1`] = `
         className="filter-sidebar"
       >
         <section>
-          <nav
+          <ul
             className="nav nav-tabs"
+            id="filters-section"
             onKeyDown={[Function]}
             role="tablist"
           >
-            <a
-              aria-controls="filters-section-tabpane-project"
-              aria-selected={true}
-              className="nav-item nav-link active"
-              data-rb-event-key="project"
-              href="#"
-              id="filters-section-tab-project"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="tab"
+            <li
+              className="nav-item"
+              role="presentation"
             >
-              <div
-                className="tab-sticker"
-                style={
-                  {
-                    "backgroundColor": "#f7db8d",
-                  }
-                }
+              <button
+                aria-controls="filters-section-tabpane-project"
+                aria-selected={true}
+                className="nav-link active"
+                data-rr-ui-event-key="project"
+                disabled={false}
+                id="filters-section-tab-project"
+                onClick={[Function]}
+                role="tab"
+                type="button"
               >
                 <div
-                  className="tab-stick--content"
+                  className="tab-sticker"
+                  style={
+                    {
+                      "backgroundColor": "#f7db8d",
+                    }
+                  }
                 >
-                  P
+                  <div
+                    className="tab-stick--content"
+                  >
+                    P
+                  </div>
                 </div>
-              </div>
-            </a>
-            <a
-              aria-controls="filters-section-tabpane-experiment"
-              aria-selected={false}
-              className="nav-item nav-link"
-              data-rb-event-key="experiment"
-              href="#"
-              id="filters-section-tab-experiment"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="tab"
+              </button>
+            </li>
+            <li
+              className="nav-item"
+              role="presentation"
             >
-              <div
-                className="tab-sticker"
-                style={
-                  {
-                    "backgroundColor": "#abe2ff",
-                  }
-                }
+              <button
+                aria-controls="filters-section-tabpane-experiment"
+                aria-selected={false}
+                className="nav-link"
+                data-rr-ui-event-key="experiment"
+                disabled={false}
+                id="filters-section-tab-experiment"
+                onClick={[Function]}
+                role="tab"
+                tabIndex={-1}
+                type="button"
               >
                 <div
-                  className="tab-stick--content"
+                  className="tab-sticker"
+                  style={
+                    {
+                      "backgroundColor": "#abe2ff",
+                    }
+                  }
                 >
-                  E
+                  <div
+                    className="tab-stick--content"
+                  >
+                    E
+                  </div>
                 </div>
-              </div>
-            </a>
-            <a
-              aria-controls="filters-section-tabpane-dataset"
-              aria-selected={false}
-              className="nav-item nav-link"
-              data-rb-event-key="dataset"
-              href="#"
-              id="filters-section-tab-dataset"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="tab"
+              </button>
+            </li>
+            <li
+              className="nav-item"
+              role="presentation"
             >
-              <div
-                className="tab-sticker"
-                style={
-                  {
-                    "backgroundColor": "#ffcce8",
-                  }
-                }
+              <button
+                aria-controls="filters-section-tabpane-dataset"
+                aria-selected={false}
+                className="nav-link"
+                data-rr-ui-event-key="dataset"
+                disabled={false}
+                id="filters-section-tab-dataset"
+                onClick={[Function]}
+                role="tab"
+                tabIndex={-1}
+                type="button"
               >
                 <div
-                  className="tab-stick--content"
+                  className="tab-sticker"
+                  style={
+                    {
+                      "backgroundColor": "#ffcce8",
+                    }
+                  }
                 >
-                  DS
+                  <div
+                    className="tab-stick--content"
+                  >
+                    DS
+                  </div>
                 </div>
-              </div>
-            </a>
-            <a
-              aria-controls="filters-section-tabpane-datafile"
-              aria-selected={false}
-              className="nav-item nav-link"
-              data-rb-event-key="datafile"
-              href="#"
-              id="filters-section-tab-datafile"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="tab"
+              </button>
+            </li>
+            <li
+              className="nav-item"
+              role="presentation"
             >
-              <div
-                className="tab-sticker"
-                style={
-                  {
-                    "backgroundColor": "#70ffae",
-                  }
-                }
+              <button
+                aria-controls="filters-section-tabpane-datafile"
+                aria-selected={false}
+                className="nav-link"
+                data-rr-ui-event-key="datafile"
+                disabled={false}
+                id="filters-section-tab-datafile"
+                onClick={[Function]}
+                role="tab"
+                tabIndex={-1}
+                type="button"
               >
                 <div
-                  className="tab-stick--content"
+                  className="tab-sticker"
+                  style={
+                    {
+                      "backgroundColor": "#70ffae",
+                    }
+                  }
                 >
-                  DF
+                  <div
+                    className="tab-stick--content"
+                  >
+                    DF
+                  </div>
                 </div>
-              </div>
-            </a>
-          </nav>
+              </button>
+            </li>
+          </ul>
           <div
             className="tab-content"
           >
             <div
-              aria-hidden={false}
               aria-labelledby="filters-section-tab-project"
               className="fade tab-pane active show"
               id="filters-section-tabpane-project"
@@ -25860,18 +25652,14 @@ exports[`Storyshots Search page Error 1`] = `
                       placeholder=""
                       value=""
                     />
-                    <div
-                      className="input-group-append"
+                    <button
+                      aria-label="Filter results"
+                      className="btn btn-outline-secondary"
+                      disabled={false}
+                      type="submit"
                     >
-                      <button
-                        aria-label="Filter results"
-                        className="btn btn-outline-secondary"
-                        disabled={false}
-                        type="submit"
-                      >
-                        Filter
-                      </button>
-                    </div>
+                      Filter
+                    </button>
                   </div>
                 </form>
               </section>
@@ -25887,7 +25675,7 @@ exports[`Storyshots Search page Error 1`] = `
                   onSubmit={[Function]}
                 >
                   <div
-                    className="date-range-filter__field form-group"
+                    className="date-range-filter__field"
                   >
                     <label
                       className="form-label"
@@ -26379,7 +26167,7 @@ exports[`Storyshots Search page Error 1`] = `
                     </div>
                   </div>
                   <div
-                    className="date-range-filter__field form-group"
+                    className="date-range-filter__field"
                   >
                     <label
                       className="form-label"
@@ -26872,7 +26660,7 @@ exports[`Storyshots Search page Error 1`] = `
                   </div>
                   <button
                     aria-label="Filter results"
-                    className="date-range-filter__button btn btn-outline-secondary"
+                    className="date-range-filter__button mt-3 btn btn-outline-secondary"
                     disabled={false}
                     type="submit"
                   >
@@ -26901,18 +26689,14 @@ exports[`Storyshots Search page Error 1`] = `
                       placeholder=""
                       value=""
                     />
-                    <div
-                      className="input-group-append"
+                    <button
+                      aria-label="Filter results"
+                      className="btn btn-outline-secondary"
+                      disabled={false}
+                      type="submit"
                     >
-                      <button
-                        aria-label="Filter results"
-                        className="btn btn-outline-secondary"
-                        disabled={false}
-                        type="submit"
-                      >
-                        Filter
-                      </button>
-                    </div>
+                      Filter
+                    </button>
                   </div>
                 </form>
               </section>
@@ -26923,9 +26707,7 @@ exports[`Storyshots Search page Error 1`] = `
                 >
                   Schemas
                 </h3>
-                <div
-                  className="form-group"
-                >
+                <div>
                   <div
                     className="form-check"
                   >
@@ -26969,26 +26751,27 @@ exports[`Storyshots Search page Error 1`] = `
                   className="accordion"
                 >
                   <div
-                    className="card"
+                    className="accordion-item"
                   >
-                    <div
-                      className="card-header"
+                    <h2
+                      className="accordion-header"
                     >
                       <button
-                        className="btn btn-link"
+                        aria-expanded={true}
+                        className="accordion-button"
                         onClick={[Function]}
                         type="button"
                       >
                         Raw data
                          filters
                       </button>
-                    </div>
+                    </h2>
                     <div
                       aria-expanded={null}
-                      className="collapse"
+                      className="accordion-collapse collapse show"
                     >
                       <div
-                        className="card-body"
+                        className="accordion-body"
                       >
                         <section
                           className="single-schema-list__filter"
@@ -27012,18 +26795,14 @@ exports[`Storyshots Search page Error 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -27050,18 +26829,14 @@ exports[`Storyshots Search page Error 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -27088,18 +26863,14 @@ exports[`Storyshots Search page Error 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -27111,7 +26882,6 @@ exports[`Storyshots Search page Error 1`] = `
               </section>
             </div>
             <div
-              aria-hidden={true}
               aria-labelledby="filters-section-tab-experiment"
               className="fade tab-pane"
               id="filters-section-tabpane-experiment"
@@ -27158,18 +26928,14 @@ exports[`Storyshots Search page Error 1`] = `
                       placeholder=""
                       value=""
                     />
-                    <div
-                      className="input-group-append"
+                    <button
+                      aria-label="Filter results"
+                      className="btn btn-outline-secondary"
+                      disabled={false}
+                      type="submit"
                     >
-                      <button
-                        aria-label="Filter results"
-                        className="btn btn-outline-secondary"
-                        disabled={false}
-                        type="submit"
-                      >
-                        Filter
-                      </button>
-                    </div>
+                      Filter
+                    </button>
                   </div>
                 </form>
               </section>
@@ -27185,7 +26951,7 @@ exports[`Storyshots Search page Error 1`] = `
                   onSubmit={[Function]}
                 >
                   <div
-                    className="date-range-filter__field form-group"
+                    className="date-range-filter__field"
                   >
                     <label
                       className="form-label"
@@ -27677,7 +27443,7 @@ exports[`Storyshots Search page Error 1`] = `
                     </div>
                   </div>
                   <div
-                    className="date-range-filter__field form-group"
+                    className="date-range-filter__field"
                   >
                     <label
                       className="form-label"
@@ -28170,7 +27936,7 @@ exports[`Storyshots Search page Error 1`] = `
                   </div>
                   <button
                     aria-label="Filter results"
-                    className="date-range-filter__button btn btn-outline-secondary"
+                    className="date-range-filter__button mt-3 btn btn-outline-secondary"
                     disabled={false}
                     type="submit"
                   >
@@ -28199,18 +27965,14 @@ exports[`Storyshots Search page Error 1`] = `
                       placeholder=""
                       value=""
                     />
-                    <div
-                      className="input-group-append"
+                    <button
+                      aria-label="Filter results"
+                      className="btn btn-outline-secondary"
+                      disabled={false}
+                      type="submit"
                     >
-                      <button
-                        aria-label="Filter results"
-                        className="btn btn-outline-secondary"
-                        disabled={false}
-                        type="submit"
-                      >
-                        Filter
-                      </button>
-                    </div>
+                      Filter
+                    </button>
                   </div>
                 </form>
               </section>
@@ -28221,9 +27983,7 @@ exports[`Storyshots Search page Error 1`] = `
                 >
                   Schemas
                 </h3>
-                <div
-                  className="form-group"
-                >
+                <div>
                   <div
                     className="form-check"
                   >
@@ -28267,26 +28027,27 @@ exports[`Storyshots Search page Error 1`] = `
                   className="accordion"
                 >
                   <div
-                    className="card"
+                    className="accordion-item"
                   >
-                    <div
-                      className="card-header"
+                    <h2
+                      className="accordion-header"
                     >
                       <button
-                        className="btn btn-link"
+                        aria-expanded={true}
+                        className="accordion-button"
                         onClick={[Function]}
                         type="button"
                       >
                         Biopipeline Output
                          filters
                       </button>
-                    </div>
+                    </h2>
                     <div
                       aria-expanded={null}
-                      className="collapse"
+                      className="accordion-collapse collapse show"
                     >
                       <div
-                        className="card-body"
+                        className="accordion-body"
                       >
                         <section
                           className="single-schema-list__filter"
@@ -28310,18 +28071,14 @@ exports[`Storyshots Search page Error 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -28348,18 +28105,14 @@ exports[`Storyshots Search page Error 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -28386,18 +28139,14 @@ exports[`Storyshots Search page Error 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -28409,7 +28158,6 @@ exports[`Storyshots Search page Error 1`] = `
               </section>
             </div>
             <div
-              aria-hidden={true}
               aria-labelledby="filters-section-tab-dataset"
               className="fade tab-pane"
               id="filters-section-tabpane-dataset"
@@ -28456,18 +28204,14 @@ exports[`Storyshots Search page Error 1`] = `
                       placeholder=""
                       value=""
                     />
-                    <div
-                      className="input-group-append"
+                    <button
+                      aria-label="Filter results"
+                      className="btn btn-outline-secondary"
+                      disabled={false}
+                      type="submit"
                     >
-                      <button
-                        aria-label="Filter results"
-                        className="btn btn-outline-secondary"
-                        disabled={false}
-                        type="submit"
-                      >
-                        Filter
-                      </button>
-                    </div>
+                      Filter
+                    </button>
                   </div>
                 </form>
               </section>
@@ -28483,7 +28227,7 @@ exports[`Storyshots Search page Error 1`] = `
                   onSubmit={[Function]}
                 >
                   <div
-                    className="date-range-filter__field form-group"
+                    className="date-range-filter__field"
                   >
                     <label
                       className="form-label"
@@ -28975,7 +28719,7 @@ exports[`Storyshots Search page Error 1`] = `
                     </div>
                   </div>
                   <div
-                    className="date-range-filter__field form-group"
+                    className="date-range-filter__field"
                   >
                     <label
                       className="form-label"
@@ -29468,7 +29212,7 @@ exports[`Storyshots Search page Error 1`] = `
                   </div>
                   <button
                     aria-label="Filter results"
-                    className="date-range-filter__button btn btn-outline-secondary"
+                    className="date-range-filter__button mt-3 btn btn-outline-secondary"
                     disabled={false}
                     type="submit"
                   >
@@ -29497,18 +29241,14 @@ exports[`Storyshots Search page Error 1`] = `
                       placeholder=""
                       value=""
                     />
-                    <div
-                      className="input-group-append"
+                    <button
+                      aria-label="Filter results"
+                      className="btn btn-outline-secondary"
+                      disabled={false}
+                      type="submit"
                     >
-                      <button
-                        aria-label="Filter results"
-                        className="btn btn-outline-secondary"
-                        disabled={false}
-                        type="submit"
-                      >
-                        Filter
-                      </button>
-                    </div>
+                      Filter
+                    </button>
                   </div>
                 </form>
               </section>
@@ -29519,9 +29259,7 @@ exports[`Storyshots Search page Error 1`] = `
                 >
                   Schemas
                 </h3>
-                <div
-                  className="form-group"
-                >
+                <div>
                   <div
                     className="form-check"
                   >
@@ -29565,26 +29303,27 @@ exports[`Storyshots Search page Error 1`] = `
                   className="accordion"
                 >
                   <div
-                    className="card"
+                    className="accordion-item"
                   >
-                    <div
-                      className="card-header"
+                    <h2
+                      className="accordion-header"
                     >
                       <button
-                        className="btn btn-link"
+                        aria-expanded={true}
+                        className="accordion-button"
                         onClick={[Function]}
                         type="button"
                       >
                         Raw data
                          filters
                       </button>
-                    </div>
+                    </h2>
                     <div
                       aria-expanded={null}
-                      className="collapse"
+                      className="accordion-collapse collapse show"
                     >
                       <div
-                        className="card-body"
+                        className="accordion-body"
                       >
                         <section
                           className="single-schema-list__filter"
@@ -29608,18 +29347,14 @@ exports[`Storyshots Search page Error 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -29646,18 +29381,14 @@ exports[`Storyshots Search page Error 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -29684,18 +29415,14 @@ exports[`Storyshots Search page Error 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -29707,7 +29434,6 @@ exports[`Storyshots Search page Error 1`] = `
               </section>
             </div>
             <div
-              aria-hidden={true}
               aria-labelledby="filters-section-tab-datafile"
               className="fade tab-pane"
               id="filters-section-tabpane-datafile"
@@ -29754,18 +29480,14 @@ exports[`Storyshots Search page Error 1`] = `
                       placeholder=""
                       value=""
                     />
-                    <div
-                      className="input-group-append"
+                    <button
+                      aria-label="Filter results"
+                      className="btn btn-outline-secondary"
+                      disabled={false}
+                      type="submit"
                     >
-                      <button
-                        aria-label="Filter results"
-                        className="btn btn-outline-secondary"
-                        disabled={false}
-                        type="submit"
-                      >
-                        Filter
-                      </button>
-                    </div>
+                      Filter
+                    </button>
                   </div>
                 </form>
               </section>
@@ -29781,7 +29503,7 @@ exports[`Storyshots Search page Error 1`] = `
                   onSubmit={[Function]}
                 >
                   <div
-                    className="date-range-filter__field form-group"
+                    className="date-range-filter__field"
                   >
                     <label
                       className="form-label"
@@ -30273,7 +29995,7 @@ exports[`Storyshots Search page Error 1`] = `
                     </div>
                   </div>
                   <div
-                    className="date-range-filter__field form-group"
+                    className="date-range-filter__field"
                   >
                     <label
                       className="form-label"
@@ -30766,7 +30488,7 @@ exports[`Storyshots Search page Error 1`] = `
                   </div>
                   <button
                     aria-label="Filter results"
-                    className="date-range-filter__button btn btn-outline-secondary"
+                    className="date-range-filter__button mt-3 btn btn-outline-secondary"
                     disabled={false}
                     type="submit"
                   >
@@ -30795,18 +30517,14 @@ exports[`Storyshots Search page Error 1`] = `
                       placeholder=""
                       value=""
                     />
-                    <div
-                      className="input-group-append"
+                    <button
+                      aria-label="Filter results"
+                      className="btn btn-outline-secondary"
+                      disabled={false}
+                      type="submit"
                     >
-                      <button
-                        aria-label="Filter results"
-                        className="btn btn-outline-secondary"
-                        disabled={false}
-                        type="submit"
-                      >
-                        Filter
-                      </button>
-                    </div>
+                      Filter
+                    </button>
                   </div>
                 </form>
               </section>
@@ -30817,9 +30535,7 @@ exports[`Storyshots Search page Error 1`] = `
                 >
                   Schemas
                 </h3>
-                <div
-                  className="form-group"
-                >
+                <div>
                   <div
                     className="form-check"
                   >
@@ -30863,26 +30579,27 @@ exports[`Storyshots Search page Error 1`] = `
                   className="accordion"
                 >
                   <div
-                    className="card"
+                    className="accordion-item"
                   >
-                    <div
-                      className="card-header"
+                    <h2
+                      className="accordion-header"
                     >
                       <button
-                        className="btn btn-link"
+                        aria-expanded={true}
+                        className="accordion-button"
                         onClick={[Function]}
                         type="button"
                       >
                         Raw data
                          filters
                       </button>
-                    </div>
+                    </h2>
                     <div
                       aria-expanded={null}
-                      className="collapse"
+                      className="accordion-collapse collapse show"
                     >
                       <div
-                        className="card-body"
+                        className="accordion-body"
                       >
                         <section
                           className="single-schema-list__filter"
@@ -30906,18 +30623,14 @@ exports[`Storyshots Search page Error 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -30944,18 +30657,14 @@ exports[`Storyshots Search page Error 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -30982,18 +30691,14 @@ exports[`Storyshots Search page Error 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -31002,26 +30707,27 @@ exports[`Storyshots Search page Error 1`] = `
                     </div>
                   </div>
                   <div
-                    className="card"
+                    className="accordion-item"
                   >
-                    <div
-                      className="card-header"
+                    <h2
+                      className="accordion-header"
                     >
                       <button
-                        className="btn btn-link"
+                        aria-expanded={true}
+                        className="accordion-button"
                         onClick={[Function]}
                         type="button"
                       >
                         Biopipeline Output
                          filters
                       </button>
-                    </div>
+                    </h2>
                     <div
                       aria-expanded={null}
-                      className="collapse"
+                      className="accordion-collapse collapse show"
                     >
                       <div
-                        className="card-body"
+                        className="accordion-body"
                       >
                         <section
                           className="single-schema-list__filter"
@@ -31045,18 +30751,14 @@ exports[`Storyshots Search page Error 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -31083,18 +30785,14 @@ exports[`Storyshots Search page Error 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -31121,18 +30819,14 @@ exports[`Storyshots Search page Error 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -31167,17 +30861,17 @@ exports[`Storyshots Search page Error 1`] = `
               className="filter-summary-box__badge-group"
             >
               <span
-                className="filter-summary-box__badge badge badge-secondary"
+                className="filter-summary-box__badge badge bg-secondary"
               >
                 Project.Schema
               </span>
               <span
-                className="filter-summary-box__badge filter-summarybox__badge--op badge badge-secondary"
+                className="filter-summary-box__badge filter-summarybox__badge--op badge bg-secondary"
               >
                 is
               </span>
               <span
-                className="filter-summary-box__badge badge badge-secondary"
+                className="filter-summary-box__badge badge bg-secondary"
               >
                 1
               </span>
@@ -31191,17 +30885,17 @@ exports[`Storyshots Search page Error 1`] = `
               className="filter-summary-box__badge-group"
             >
               <span
-                className="filter-summary-box__badge badge badge-secondary"
+                className="filter-summary-box__badge badge bg-secondary"
               >
                 Experiment.Schema
               </span>
               <span
-                className="filter-summary-box__badge filter-summarybox__badge--op badge badge-secondary"
+                className="filter-summary-box__badge filter-summarybox__badge--op badge bg-secondary"
               >
                 is
               </span>
               <span
-                className="filter-summary-box__badge badge badge-secondary"
+                className="filter-summary-box__badge badge bg-secondary"
               >
                 2
               </span>
@@ -31215,17 +30909,17 @@ exports[`Storyshots Search page Error 1`] = `
               className="filter-summary-box__badge-group"
             >
               <span
-                className="filter-summary-box__badge badge badge-secondary"
+                className="filter-summary-box__badge badge bg-secondary"
               >
                 Dataset.Schema
               </span>
               <span
-                className="filter-summary-box__badge filter-summarybox__badge--op badge badge-secondary"
+                className="filter-summary-box__badge filter-summarybox__badge--op badge bg-secondary"
               >
                 is
               </span>
               <span
-                className="filter-summary-box__badge badge badge-secondary"
+                className="filter-summary-box__badge badge bg-secondary"
               >
                 1
               </span>
@@ -31239,22 +30933,22 @@ exports[`Storyshots Search page Error 1`] = `
               className="filter-summary-box__badge-group"
             >
               <span
-                className="filter-summary-box__badge badge badge-secondary"
+                className="filter-summary-box__badge badge bg-secondary"
               >
                 Datafile.Schema
               </span>
               <span
-                className="filter-summary-box__badge filter-summarybox__badge--op badge badge-secondary"
+                className="filter-summary-box__badge filter-summarybox__badge--op badge bg-secondary"
               >
                 is
               </span>
               <span
-                className="filter-summary-box__badge badge badge-secondary"
+                className="filter-summary-box__badge badge bg-secondary"
               >
                 1
               </span>
               <span
-                className="filter-summary-box__badge badge badge-secondary"
+                className="filter-summary-box__badge badge bg-secondary"
               >
                 2
               </span>
@@ -31284,11 +30978,13 @@ exports[`Storyshots Search page Error 1`] = `
           >
             <a
               className="nav-link"
-              data-rb-event-key="project"
+              data-rr-ui-event-key="project"
               href="#"
               onClick={[Function]}
               onKeyDown={[Function]}
+              onSelect={[Function]}
               role="button"
+              tabIndex={0}
             >
               <span
                 className="text-capitalize"
@@ -31304,11 +31000,13 @@ exports[`Storyshots Search page Error 1`] = `
           >
             <a
               className="nav-link active"
-              data-rb-event-key="experiment"
+              data-rr-ui-event-key="experiment"
               href="#"
               onClick={[Function]}
               onKeyDown={[Function]}
+              onSelect={[Function]}
               role="button"
+              tabIndex={0}
             >
               <span
                 className="text-capitalize"
@@ -31324,11 +31022,13 @@ exports[`Storyshots Search page Error 1`] = `
           >
             <a
               className="nav-link"
-              data-rb-event-key="dataset"
+              data-rr-ui-event-key="dataset"
               href="#"
               onClick={[Function]}
               onKeyDown={[Function]}
+              onSelect={[Function]}
               role="button"
+              tabIndex={0}
             >
               <span
                 className="text-capitalize"
@@ -31344,11 +31044,13 @@ exports[`Storyshots Search page Error 1`] = `
           >
             <a
               className="nav-link"
-              data-rb-event-key="datafile"
+              data-rr-ui-event-key="datafile"
               href="#"
               onClick={[Function]}
               onKeyDown={[Function]}
+              onSelect={[Function]}
               role="button"
+              tabIndex={0}
             >
               <span
                 className="text-capitalize"
@@ -31432,121 +31134,144 @@ exports[`Storyshots Search page Loading 1`] = `
         className="filter-sidebar"
       >
         <section>
-          <nav
+          <ul
             className="nav nav-tabs"
+            id="filters-section"
             onKeyDown={[Function]}
             role="tablist"
           >
-            <a
-              aria-controls="filters-section-tabpane-project"
-              aria-selected={true}
-              className="nav-item nav-link active"
-              data-rb-event-key="project"
-              href="#"
-              id="filters-section-tab-project"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="tab"
+            <li
+              className="nav-item"
+              role="presentation"
             >
-              <div
-                className="tab-sticker"
-                style={
-                  {
-                    "backgroundColor": "#f7db8d",
-                  }
-                }
+              <button
+                aria-controls="filters-section-tabpane-project"
+                aria-selected={true}
+                className="nav-link active"
+                data-rr-ui-event-key="project"
+                disabled={false}
+                id="filters-section-tab-project"
+                onClick={[Function]}
+                role="tab"
+                type="button"
               >
                 <div
-                  className="tab-stick--content"
+                  className="tab-sticker"
+                  style={
+                    {
+                      "backgroundColor": "#f7db8d",
+                    }
+                  }
                 >
-                  P
+                  <div
+                    className="tab-stick--content"
+                  >
+                    P
+                  </div>
                 </div>
-              </div>
-            </a>
-            <a
-              aria-controls="filters-section-tabpane-experiment"
-              aria-selected={false}
-              className="nav-item nav-link"
-              data-rb-event-key="experiment"
-              href="#"
-              id="filters-section-tab-experiment"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="tab"
+              </button>
+            </li>
+            <li
+              className="nav-item"
+              role="presentation"
             >
-              <div
-                className="tab-sticker"
-                style={
-                  {
-                    "backgroundColor": "#abe2ff",
-                  }
-                }
+              <button
+                aria-controls="filters-section-tabpane-experiment"
+                aria-selected={false}
+                className="nav-link"
+                data-rr-ui-event-key="experiment"
+                disabled={false}
+                id="filters-section-tab-experiment"
+                onClick={[Function]}
+                role="tab"
+                tabIndex={-1}
+                type="button"
               >
                 <div
-                  className="tab-stick--content"
+                  className="tab-sticker"
+                  style={
+                    {
+                      "backgroundColor": "#abe2ff",
+                    }
+                  }
                 >
-                  E
+                  <div
+                    className="tab-stick--content"
+                  >
+                    E
+                  </div>
                 </div>
-              </div>
-            </a>
-            <a
-              aria-controls="filters-section-tabpane-dataset"
-              aria-selected={false}
-              className="nav-item nav-link"
-              data-rb-event-key="dataset"
-              href="#"
-              id="filters-section-tab-dataset"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="tab"
+              </button>
+            </li>
+            <li
+              className="nav-item"
+              role="presentation"
             >
-              <div
-                className="tab-sticker"
-                style={
-                  {
-                    "backgroundColor": "#ffcce8",
-                  }
-                }
+              <button
+                aria-controls="filters-section-tabpane-dataset"
+                aria-selected={false}
+                className="nav-link"
+                data-rr-ui-event-key="dataset"
+                disabled={false}
+                id="filters-section-tab-dataset"
+                onClick={[Function]}
+                role="tab"
+                tabIndex={-1}
+                type="button"
               >
                 <div
-                  className="tab-stick--content"
+                  className="tab-sticker"
+                  style={
+                    {
+                      "backgroundColor": "#ffcce8",
+                    }
+                  }
                 >
-                  DS
+                  <div
+                    className="tab-stick--content"
+                  >
+                    DS
+                  </div>
                 </div>
-              </div>
-            </a>
-            <a
-              aria-controls="filters-section-tabpane-datafile"
-              aria-selected={false}
-              className="nav-item nav-link"
-              data-rb-event-key="datafile"
-              href="#"
-              id="filters-section-tab-datafile"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="tab"
+              </button>
+            </li>
+            <li
+              className="nav-item"
+              role="presentation"
             >
-              <div
-                className="tab-sticker"
-                style={
-                  {
-                    "backgroundColor": "#70ffae",
-                  }
-                }
+              <button
+                aria-controls="filters-section-tabpane-datafile"
+                aria-selected={false}
+                className="nav-link"
+                data-rr-ui-event-key="datafile"
+                disabled={false}
+                id="filters-section-tab-datafile"
+                onClick={[Function]}
+                role="tab"
+                tabIndex={-1}
+                type="button"
               >
                 <div
-                  className="tab-stick--content"
+                  className="tab-sticker"
+                  style={
+                    {
+                      "backgroundColor": "#70ffae",
+                    }
+                  }
                 >
-                  DF
+                  <div
+                    className="tab-stick--content"
+                  >
+                    DF
+                  </div>
                 </div>
-              </div>
-            </a>
-          </nav>
+              </button>
+            </li>
+          </ul>
           <div
             className="tab-content"
           >
             <div
-              aria-hidden={false}
               aria-labelledby="filters-section-tab-project"
               className="fade tab-pane active show"
               id="filters-section-tabpane-project"
@@ -31593,18 +31318,14 @@ exports[`Storyshots Search page Loading 1`] = `
                       placeholder=""
                       value=""
                     />
-                    <div
-                      className="input-group-append"
+                    <button
+                      aria-label="Filter results"
+                      className="btn btn-outline-secondary"
+                      disabled={false}
+                      type="submit"
                     >
-                      <button
-                        aria-label="Filter results"
-                        className="btn btn-outline-secondary"
-                        disabled={false}
-                        type="submit"
-                      >
-                        Filter
-                      </button>
-                    </div>
+                      Filter
+                    </button>
                   </div>
                 </form>
               </section>
@@ -31620,7 +31341,7 @@ exports[`Storyshots Search page Loading 1`] = `
                   onSubmit={[Function]}
                 >
                   <div
-                    className="date-range-filter__field form-group"
+                    className="date-range-filter__field"
                   >
                     <label
                       className="form-label"
@@ -32112,7 +31833,7 @@ exports[`Storyshots Search page Loading 1`] = `
                     </div>
                   </div>
                   <div
-                    className="date-range-filter__field form-group"
+                    className="date-range-filter__field"
                   >
                     <label
                       className="form-label"
@@ -32605,7 +32326,7 @@ exports[`Storyshots Search page Loading 1`] = `
                   </div>
                   <button
                     aria-label="Filter results"
-                    className="date-range-filter__button btn btn-outline-secondary"
+                    className="date-range-filter__button mt-3 btn btn-outline-secondary"
                     disabled={false}
                     type="submit"
                   >
@@ -32634,18 +32355,14 @@ exports[`Storyshots Search page Loading 1`] = `
                       placeholder=""
                       value=""
                     />
-                    <div
-                      className="input-group-append"
+                    <button
+                      aria-label="Filter results"
+                      className="btn btn-outline-secondary"
+                      disabled={false}
+                      type="submit"
                     >
-                      <button
-                        aria-label="Filter results"
-                        className="btn btn-outline-secondary"
-                        disabled={false}
-                        type="submit"
-                      >
-                        Filter
-                      </button>
-                    </div>
+                      Filter
+                    </button>
                   </div>
                 </form>
               </section>
@@ -32656,9 +32373,7 @@ exports[`Storyshots Search page Loading 1`] = `
                 >
                   Schemas
                 </h3>
-                <div
-                  className="form-group"
-                >
+                <div>
                   <div
                     className="form-check"
                   >
@@ -32702,26 +32417,27 @@ exports[`Storyshots Search page Loading 1`] = `
                   className="accordion"
                 >
                   <div
-                    className="card"
+                    className="accordion-item"
                   >
-                    <div
-                      className="card-header"
+                    <h2
+                      className="accordion-header"
                     >
                       <button
-                        className="btn btn-link"
+                        aria-expanded={true}
+                        className="accordion-button"
                         onClick={[Function]}
                         type="button"
                       >
                         Raw data
                          filters
                       </button>
-                    </div>
+                    </h2>
                     <div
                       aria-expanded={null}
-                      className="collapse"
+                      className="accordion-collapse collapse show"
                     >
                       <div
-                        className="card-body"
+                        className="accordion-body"
                       >
                         <section
                           className="single-schema-list__filter"
@@ -32745,18 +32461,14 @@ exports[`Storyshots Search page Loading 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -32783,18 +32495,14 @@ exports[`Storyshots Search page Loading 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -32821,18 +32529,14 @@ exports[`Storyshots Search page Loading 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -32844,7 +32548,6 @@ exports[`Storyshots Search page Loading 1`] = `
               </section>
             </div>
             <div
-              aria-hidden={true}
               aria-labelledby="filters-section-tab-experiment"
               className="fade tab-pane"
               id="filters-section-tabpane-experiment"
@@ -32891,18 +32594,14 @@ exports[`Storyshots Search page Loading 1`] = `
                       placeholder=""
                       value=""
                     />
-                    <div
-                      className="input-group-append"
+                    <button
+                      aria-label="Filter results"
+                      className="btn btn-outline-secondary"
+                      disabled={false}
+                      type="submit"
                     >
-                      <button
-                        aria-label="Filter results"
-                        className="btn btn-outline-secondary"
-                        disabled={false}
-                        type="submit"
-                      >
-                        Filter
-                      </button>
-                    </div>
+                      Filter
+                    </button>
                   </div>
                 </form>
               </section>
@@ -32918,7 +32617,7 @@ exports[`Storyshots Search page Loading 1`] = `
                   onSubmit={[Function]}
                 >
                   <div
-                    className="date-range-filter__field form-group"
+                    className="date-range-filter__field"
                   >
                     <label
                       className="form-label"
@@ -33410,7 +33109,7 @@ exports[`Storyshots Search page Loading 1`] = `
                     </div>
                   </div>
                   <div
-                    className="date-range-filter__field form-group"
+                    className="date-range-filter__field"
                   >
                     <label
                       className="form-label"
@@ -33903,7 +33602,7 @@ exports[`Storyshots Search page Loading 1`] = `
                   </div>
                   <button
                     aria-label="Filter results"
-                    className="date-range-filter__button btn btn-outline-secondary"
+                    className="date-range-filter__button mt-3 btn btn-outline-secondary"
                     disabled={false}
                     type="submit"
                   >
@@ -33932,18 +33631,14 @@ exports[`Storyshots Search page Loading 1`] = `
                       placeholder=""
                       value=""
                     />
-                    <div
-                      className="input-group-append"
+                    <button
+                      aria-label="Filter results"
+                      className="btn btn-outline-secondary"
+                      disabled={false}
+                      type="submit"
                     >
-                      <button
-                        aria-label="Filter results"
-                        className="btn btn-outline-secondary"
-                        disabled={false}
-                        type="submit"
-                      >
-                        Filter
-                      </button>
-                    </div>
+                      Filter
+                    </button>
                   </div>
                 </form>
               </section>
@@ -33954,9 +33649,7 @@ exports[`Storyshots Search page Loading 1`] = `
                 >
                   Schemas
                 </h3>
-                <div
-                  className="form-group"
-                >
+                <div>
                   <div
                     className="form-check"
                   >
@@ -34000,26 +33693,27 @@ exports[`Storyshots Search page Loading 1`] = `
                   className="accordion"
                 >
                   <div
-                    className="card"
+                    className="accordion-item"
                   >
-                    <div
-                      className="card-header"
+                    <h2
+                      className="accordion-header"
                     >
                       <button
-                        className="btn btn-link"
+                        aria-expanded={true}
+                        className="accordion-button"
                         onClick={[Function]}
                         type="button"
                       >
                         Biopipeline Output
                          filters
                       </button>
-                    </div>
+                    </h2>
                     <div
                       aria-expanded={null}
-                      className="collapse"
+                      className="accordion-collapse collapse show"
                     >
                       <div
-                        className="card-body"
+                        className="accordion-body"
                       >
                         <section
                           className="single-schema-list__filter"
@@ -34043,18 +33737,14 @@ exports[`Storyshots Search page Loading 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -34081,18 +33771,14 @@ exports[`Storyshots Search page Loading 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -34119,18 +33805,14 @@ exports[`Storyshots Search page Loading 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -34142,7 +33824,6 @@ exports[`Storyshots Search page Loading 1`] = `
               </section>
             </div>
             <div
-              aria-hidden={true}
               aria-labelledby="filters-section-tab-dataset"
               className="fade tab-pane"
               id="filters-section-tabpane-dataset"
@@ -34189,18 +33870,14 @@ exports[`Storyshots Search page Loading 1`] = `
                       placeholder=""
                       value=""
                     />
-                    <div
-                      className="input-group-append"
+                    <button
+                      aria-label="Filter results"
+                      className="btn btn-outline-secondary"
+                      disabled={false}
+                      type="submit"
                     >
-                      <button
-                        aria-label="Filter results"
-                        className="btn btn-outline-secondary"
-                        disabled={false}
-                        type="submit"
-                      >
-                        Filter
-                      </button>
-                    </div>
+                      Filter
+                    </button>
                   </div>
                 </form>
               </section>
@@ -34216,7 +33893,7 @@ exports[`Storyshots Search page Loading 1`] = `
                   onSubmit={[Function]}
                 >
                   <div
-                    className="date-range-filter__field form-group"
+                    className="date-range-filter__field"
                   >
                     <label
                       className="form-label"
@@ -34708,7 +34385,7 @@ exports[`Storyshots Search page Loading 1`] = `
                     </div>
                   </div>
                   <div
-                    className="date-range-filter__field form-group"
+                    className="date-range-filter__field"
                   >
                     <label
                       className="form-label"
@@ -35201,7 +34878,7 @@ exports[`Storyshots Search page Loading 1`] = `
                   </div>
                   <button
                     aria-label="Filter results"
-                    className="date-range-filter__button btn btn-outline-secondary"
+                    className="date-range-filter__button mt-3 btn btn-outline-secondary"
                     disabled={false}
                     type="submit"
                   >
@@ -35230,18 +34907,14 @@ exports[`Storyshots Search page Loading 1`] = `
                       placeholder=""
                       value=""
                     />
-                    <div
-                      className="input-group-append"
+                    <button
+                      aria-label="Filter results"
+                      className="btn btn-outline-secondary"
+                      disabled={false}
+                      type="submit"
                     >
-                      <button
-                        aria-label="Filter results"
-                        className="btn btn-outline-secondary"
-                        disabled={false}
-                        type="submit"
-                      >
-                        Filter
-                      </button>
-                    </div>
+                      Filter
+                    </button>
                   </div>
                 </form>
               </section>
@@ -35252,9 +34925,7 @@ exports[`Storyshots Search page Loading 1`] = `
                 >
                   Schemas
                 </h3>
-                <div
-                  className="form-group"
-                >
+                <div>
                   <div
                     className="form-check"
                   >
@@ -35298,26 +34969,27 @@ exports[`Storyshots Search page Loading 1`] = `
                   className="accordion"
                 >
                   <div
-                    className="card"
+                    className="accordion-item"
                   >
-                    <div
-                      className="card-header"
+                    <h2
+                      className="accordion-header"
                     >
                       <button
-                        className="btn btn-link"
+                        aria-expanded={true}
+                        className="accordion-button"
                         onClick={[Function]}
                         type="button"
                       >
                         Raw data
                          filters
                       </button>
-                    </div>
+                    </h2>
                     <div
                       aria-expanded={null}
-                      className="collapse"
+                      className="accordion-collapse collapse show"
                     >
                       <div
-                        className="card-body"
+                        className="accordion-body"
                       >
                         <section
                           className="single-schema-list__filter"
@@ -35341,18 +35013,14 @@ exports[`Storyshots Search page Loading 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -35379,18 +35047,14 @@ exports[`Storyshots Search page Loading 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -35417,18 +35081,14 @@ exports[`Storyshots Search page Loading 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -35440,7 +35100,6 @@ exports[`Storyshots Search page Loading 1`] = `
               </section>
             </div>
             <div
-              aria-hidden={true}
               aria-labelledby="filters-section-tab-datafile"
               className="fade tab-pane"
               id="filters-section-tabpane-datafile"
@@ -35487,18 +35146,14 @@ exports[`Storyshots Search page Loading 1`] = `
                       placeholder=""
                       value=""
                     />
-                    <div
-                      className="input-group-append"
+                    <button
+                      aria-label="Filter results"
+                      className="btn btn-outline-secondary"
+                      disabled={false}
+                      type="submit"
                     >
-                      <button
-                        aria-label="Filter results"
-                        className="btn btn-outline-secondary"
-                        disabled={false}
-                        type="submit"
-                      >
-                        Filter
-                      </button>
-                    </div>
+                      Filter
+                    </button>
                   </div>
                 </form>
               </section>
@@ -35514,7 +35169,7 @@ exports[`Storyshots Search page Loading 1`] = `
                   onSubmit={[Function]}
                 >
                   <div
-                    className="date-range-filter__field form-group"
+                    className="date-range-filter__field"
                   >
                     <label
                       className="form-label"
@@ -36006,7 +35661,7 @@ exports[`Storyshots Search page Loading 1`] = `
                     </div>
                   </div>
                   <div
-                    className="date-range-filter__field form-group"
+                    className="date-range-filter__field"
                   >
                     <label
                       className="form-label"
@@ -36499,7 +36154,7 @@ exports[`Storyshots Search page Loading 1`] = `
                   </div>
                   <button
                     aria-label="Filter results"
-                    className="date-range-filter__button btn btn-outline-secondary"
+                    className="date-range-filter__button mt-3 btn btn-outline-secondary"
                     disabled={false}
                     type="submit"
                   >
@@ -36528,18 +36183,14 @@ exports[`Storyshots Search page Loading 1`] = `
                       placeholder=""
                       value=""
                     />
-                    <div
-                      className="input-group-append"
+                    <button
+                      aria-label="Filter results"
+                      className="btn btn-outline-secondary"
+                      disabled={false}
+                      type="submit"
                     >
-                      <button
-                        aria-label="Filter results"
-                        className="btn btn-outline-secondary"
-                        disabled={false}
-                        type="submit"
-                      >
-                        Filter
-                      </button>
-                    </div>
+                      Filter
+                    </button>
                   </div>
                 </form>
               </section>
@@ -36550,9 +36201,7 @@ exports[`Storyshots Search page Loading 1`] = `
                 >
                   Schemas
                 </h3>
-                <div
-                  className="form-group"
-                >
+                <div>
                   <div
                     className="form-check"
                   >
@@ -36596,26 +36245,27 @@ exports[`Storyshots Search page Loading 1`] = `
                   className="accordion"
                 >
                   <div
-                    className="card"
+                    className="accordion-item"
                   >
-                    <div
-                      className="card-header"
+                    <h2
+                      className="accordion-header"
                     >
                       <button
-                        className="btn btn-link"
+                        aria-expanded={true}
+                        className="accordion-button"
                         onClick={[Function]}
                         type="button"
                       >
                         Raw data
                          filters
                       </button>
-                    </div>
+                    </h2>
                     <div
                       aria-expanded={null}
-                      className="collapse"
+                      className="accordion-collapse collapse show"
                     >
                       <div
-                        className="card-body"
+                        className="accordion-body"
                       >
                         <section
                           className="single-schema-list__filter"
@@ -36639,18 +36289,14 @@ exports[`Storyshots Search page Loading 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -36677,18 +36323,14 @@ exports[`Storyshots Search page Loading 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -36715,18 +36357,14 @@ exports[`Storyshots Search page Loading 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -36735,26 +36373,27 @@ exports[`Storyshots Search page Loading 1`] = `
                     </div>
                   </div>
                   <div
-                    className="card"
+                    className="accordion-item"
                   >
-                    <div
-                      className="card-header"
+                    <h2
+                      className="accordion-header"
                     >
                       <button
-                        className="btn btn-link"
+                        aria-expanded={true}
+                        className="accordion-button"
                         onClick={[Function]}
                         type="button"
                       >
                         Biopipeline Output
                          filters
                       </button>
-                    </div>
+                    </h2>
                     <div
                       aria-expanded={null}
-                      className="collapse"
+                      className="accordion-collapse collapse show"
                     >
                       <div
-                        className="card-body"
+                        className="accordion-body"
                       >
                         <section
                           className="single-schema-list__filter"
@@ -36778,18 +36417,14 @@ exports[`Storyshots Search page Loading 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -36816,18 +36451,14 @@ exports[`Storyshots Search page Loading 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -36854,18 +36485,14 @@ exports[`Storyshots Search page Loading 1`] = `
                                 placeholder=""
                                 value=""
                               />
-                              <div
-                                className="input-group-append"
+                              <button
+                                aria-label="Filter results"
+                                className="btn btn-outline-secondary"
+                                disabled={false}
+                                type="submit"
                               >
-                                <button
-                                  aria-label="Filter results"
-                                  className="btn btn-outline-secondary"
-                                  disabled={false}
-                                  type="submit"
-                                >
-                                  Filter
-                                </button>
-                              </div>
+                                Filter
+                              </button>
                             </div>
                           </form>
                           <hr />
@@ -36900,17 +36527,17 @@ exports[`Storyshots Search page Loading 1`] = `
               className="filter-summary-box__badge-group"
             >
               <span
-                className="filter-summary-box__badge badge badge-secondary"
+                className="filter-summary-box__badge badge bg-secondary"
               >
                 Project.Schema
               </span>
               <span
-                className="filter-summary-box__badge filter-summarybox__badge--op badge badge-secondary"
+                className="filter-summary-box__badge filter-summarybox__badge--op badge bg-secondary"
               >
                 is
               </span>
               <span
-                className="filter-summary-box__badge badge badge-secondary"
+                className="filter-summary-box__badge badge bg-secondary"
               >
                 1
               </span>
@@ -36924,17 +36551,17 @@ exports[`Storyshots Search page Loading 1`] = `
               className="filter-summary-box__badge-group"
             >
               <span
-                className="filter-summary-box__badge badge badge-secondary"
+                className="filter-summary-box__badge badge bg-secondary"
               >
                 Experiment.Schema
               </span>
               <span
-                className="filter-summary-box__badge filter-summarybox__badge--op badge badge-secondary"
+                className="filter-summary-box__badge filter-summarybox__badge--op badge bg-secondary"
               >
                 is
               </span>
               <span
-                className="filter-summary-box__badge badge badge-secondary"
+                className="filter-summary-box__badge badge bg-secondary"
               >
                 2
               </span>
@@ -36948,17 +36575,17 @@ exports[`Storyshots Search page Loading 1`] = `
               className="filter-summary-box__badge-group"
             >
               <span
-                className="filter-summary-box__badge badge badge-secondary"
+                className="filter-summary-box__badge badge bg-secondary"
               >
                 Dataset.Schema
               </span>
               <span
-                className="filter-summary-box__badge filter-summarybox__badge--op badge badge-secondary"
+                className="filter-summary-box__badge filter-summarybox__badge--op badge bg-secondary"
               >
                 is
               </span>
               <span
-                className="filter-summary-box__badge badge badge-secondary"
+                className="filter-summary-box__badge badge bg-secondary"
               >
                 1
               </span>
@@ -36972,22 +36599,22 @@ exports[`Storyshots Search page Loading 1`] = `
               className="filter-summary-box__badge-group"
             >
               <span
-                className="filter-summary-box__badge badge badge-secondary"
+                className="filter-summary-box__badge badge bg-secondary"
               >
                 Datafile.Schema
               </span>
               <span
-                className="filter-summary-box__badge filter-summarybox__badge--op badge badge-secondary"
+                className="filter-summary-box__badge filter-summarybox__badge--op badge bg-secondary"
               >
                 is
               </span>
               <span
-                className="filter-summary-box__badge badge badge-secondary"
+                className="filter-summary-box__badge badge bg-secondary"
               >
                 1
               </span>
               <span
-                className="filter-summary-box__badge badge badge-secondary"
+                className="filter-summary-box__badge badge bg-secondary"
               >
                 2
               </span>
@@ -37017,11 +36644,13 @@ exports[`Storyshots Search page Loading 1`] = `
           >
             <a
               className="nav-link"
-              data-rb-event-key="project"
+              data-rr-ui-event-key="project"
               href="#"
               onClick={[Function]}
               onKeyDown={[Function]}
+              onSelect={[Function]}
               role="button"
+              tabIndex={0}
             >
               <span
                 className="text-capitalize"
@@ -37037,11 +36666,13 @@ exports[`Storyshots Search page Loading 1`] = `
           >
             <a
               className="nav-link active"
-              data-rb-event-key="experiment"
+              data-rr-ui-event-key="experiment"
               href="#"
               onClick={[Function]}
               onKeyDown={[Function]}
+              onSelect={[Function]}
               role="button"
+              tabIndex={0}
             >
               <span
                 className="text-capitalize"
@@ -37057,11 +36688,13 @@ exports[`Storyshots Search page Loading 1`] = `
           >
             <a
               className="nav-link"
-              data-rb-event-key="dataset"
+              data-rr-ui-event-key="dataset"
               href="#"
               onClick={[Function]}
               onKeyDown={[Function]}
+              onSelect={[Function]}
               role="button"
+              tabIndex={0}
             >
               <span
                 className="text-capitalize"
@@ -37077,11 +36710,13 @@ exports[`Storyshots Search page Loading 1`] = `
           >
             <a
               className="nav-link"
-              data-rb-event-key="datafile"
+              data-rr-ui-event-key="datafile"
               href="#"
               onClick={[Function]}
               onKeyDown={[Function]}
+              onSelect={[Function]}
               role="button"
+              tabIndex={0}
             >
               <span
                 className="text-capitalize"
@@ -37116,7 +36751,6 @@ exports[`Storyshots Search page Loading 1`] = `
           >
             <button
               aria-expanded={false}
-              aria-haspopup={true}
               className="dropdown-toggle btn btn-primary"
               disabled={false}
               onClick={[Function]}
@@ -37190,7 +36824,6 @@ exports[`Storyshots Search page Loading 1`] = `
               >
                 <button
                   aria-expanded={false}
-                  aria-haspopup={true}
                   className="dropdown-toggle btn btn-outline-primary"
                   disabled={false}
                   id="experiment-pagesize--dropdown"
@@ -37220,6 +36853,7 @@ exports[`Storyshots Search page Loading 1`] = `
                   onClick={[Function]}
                   onKeyDown={[Function]}
                   role="button"
+                  tabIndex={0}
                 >
                   <span
                     aria-hidden="true"
@@ -37227,7 +36861,7 @@ exports[`Storyshots Search page Loading 1`] = `
                     «
                   </span>
                   <span
-                    className="sr-only"
+                    className="visually-hidden"
                   >
                     First
                   </span>
@@ -37242,6 +36876,7 @@ exports[`Storyshots Search page Loading 1`] = `
                   onClick={[Function]}
                   onKeyDown={[Function]}
                   role="button"
+                  tabIndex={0}
                 >
                   <span
                     aria-hidden="true"
@@ -37249,7 +36884,7 @@ exports[`Storyshots Search page Loading 1`] = `
                     ‹
                   </span>
                   <span
-                    className="sr-only"
+                    className="visually-hidden"
                   >
                     Previous
                   </span>
@@ -37264,6 +36899,7 @@ exports[`Storyshots Search page Loading 1`] = `
                   onClick={[Function]}
                   onKeyDown={[Function]}
                   role="button"
+                  tabIndex={0}
                 >
                   <span
                     aria-hidden="true"
@@ -37271,7 +36907,7 @@ exports[`Storyshots Search page Loading 1`] = `
                     ›
                   </span>
                   <span
-                    className="sr-only"
+                    className="visually-hidden"
                   >
                     Next
                   </span>
@@ -37286,6 +36922,7 @@ exports[`Storyshots Search page Loading 1`] = `
                   onClick={[Function]}
                   onKeyDown={[Function]}
                   role="button"
+                  tabIndex={0}
                 >
                   <span
                     aria-hidden="true"
@@ -37293,7 +36930,7 @@ exports[`Storyshots Search page Loading 1`] = `
                     »
                   </span>
                   <span
-                    className="sr-only"
+                    className="visually-hidden"
                   >
                     Last
                   </span>
@@ -37327,7 +36964,6 @@ exports[`Storyshots Sort options list Default 1`] = `
   >
     <button
       aria-expanded={false}
-      aria-haspopup={true}
       className="dropdown-toggle btn btn-outline-primary"
       disabled={false}
       onClick={[Function]}
@@ -37372,7 +37008,6 @@ exports[`Storyshots Sort options list Multi Selected 1`] = `
   >
     <button
       aria-expanded={false}
-      aria-haspopup={true}
       className="dropdown-toggle btn btn-primary"
       disabled={false}
       onClick={[Function]}
@@ -37417,7 +37052,6 @@ exports[`Storyshots Sort options list Sort Active 1`] = `
   >
     <button
       aria-expanded={false}
-      aria-haspopup={true}
       className="dropdown-toggle btn btn-primary"
       disabled={false}
       onClick={[Function]}
diff --git a/assets/js/apps/search/components/filter-summary/FilterSummaryBox.jsx b/assets/js/apps/search/components/filter-summary/FilterSummaryBox.jsx
index cf13d2b6d5..f99500b9d1 100644
--- a/assets/js/apps/search/components/filter-summary/FilterSummaryBox.jsx
+++ b/assets/js/apps/search/components/filter-summary/FilterSummaryBox.jsx
@@ -18,7 +18,7 @@ import {
 } from "../searchSlice";
 
 function InvalidFilterBadge() {
-    return <Badge variant="secondary">(Invalid filter)</Badge>;
+    return <Badge bg="secondary">(Invalid filter)</Badge>;
 }
 
 function AndOperatorBadge() {
@@ -29,7 +29,7 @@ function MultiValueContentBadge({ content }) {
     return content.map(filterValue =>
         <Badge
             key={filterValue}
-            variant="secondary"
+            bg="secondary"
             className="filter-summary-box__badge"
         >
             {filterValue}
@@ -42,7 +42,7 @@ MultiValueContentBadge.propTypes = {
 
 function SingleValueContentBadge({ content }) {
     return <Badge
-        variant="secondary"
+        bg="secondary"
         className="filter-summary-box__badge"
     >
         {content}
@@ -56,10 +56,10 @@ SingleValueContentBadge.propTypes = {
 function FilterBadge({ fieldName, value }) {
     
     return <div className="filter-summary-box__badge-group">
-        <Badge variant="secondary" className="filter-summary-box__badge">{fieldName}</Badge>
+        <Badge bg="secondary" className="filter-summary-box__badge">{fieldName}</Badge>
         {value.map(({ op, content }) =>
             <Fragment key={Array.isArray(content) ? content.join(",") : content}>
-                <Badge variant="secondary" className="filter-summary-box__badge filter-summarybox__badge--op">{op}</Badge>
+                <Badge bg="secondary" className="filter-summary-box__badge filter-summarybox__badge--op">{op}</Badge>
                 {op === "is" ?
                     <MultiValueContentBadge content={content} />
                     : <SingleValueContentBadge content={content} />}
diff --git a/assets/js/apps/search/components/filters/date-filter/DateRangeFilter.jsx b/assets/js/apps/search/components/filters/date-filter/DateRangeFilter.jsx
index ca74c22d4a..3909149d95 100644
--- a/assets/js/apps/search/components/filters/date-filter/DateRangeFilter.jsx
+++ b/assets/js/apps/search/components/filters/date-filter/DateRangeFilter.jsx
@@ -148,12 +148,13 @@ const DateRangeFilter = ({ id = "missingFilterName", value, options, onValueChan
     };
 
     const checkValidation = (val) => {
-        // for all date points (e.g start or end) if it is an invalid Moment object set invalid values to true
-        let valid = Object.keys(val).every(key => {
-            let date = val[key];
-            return date._isAMomentObject;
-        })
-        setIsValidValue(valid)
+        // Validity is based on whether the start and end date is a valid date object.
+        // If start is not hidden, then check whether it's a date. Otherwise assume valid.
+        // If end is not hidden, then check whether it's a date. Otherwise assume valid.
+        // isValid is a combination of the two values.
+        const isValid = (options.hideStart ? true : val.start._isAMomentObject) && 
+            (options.hideEnd ? true : val.end._isAMomentObject)
+        setIsValidValue(isValid)
     }
 
     // We should disable the filter button if there's nothing in the filter box.
@@ -177,7 +178,7 @@ const DateRangeFilter = ({ id = "missingFilterName", value, options, onValueChan
         <Form className="date-range-filter" onSubmit={handleSubmit}>
             {options.hideStart ? null :
                 <Form.Group className="date-range-filter__field">
-                    <Form.Label htmlFor={startFieldId} srOnly={options.hideLabels}>Start</Form.Label>
+                    <Form.Label htmlFor={startFieldId} visuallyHidden={options.hideLabels}>Start</Form.Label>
                     <Datetime
                         value={localValue.start}
                         onChange={handleStartValueChange}
@@ -193,7 +194,7 @@ const DateRangeFilter = ({ id = "missingFilterName", value, options, onValueChan
             }
             {options.hideEnd ? null :
                 <Form.Group className="date-range-filter__field">
-                    <Form.Label htmlFor={endFieldId} srOnly={options.hideLabels}>End</Form.Label>
+                    <Form.Label htmlFor={endFieldId} visuallyHidden={options.hideLabels}>End</Form.Label>
                     <Datetime
                         isInvalid={!isValidValue}
                         value={localValue.end}
@@ -217,7 +218,7 @@ const DateRangeFilter = ({ id = "missingFilterName", value, options, onValueChan
             }
             <Button
                 type="submit"
-                className="date-range-filter__button"
+                className="date-range-filter__button mt-3"
                 aria-label="Filter results"
                 variant={canChangeValue ? "secondary" : "outline-secondary"}
             >
diff --git a/assets/js/apps/search/components/filters/text-filter/TextFilter.jsx b/assets/js/apps/search/components/filters/text-filter/TextFilter.jsx
index f1e4ddcdd2..12e77b1dfe 100644
--- a/assets/js/apps/search/components/filters/text-filter/TextFilter.jsx
+++ b/assets/js/apps/search/components/filters/text-filter/TextFilter.jsx
@@ -85,9 +85,7 @@ const TextFilter = ({ value, options, onValueChange }) => {
                     value={localValue} aria-label="Filter input" 
                     placeholder={options.hint}
                 ></FormControl>
-                <InputGroup.Append>
-                    <Button type="submit" aria-label="Filter results" variant={canChangeValue ? "secondary" : "outline-secondary"}>Filter</Button>
-                </InputGroup.Append>
+                <Button type="submit" aria-label="Filter results" variant={canChangeValue ? "secondary" : "outline-secondary"}>Filter</Button>
             </InputGroup>
             {isValidValue ? null :
                 <FilterError
diff --git a/assets/js/apps/search/components/filters/type-schema-list/TypeSchemaList.jsx b/assets/js/apps/search/components/filters/type-schema-list/TypeSchemaList.jsx
index 0dd410609d..3e5bbc530c 100644
--- a/assets/js/apps/search/components/filters/type-schema-list/TypeSchemaList.jsx
+++ b/assets/js/apps/search/components/filters/type-schema-list/TypeSchemaList.jsx
@@ -98,18 +98,14 @@ export const PureTypeSchemaList = ({ value: schemaValue, onValueChange, options
                         return null;
                     }
                     return (
-                        <Card key={name}>
-                            <Card.Header>
-                                <Accordion.Toggle as="button" className="btn btn-link" eventKey={id}>
+                        <Accordion.Item key={name}>
+                            <Accordion.Header>
                                     {name} filters
-                                </Accordion.Toggle>
-                            </Card.Header>
-                            <Accordion.Collapse eventKey={id}>
-                                <Card.Body>
+                            </Accordion.Header>
+                                <Accordion.Body>
                                     <SchemaFilterList schema={schema} />
-                                </Card.Body>
-                            </Accordion.Collapse>
-                        </Card>
+                                </Accordion.Body>
+                        </Accordion.Item>
                     );
                 })}
             </Accordion>
diff --git a/assets/js/apps/tiles/components/__tests__/__snapshots__/DatasetTiles.spec.jsx.snap b/assets/js/apps/tiles/components/__tests__/__snapshots__/DatasetTiles.spec.jsx.snap
index 39ffa9225f..77ef6ae6dc 100644
--- a/assets/js/apps/tiles/components/__tests__/__snapshots__/DatasetTiles.spec.jsx.snap
+++ b/assets/js/apps/tiles/components/__tests__/__snapshots__/DatasetTiles.spec.jsx.snap
@@ -286,7 +286,7 @@ exports[`render dataset tiles on page load should match snapshot 1`] = `
               >
                 <p>
                   <span
-                    class="badge badge-info"
+                    class="badge text-dark bg-light"
                     title="4 of 4 Files online"
                   >
                     <i
@@ -298,10 +298,10 @@ exports[`render dataset tiles on page load should match snapshot 1`] = `
                 </p>
                 <p>
                   <span
-                    class="badge badge-info"
+                    class="badge text-dark bg-light"
                     title="Dataset size is"
                   >
-                    160.64 KB
+                    160.64 KiB
                   </span>
                 </p>
               </div>
@@ -390,7 +390,7 @@ exports[`render dataset tiles on page load should match snapshot 1`] = `
               >
                 <p>
                   <span
-                    class="badge badge-info"
+                    class="badge text-dark bg-light"
                     title="4 of 4 Files online"
                   >
                     <i
@@ -402,10 +402,10 @@ exports[`render dataset tiles on page load should match snapshot 1`] = `
                 </p>
                 <p>
                   <span
-                    class="badge badge-info"
+                    class="badge text-dark bg-light"
                     title="Dataset size is"
                   >
-                    342.35 KB
+                    342.35 KiB
                   </span>
                 </p>
               </div>
@@ -536,7 +536,7 @@ exports[`render dataset tiles on page load should match snapshot 1`] = `
               >
                 <p>
                   <span
-                    class="badge badge-info"
+                    class="badge text-dark bg-light"
                     title="4 of 4 Files online"
                   >
                     <i
@@ -548,10 +548,10 @@ exports[`render dataset tiles on page load should match snapshot 1`] = `
                 </p>
                 <p>
                   <span
-                    class="badge badge-info"
+                    class="badge text-dark bg-light"
                     title="Dataset size is"
                   >
-                    160.64 KB
+                    160.64 KiB
                   </span>
                 </p>
               </div>
@@ -624,7 +624,7 @@ exports[`render dataset tiles on page load should match snapshot 1`] = `
               >
                 <p>
                   <span
-                    class="badge badge-info"
+                    class="badge text-dark bg-light"
                     title="4 of 4 Files online"
                   >
                     <i
@@ -636,10 +636,10 @@ exports[`render dataset tiles on page load should match snapshot 1`] = `
                 </p>
                 <p>
                   <span
-                    class="badge badge-info"
+                    class="badge text-dark bg-light"
                     title="Dataset size is"
                   >
-                    342.35 KB
+                    342.35 KiB
                   </span>
                 </p>
               </div>
diff --git a/assets/js/tardis_portal/view_dataset/init.js b/assets/js/tardis_portal/view_dataset/init.js
index cc2e99a825..c10855ca7f 100644
--- a/assets/js/tardis_portal/view_dataset/init.js
+++ b/assets/js/tardis_portal/view_dataset/init.js
@@ -40,7 +40,7 @@ $(document).on("change", "#schemaselect", function(e) {
     var $jqmContentDiv = $this.closest(".modal-body");
 
     var type = $this.attr("data-type");
-    var parentObjectId = $this.attr("data-parent_object_id");
+    var parentObjectId = $this.attr("data-bs-parent_object_id");
     var href = "/ajax/add_" + type + "_parameters/" + parentObjectId + "/?schema_id=" + $this.val();
     $.get(href, function(data) {
         $jqmContentDiv.html(data);
@@ -73,7 +73,7 @@ $(document).on("submit", "#add_metadata_form", function(e) {
 
     var schemaId = $("#schemaselect").val();
     var type = form.attr("data-type");
-    var parentObjectId = form.attr("data-parent_object_id");
+    var parentObjectId = form.attr("data-bs-parent_object_id");
     var href = "/ajax/add_" + type + "_parameters/" + parentObjectId + "/?schema_id=" + schemaId;
 
     $.ajax({
diff --git a/package-lock.json b/package-lock.json
index 0b854477f3..6808a20458 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -49,7 +49,7 @@
         "query-string": "^9.0.0",
         "react": "^16.14.0",
         "react-beautiful-dnd": "^13.1.1",
-        "react-bootstrap": "^1.6.1",
+        "react-bootstrap": "^2.10",
         "react-bootstrap-typeahead": "^6.3.2",
         "react-datetime": "^3.2.0",
         "react-dom": "^16.14.0",
@@ -2109,9 +2109,10 @@
       "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA=="
     },
     "node_modules/@babel/runtime": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.2.tgz",
-      "integrity": "sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.7.tgz",
+      "integrity": "sha512-UwgBRMjJP+xv857DCngvqXI3Iq6J4v0wXmwc6sapg+zyhbwmQX67LUEFrkK5tbyJ30jGuG3ZvWpBiB9LCy1kWw==",
+      "license": "MIT",
       "dependencies": {
         "regenerator-runtime": "^0.14.0"
       },
@@ -6278,6 +6279,21 @@
         "node": ">=12"
       }
     },
+    "node_modules/@react-aria/ssr": {
+      "version": "3.9.4",
+      "resolved": "https://registry.npmjs.org/@react-aria/ssr/-/ssr-3.9.4.tgz",
+      "integrity": "sha512-4jmAigVq409qcJvQyuorsmBR4+9r3+JEC60wC+Y0MZV0HCtTmm8D9guYXlJMdx0SSkgj0hHAyFm/HvPNFofCoQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@swc/helpers": "^0.5.0"
+      },
+      "engines": {
+        "node": ">= 12"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0"
+      }
+    },
     "node_modules/@reduxjs/toolkit": {
       "version": "1.9.7",
       "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-1.9.7.tgz",
@@ -6301,23 +6317,46 @@
         }
       }
     },
-    "node_modules/@restart/context": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@restart/context/-/context-2.1.4.tgz",
-      "integrity": "sha512-INJYZQJP7g+IoDUh/475NlGiTeMfwTXUEr3tmRneckHIxNolGOW9CTq83S8cxq0CgJwwcMzMJFchxvlwe7Rk8Q==",
+    "node_modules/@restart/hooks": {
+      "version": "0.4.16",
+      "resolved": "https://registry.npmjs.org/@restart/hooks/-/hooks-0.4.16.tgz",
+      "integrity": "sha512-f7aCv7c+nU/3mF7NWLtVVr0Ra80RqsO89hO72r+Y/nvQr5+q0UFGkocElTH6MJApvReVh6JHUFYn2cw1WdHF3w==",
+      "license": "MIT",
+      "dependencies": {
+        "dequal": "^2.0.3"
+      },
       "peerDependencies": {
-        "react": ">=16.3.2"
+        "react": ">=16.8.0"
       }
     },
-    "node_modules/@restart/hooks": {
-      "version": "0.3.27",
-      "resolved": "https://registry.npmjs.org/@restart/hooks/-/hooks-0.3.27.tgz",
-      "integrity": "sha512-s984xV/EapUIfkjlf8wz9weP2O9TNKR96C68FfMEy2bE69+H4cNv3RD4Mf97lW7Htt7PjZrYTjSC8f3SB9VCXw==",
+    "node_modules/@restart/ui": {
+      "version": "1.6.9",
+      "resolved": "https://registry.npmjs.org/@restart/ui/-/ui-1.6.9.tgz",
+      "integrity": "sha512-mUbygUsJcRurjZCt1f77gg4DpheD1D+Sc7J3JjAkysUj7t8m4EBJVOqWC9788Qtbc69cJ+HlJc6jBguKwS8Mcw==",
+      "license": "MIT",
       "dependencies": {
-        "dequal": "^2.0.2"
+        "@babel/runtime": "^7.21.0",
+        "@popperjs/core": "^2.11.6",
+        "@react-aria/ssr": "^3.5.0",
+        "@restart/hooks": "^0.4.9",
+        "@types/warning": "^3.0.0",
+        "dequal": "^2.0.3",
+        "dom-helpers": "^5.2.0",
+        "uncontrollable": "^8.0.1",
+        "warning": "^4.0.3"
       },
       "peerDependencies": {
-        "react": ">=16.8.0"
+        "react": ">=16.14.0",
+        "react-dom": ">=16.14.0"
+      }
+    },
+    "node_modules/@restart/ui/node_modules/uncontrollable": {
+      "version": "8.0.4",
+      "resolved": "https://registry.npmjs.org/uncontrollable/-/uncontrollable-8.0.4.tgz",
+      "integrity": "sha512-ulRWYWHvscPFc0QQXvyJjY6LIXU56f0h8pQFvhxiKk5V1fcI8gp9Ht9leVAhrVjzqMw0BgjspBINx9r6oyJUvQ==",
+      "license": "MIT",
+      "peerDependencies": {
+        "react": ">=16.14.0"
       }
     },
     "node_modules/@sinclair/typebox": {
@@ -13640,6 +13679,15 @@
         "node": ">=8"
       }
     },
+    "node_modules/@swc/helpers": {
+      "version": "0.5.11",
+      "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.11.tgz",
+      "integrity": "sha512-YNlnKRWF2sVojTpIyzwou9XoTNbzbzONwRhOoniEioF1AtaitTvVZblaQRrAzChWQ1bLYyYSWzM18y4WwgzJ+A==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "tslib": "^2.4.0"
+      }
+    },
     "node_modules/@testing-library/dom": {
       "version": "8.20.1",
       "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-8.20.1.tgz",
@@ -13965,11 +14013,6 @@
       "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==",
       "dev": true
     },
-    "node_modules/@types/invariant": {
-      "version": "2.2.35",
-      "resolved": "https://registry.npmjs.org/@types/invariant/-/invariant-2.2.35.tgz",
-      "integrity": "sha512-DxX1V9P8zdJPYQat1gHyY0xj3efl8gnMVjiM9iCY6y27lj+PoQWkgjt8jDqmovPqULkKVpKRg8J36iQiA+EtEg=="
-    },
     "node_modules/@types/is-function": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@types/is-function/-/is-function-1.0.1.tgz",
@@ -14197,9 +14240,10 @@
       }
     },
     "node_modules/@types/react-transition-group": {
-      "version": "4.4.4",
-      "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.4.tgz",
-      "integrity": "sha512-7gAPz7anVK5xzbeQW9wFBDg7G++aPLAFY0QaSMOou9rJZpbuI58WAuJrgu+qR92l61grlnCUe7AFX8KGahAgug==",
+      "version": "4.4.10",
+      "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.10.tgz",
+      "integrity": "sha512-hT/+s0VQs2ojCX823m60m5f0sL5idt9SO6Tj6Dg+rdphGPIeJbJ6CxvBYkgkGKrYeDjvIpKTR38UzmtHJOGW3Q==",
+      "license": "MIT",
       "dependencies": {
         "@types/react": "*"
       }
@@ -17955,9 +17999,10 @@
       }
     },
     "node_modules/classnames": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.1.tgz",
-      "integrity": "sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA=="
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz",
+      "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==",
+      "license": "MIT"
     },
     "node_modules/clean-css": {
       "version": "5.3.2",
@@ -33418,31 +33463,33 @@
       }
     },
     "node_modules/react-bootstrap": {
-      "version": "1.6.4",
-      "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-1.6.4.tgz",
-      "integrity": "sha512-z3BhBD4bEZuLP8VrYqAD7OT7axdcSkkyvWBWnS2U/4MhyabUihrUyucPWkan7aMI1XIHbmH4LCpEtzWGfx/yfA==",
-      "dependencies": {
-        "@babel/runtime": "^7.14.0",
-        "@restart/context": "^2.1.4",
-        "@restart/hooks": "^0.3.26",
-        "@types/invariant": "^2.2.33",
-        "@types/prop-types": "^15.7.3",
-        "@types/react": ">=16.14.8",
-        "@types/react-transition-group": "^4.4.1",
-        "@types/warning": "^3.0.0",
-        "classnames": "^2.3.1",
+      "version": "2.10.4",
+      "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-2.10.4.tgz",
+      "integrity": "sha512-W3398nBM2CBfmGP2evneEO3ZZwEMPtHs72q++eNw60uDGDAdiGn0f9yNys91eo7/y8CTF5Ke1C0QO8JFVPU40Q==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.24.7",
+        "@restart/hooks": "^0.4.9",
+        "@restart/ui": "^1.6.9",
+        "@types/react-transition-group": "^4.4.6",
+        "classnames": "^2.3.2",
         "dom-helpers": "^5.2.1",
         "invariant": "^2.2.4",
-        "prop-types": "^15.7.2",
+        "prop-types": "^15.8.1",
         "prop-types-extra": "^1.1.0",
-        "react-overlays": "^5.1.1",
-        "react-transition-group": "^4.4.1",
+        "react-transition-group": "^4.4.5",
         "uncontrollable": "^7.2.1",
         "warning": "^4.0.3"
       },
       "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
+        "@types/react": ">=16.14.8",
+        "react": ">=16.14.0",
+        "react-dom": ">=16.14.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
       }
     },
     "node_modules/react-bootstrap-typeahead": {
@@ -33471,17 +33518,6 @@
         "react-dom": ">=16.8.0"
       }
     },
-    "node_modules/react-bootstrap-typeahead/node_modules/@restart/hooks": {
-      "version": "0.4.11",
-      "resolved": "https://registry.npmjs.org/@restart/hooks/-/hooks-0.4.11.tgz",
-      "integrity": "sha512-Ft/ncTULZN6ldGHiF/k5qt72O8JyRMOeg0tApvCni8LkoiEahO+z3TNxfXIVGy890YtWVDvJAl662dVJSJXvMw==",
-      "dependencies": {
-        "dequal": "^2.0.3"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0"
-      }
-    },
     "node_modules/react-colorful": {
       "version": "5.5.1",
       "resolved": "https://registry.npmjs.org/react-colorful/-/react-colorful-5.5.1.tgz",
@@ -33633,17 +33669,6 @@
         "react-dom": ">=16.3.0"
       }
     },
-    "node_modules/react-overlays/node_modules/@restart/hooks": {
-      "version": "0.4.11",
-      "resolved": "https://registry.npmjs.org/@restart/hooks/-/hooks-0.4.11.tgz",
-      "integrity": "sha512-Ft/ncTULZN6ldGHiF/k5qt72O8JyRMOeg0tApvCni8LkoiEahO+z3TNxfXIVGy890YtWVDvJAl662dVJSJXvMw==",
-      "dependencies": {
-        "dequal": "^2.0.3"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0"
-      }
-    },
     "node_modules/react-popper": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.3.0.tgz",
@@ -33870,9 +33895,10 @@
       }
     },
     "node_modules/react-transition-group": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.2.tgz",
-      "integrity": "sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg==",
+      "version": "4.4.5",
+      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz",
+      "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==",
+      "license": "BSD-3-Clause",
       "dependencies": {
         "@babel/runtime": "^7.5.5",
         "dom-helpers": "^5.0.1",
@@ -36537,9 +36563,10 @@
       }
     },
     "node_modules/tslib": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
-      "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
+      "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==",
+      "license": "0BSD"
     },
     "node_modules/tty-browserify": {
       "version": "0.0.0",
@@ -39827,9 +39854,9 @@
       "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA=="
     },
     "@babel/runtime": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.2.tgz",
-      "integrity": "sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.7.tgz",
+      "integrity": "sha512-UwgBRMjJP+xv857DCngvqXI3Iq6J4v0wXmwc6sapg+zyhbwmQX67LUEFrkK5tbyJ30jGuG3ZvWpBiB9LCy1kWw==",
       "requires": {
         "regenerator-runtime": "^0.14.0"
       }
@@ -43018,6 +43045,14 @@
         }
       }
     },
+    "@react-aria/ssr": {
+      "version": "3.9.4",
+      "resolved": "https://registry.npmjs.org/@react-aria/ssr/-/ssr-3.9.4.tgz",
+      "integrity": "sha512-4jmAigVq409qcJvQyuorsmBR4+9r3+JEC60wC+Y0MZV0HCtTmm8D9guYXlJMdx0SSkgj0hHAyFm/HvPNFofCoQ==",
+      "requires": {
+        "@swc/helpers": "^0.5.0"
+      }
+    },
     "@reduxjs/toolkit": {
       "version": "1.9.7",
       "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-1.9.7.tgz",
@@ -43029,18 +43064,36 @@
         "reselect": "^4.1.8"
       }
     },
-    "@restart/context": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@restart/context/-/context-2.1.4.tgz",
-      "integrity": "sha512-INJYZQJP7g+IoDUh/475NlGiTeMfwTXUEr3tmRneckHIxNolGOW9CTq83S8cxq0CgJwwcMzMJFchxvlwe7Rk8Q==",
-      "requires": {}
-    },
     "@restart/hooks": {
-      "version": "0.3.27",
-      "resolved": "https://registry.npmjs.org/@restart/hooks/-/hooks-0.3.27.tgz",
-      "integrity": "sha512-s984xV/EapUIfkjlf8wz9weP2O9TNKR96C68FfMEy2bE69+H4cNv3RD4Mf97lW7Htt7PjZrYTjSC8f3SB9VCXw==",
+      "version": "0.4.16",
+      "resolved": "https://registry.npmjs.org/@restart/hooks/-/hooks-0.4.16.tgz",
+      "integrity": "sha512-f7aCv7c+nU/3mF7NWLtVVr0Ra80RqsO89hO72r+Y/nvQr5+q0UFGkocElTH6MJApvReVh6JHUFYn2cw1WdHF3w==",
       "requires": {
-        "dequal": "^2.0.2"
+        "dequal": "^2.0.3"
+      }
+    },
+    "@restart/ui": {
+      "version": "1.6.9",
+      "resolved": "https://registry.npmjs.org/@restart/ui/-/ui-1.6.9.tgz",
+      "integrity": "sha512-mUbygUsJcRurjZCt1f77gg4DpheD1D+Sc7J3JjAkysUj7t8m4EBJVOqWC9788Qtbc69cJ+HlJc6jBguKwS8Mcw==",
+      "requires": {
+        "@babel/runtime": "^7.21.0",
+        "@popperjs/core": "^2.11.6",
+        "@react-aria/ssr": "^3.5.0",
+        "@restart/hooks": "^0.4.9",
+        "@types/warning": "^3.0.0",
+        "dequal": "^2.0.3",
+        "dom-helpers": "^5.2.0",
+        "uncontrollable": "^8.0.1",
+        "warning": "^4.0.3"
+      },
+      "dependencies": {
+        "uncontrollable": {
+          "version": "8.0.4",
+          "resolved": "https://registry.npmjs.org/uncontrollable/-/uncontrollable-8.0.4.tgz",
+          "integrity": "sha512-ulRWYWHvscPFc0QQXvyJjY6LIXU56f0h8pQFvhxiKk5V1fcI8gp9Ht9leVAhrVjzqMw0BgjspBINx9r6oyJUvQ==",
+          "requires": {}
+        }
       }
     },
     "@sinclair/typebox": {
@@ -48745,6 +48798,14 @@
         }
       }
     },
+    "@swc/helpers": {
+      "version": "0.5.11",
+      "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.11.tgz",
+      "integrity": "sha512-YNlnKRWF2sVojTpIyzwou9XoTNbzbzONwRhOoniEioF1AtaitTvVZblaQRrAzChWQ1bLYyYSWzM18y4WwgzJ+A==",
+      "requires": {
+        "tslib": "^2.4.0"
+      }
+    },
     "@testing-library/dom": {
       "version": "8.20.1",
       "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-8.20.1.tgz",
@@ -49025,11 +49086,6 @@
       "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==",
       "dev": true
     },
-    "@types/invariant": {
-      "version": "2.2.35",
-      "resolved": "https://registry.npmjs.org/@types/invariant/-/invariant-2.2.35.tgz",
-      "integrity": "sha512-DxX1V9P8zdJPYQat1gHyY0xj3efl8gnMVjiM9iCY6y27lj+PoQWkgjt8jDqmovPqULkKVpKRg8J36iQiA+EtEg=="
-    },
     "@types/is-function": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@types/is-function/-/is-function-1.0.1.tgz",
@@ -49257,9 +49313,9 @@
       }
     },
     "@types/react-transition-group": {
-      "version": "4.4.4",
-      "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.4.tgz",
-      "integrity": "sha512-7gAPz7anVK5xzbeQW9wFBDg7G++aPLAFY0QaSMOou9rJZpbuI58WAuJrgu+qR92l61grlnCUe7AFX8KGahAgug==",
+      "version": "4.4.10",
+      "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.10.tgz",
+      "integrity": "sha512-hT/+s0VQs2ojCX823m60m5f0sL5idt9SO6Tj6Dg+rdphGPIeJbJ6CxvBYkgkGKrYeDjvIpKTR38UzmtHJOGW3Q==",
       "requires": {
         "@types/react": "*"
       }
@@ -52216,9 +52272,9 @@
       }
     },
     "classnames": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.1.tgz",
-      "integrity": "sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA=="
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz",
+      "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow=="
     },
     "clean-css": {
       "version": "5.3.2",
@@ -64054,25 +64110,20 @@
       }
     },
     "react-bootstrap": {
-      "version": "1.6.4",
-      "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-1.6.4.tgz",
-      "integrity": "sha512-z3BhBD4bEZuLP8VrYqAD7OT7axdcSkkyvWBWnS2U/4MhyabUihrUyucPWkan7aMI1XIHbmH4LCpEtzWGfx/yfA==",
-      "requires": {
-        "@babel/runtime": "^7.14.0",
-        "@restart/context": "^2.1.4",
-        "@restart/hooks": "^0.3.26",
-        "@types/invariant": "^2.2.33",
-        "@types/prop-types": "^15.7.3",
-        "@types/react": ">=16.14.8",
-        "@types/react-transition-group": "^4.4.1",
-        "@types/warning": "^3.0.0",
-        "classnames": "^2.3.1",
+      "version": "2.10.4",
+      "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-2.10.4.tgz",
+      "integrity": "sha512-W3398nBM2CBfmGP2evneEO3ZZwEMPtHs72q++eNw60uDGDAdiGn0f9yNys91eo7/y8CTF5Ke1C0QO8JFVPU40Q==",
+      "requires": {
+        "@babel/runtime": "^7.24.7",
+        "@restart/hooks": "^0.4.9",
+        "@restart/ui": "^1.6.9",
+        "@types/react-transition-group": "^4.4.6",
+        "classnames": "^2.3.2",
         "dom-helpers": "^5.2.1",
         "invariant": "^2.2.4",
-        "prop-types": "^15.7.2",
+        "prop-types": "^15.8.1",
         "prop-types-extra": "^1.1.0",
-        "react-overlays": "^5.1.1",
-        "react-transition-group": "^4.4.1",
+        "react-transition-group": "^4.4.5",
         "uncontrollable": "^7.2.1",
         "warning": "^4.0.3"
       }
@@ -64094,16 +64145,6 @@
         "react-popper": "^2.2.5",
         "scroll-into-view-if-needed": "^3.1.0",
         "warning": "^4.0.1"
-      },
-      "dependencies": {
-        "@restart/hooks": {
-          "version": "0.4.11",
-          "resolved": "https://registry.npmjs.org/@restart/hooks/-/hooks-0.4.11.tgz",
-          "integrity": "sha512-Ft/ncTULZN6ldGHiF/k5qt72O8JyRMOeg0tApvCni8LkoiEahO+z3TNxfXIVGy890YtWVDvJAl662dVJSJXvMw==",
-          "requires": {
-            "dequal": "^2.0.3"
-          }
-        }
       }
     },
     "react-colorful": {
@@ -64224,16 +64265,6 @@
         "prop-types": "^15.7.2",
         "uncontrollable": "^7.2.1",
         "warning": "^4.0.3"
-      },
-      "dependencies": {
-        "@restart/hooks": {
-          "version": "0.4.11",
-          "resolved": "https://registry.npmjs.org/@restart/hooks/-/hooks-0.4.11.tgz",
-          "integrity": "sha512-Ft/ncTULZN6ldGHiF/k5qt72O8JyRMOeg0tApvCni8LkoiEahO+z3TNxfXIVGy890YtWVDvJAl662dVJSJXvMw==",
-          "requires": {
-            "dequal": "^2.0.3"
-          }
-        }
       }
     },
     "react-popper": {
@@ -64400,9 +64431,9 @@
       }
     },
     "react-transition-group": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.2.tgz",
-      "integrity": "sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg==",
+      "version": "4.4.5",
+      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz",
+      "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==",
       "requires": {
         "@babel/runtime": "^7.5.5",
         "dom-helpers": "^5.0.1",
@@ -66520,9 +66551,9 @@
       }
     },
     "tslib": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
-      "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
+      "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ=="
     },
     "tty-browserify": {
       "version": "0.0.0",
diff --git a/package.json b/package.json
index 33e2eb29f2..fb2e84cd8e 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "query-string": "^9.0.0",
     "react": "^16.14.0",
     "react-beautiful-dnd": "^13.1.1",
-    "react-bootstrap": "^1.6.1",
+    "react-bootstrap": "^2.10",
     "react-bootstrap-typeahead": "^6.3.2",
     "react-datetime": "^3.2.0",
     "react-dom": "^16.14.0",
diff --git a/tardis/apps/projects/templates/ajax/owned_proj_list.html b/tardis/apps/projects/templates/ajax/owned_proj_list.html
index 02cccebd37..2edd191efe 100644
--- a/tardis/apps/projects/templates/ajax/owned_proj_list.html
+++ b/tardis/apps/projects/templates/ajax/owned_proj_list.html
@@ -14,13 +14,12 @@
 {% for proj in projects %}
   <div class="card mb-2">
     <div id="toggle-{{proj.id}}"
-         class="card-header accordion-toggle py-2" data-parent="#projects"
+         class="card-header accordion-toggle py-2" data-bs-parent="#projects"
          data-bs-toggle="collapse">
       <div class="row">
         <div class="col-md-8 px-1 pb-1">
           <input type="hidden" class="proj-index" value="{{ forloop.counter }}">
-          <a class="explink"
-             href="{% url 'tardis.apps.projects.view_project' proj.id %}">{{ proj.name }}</a>
+          <span class="card-title">{{ proj.name }}</span>
         </div>
         <div class="col">
           <div class="projectbadges" id="badge-{{proj.id}}"></div>
@@ -36,6 +35,8 @@
           </div>
         </div>
       </div>
+      <a class="btn btn-light mt-3 w-100"
+      href="{% url 'tardis.apps.projects.view_project' proj.id %}">View Project</a>
     </div>
   </div>
 {% empty %}
diff --git a/tardis/apps/projects/templates/my_projects.html b/tardis/apps/projects/templates/my_projects.html
index e8dffc98b2..5d07fe8671 100644
--- a/tardis/apps/projects/templates/my_projects.html
+++ b/tardis/apps/projects/templates/my_projects.html
@@ -8,10 +8,9 @@
 
 {% block content %}
 
-<div id="content" class="container-fluid">
+<main id="content" class="container">
   <div class="row">
-    <div class="col-md-12">
-      <h3 class="d-block d-sm-none">Projects</h3>
+    <div class="col-md-12 page-header">
       {% if not disable_creation_forms %}
         <div class="pull-right pb-1">
           {% if perms.tardis_portal.add_project %}
@@ -25,7 +24,7 @@ <h3 class="d-block d-sm-none">Projects</h3>
         </div>  <!-- class="pull-right" -->
       {% endif %}
       <div class="pull-left">
-        <h3 class="d-none d-sm-block" style="text-align: center">Projects</h3>
+        <h1 class="mb-1">Projects</h1>
       </div>
     </div>  <!-- class="col-md-12" -->
   </div>  <!-- class="row" -->
@@ -58,7 +57,7 @@ <h4><strong>{{ owned_projects.count }}</strong>
       {% endif %}
     </div>  <!-- class="col-md-12" -->
   </div>  <!-- class="row" -->
-</div>  <!-- id="content" -->
+</main>  <!-- id="content" -->
 
 <input type="hidden" id="proj-expand-accordion" value="{{ proj_expand_accordion }}">
 {% render_bundle 'my_projects' %}
diff --git a/tardis/apps/projects/templates/public_projects.html b/tardis/apps/projects/templates/public_projects.html
index d38bed5ec5..b2ef295aa9 100644
--- a/tardis/apps/projects/templates/public_projects.html
+++ b/tardis/apps/projects/templates/public_projects.html
@@ -6,13 +6,10 @@
 
 {% block content %}
 
-<div id="content" class="container-fluid">
+<main id="content" class="container">
   <div class="row">
-    <div class="col-md-12">
-      <h3 class="d-block d-sm-none">Projects</h3>
-      <div class="pull-left">
-          <h3 class="d-none d-sm-block" style="text-align: center">Projects</h3>
-      </div>
+    <div class="col-md-12 page-header">
+      <h1 class="mb-1">Projects</h1>
     </div>
   </div>
   <div class="row">
@@ -39,13 +36,11 @@ <h4><strong>{{ public_projects.count }}</strong>
       <div id="public-projects" class="panel-group projects">
         {% for proj in public_projects %}
           <div class="card mb-2">
-              <div class="card-header accordion-toggle" data-parent="#public-projects"
+              <div class="card-header accordion-toggle" data-bs-parent="#public-projects"
                    data-bs-toggle="collapse" onclick="$('#collapse{{proj.id}}').collapse('toggle');">
                 <div class="row">
                   <div class="col-md-8 px-1 pb-1">
-                    <a class="card-title projlink"
-                       href="{% url 'tardis.apps.projects.view_project' proj.id %}">{{ proj.name }}
-                    </a>
+                    <span class="card-title">{{ proj.name }}</span>
                   </div>
                   <div class="col">
                     <div class="projectbadges" id="badge-{{proj.id}}"></div>
@@ -69,7 +64,7 @@ <h4><strong>{{ public_projects.count }}</strong>
                   </div>
                 </div>
               </div>
-              <div id="collapse{{proj.id}}" class="card-body collapse in py-2" data-parent="#public-projects">
+              <div id="collapse{{proj.id}}" class="card-body collapse in py-2" data-bs-parent="#public-projects">
                 <div class="row">
                   <div class="col-md-9 px-1">
                   <div class="accordion-inner">
@@ -119,6 +114,8 @@ <h4><strong>{{ public_projects.count }}</strong>
                 </div>
               </div>
             </div>
+            <a class="btn btn-light mt-3 w-100"
+            href="{% url 'tardis.apps.projects.view_project' proj.id %}">View Project</a>
           </div>
         </div>
         {% endfor %}
@@ -126,7 +123,7 @@ <h4><strong>{{ public_projects.count }}</strong>
     {% endif %}
     </div>
   </div>
-</div>
+</main>
 <script type="text/javascript">
 $(function() {
     $("#projects .accordion-body").collapse({parent:"#projects", toggle: true});
diff --git a/tardis/apps/push_to/static/push-to/bootstrap/js/bootstrap.min.js b/tardis/apps/push_to/static/push-to/bootstrap/js/bootstrap.min.js
index eb0a8b410f..e5e167eb4b 100644
--- a/tardis/apps/push_to/static/push-to/bootstrap/js/bootstrap.min.js
+++ b/tardis/apps/push_to/static/push-to/bootstrap/js/bootstrap.min.js
@@ -3,4 +3,4 @@
  * Copyright 2011-2019 Twitter, Inc.
  * Licensed under the MIT license
  */
-if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");!function(t){"use strict";var e=jQuery.fn.jquery.split(" ")[0].split(".");if(e[0]<2&&e[1]<9||1==e[0]&&9==e[1]&&e[2]<1||3<e[0])throw new Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher, but lower than version 4")}(),function(n){"use strict";n.fn.emulateTransitionEnd=function(t){var e=!1,i=this;n(this).one("bsTransitionEnd",function(){e=!0});return setTimeout(function(){e||n(i).trigger(n.support.transition.end)},t),this},n(function(){n.support.transition=function o(){var t=document.createElement("bootstrap"),e={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var i in e)if(t.style[i]!==undefined)return{end:e[i]};return!1}(),n.support.transition&&(n.event.special.bsTransitionEnd={bindType:n.support.transition.end,delegateType:n.support.transition.end,handle:function(t){if(n(t.target).is(this))return t.handleObj.handler.apply(this,arguments)}})})}(jQuery),function(s){"use strict";var e='[data-dismiss="alert"]',a=function(t){s(t).on("click",e,this.close)};a.VERSION="3.4.1",a.TRANSITION_DURATION=150,a.prototype.close=function(t){var e=s(this),i=e.attr("data-target");i||(i=(i=e.attr("href"))&&i.replace(/.*(?=#[^\s]*$)/,"")),i="#"===i?[]:i;var o=s(document).find(i);function n(){o.detach().trigger("closed.bs.alert").remove()}t&&t.preventDefault(),o.length||(o=e.closest(".alert")),o.trigger(t=s.Event("close.bs.alert")),t.isDefaultPrevented()||(o.removeClass("in"),s.support.transition&&o.hasClass("fade")?o.one("bsTransitionEnd",n).emulateTransitionEnd(a.TRANSITION_DURATION):n())};var t=s.fn.alert;s.fn.alert=function o(i){return this.each(function(){var t=s(this),e=t.data("bs.alert");e||t.data("bs.alert",e=new a(this)),"string"==typeof i&&e[i].call(t)})},s.fn.alert.Constructor=a,s.fn.alert.noConflict=function(){return s.fn.alert=t,this},s(document).on("click.bs.alert.data-api",e,a.prototype.close)}(jQuery),function(s){"use strict";var n=function(t,e){this.$element=s(t),this.options=s.extend({},n.DEFAULTS,e),this.isLoading=!1};function i(o){return this.each(function(){var t=s(this),e=t.data("bs.button"),i="object"==typeof o&&o;e||t.data("bs.button",e=new n(this,i)),"toggle"==o?e.toggle():o&&e.setState(o)})}n.VERSION="3.4.1",n.DEFAULTS={loadingText:"loading..."},n.prototype.setState=function(t){var e="disabled",i=this.$element,o=i.is("input")?"val":"html",n=i.data();t+="Text",null==n.resetText&&i.data("resetText",i[o]()),setTimeout(s.proxy(function(){i[o](null==n[t]?this.options[t]:n[t]),"loadingText"==t?(this.isLoading=!0,i.addClass(e).attr(e,e).prop(e,!0)):this.isLoading&&(this.isLoading=!1,i.removeClass(e).removeAttr(e).prop(e,!1))},this),0)},n.prototype.toggle=function(){var t=!0,e=this.$element.closest('[data-toggle="buttons"]');if(e.length){var i=this.$element.find("input");"radio"==i.prop("type")?(i.prop("checked")&&(t=!1),e.find(".active").removeClass("active"),this.$element.addClass("active")):"checkbox"==i.prop("type")&&(i.prop("checked")!==this.$element.hasClass("active")&&(t=!1),this.$element.toggleClass("active")),i.prop("checked",this.$element.hasClass("active")),t&&i.trigger("change")}else this.$element.attr("aria-pressed",!this.$element.hasClass("active")),this.$element.toggleClass("active")};var t=s.fn.button;s.fn.button=i,s.fn.button.Constructor=n,s.fn.button.noConflict=function(){return s.fn.button=t,this},s(document).on("click.bs.button.data-api",'[data-toggle^="button"]',function(t){var e=s(t.target).closest(".btn");i.call(e,"toggle"),s(t.target).is('input[type="radio"], input[type="checkbox"]')||(t.preventDefault(),e.is("input,button")?e.trigger("focus"):e.find("input:visible,button:visible").first().trigger("focus"))}).on("focus.bs.button.data-api blur.bs.button.data-api",'[data-toggle^="button"]',function(t){s(t.target).closest(".btn").toggleClass("focus",/^focus(in)?$/.test(t.type))})}(jQuery),function(p){"use strict";var c=function(t,e){this.$element=p(t),this.$indicators=this.$element.find(".carousel-indicators"),this.options=e,this.paused=null,this.sliding=null,this.interval=null,this.$active=null,this.$items=null,this.options.keyboard&&this.$element.on("keydown.bs.carousel",p.proxy(this.keydown,this)),"hover"==this.options.pause&&!("ontouchstart"in document.documentElement)&&this.$element.on("mouseenter.bs.carousel",p.proxy(this.pause,this)).on("mouseleave.bs.carousel",p.proxy(this.cycle,this))};function r(n){return this.each(function(){var t=p(this),e=t.data("bs.carousel"),i=p.extend({},c.DEFAULTS,t.data(),"object"==typeof n&&n),o="string"==typeof n?n:i.slide;e||t.data("bs.carousel",e=new c(this,i)),"number"==typeof n?e.to(n):o?e[o]():i.interval&&e.pause().cycle()})}c.VERSION="3.4.1",c.TRANSITION_DURATION=600,c.DEFAULTS={interval:5e3,pause:"hover",wrap:!0,keyboard:!0},c.prototype.keydown=function(t){if(!/input|textarea/i.test(t.target.tagName)){switch(t.which){case 37:this.prev();break;case 39:this.next();break;default:return}t.preventDefault()}},c.prototype.cycle=function(t){return t||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(p.proxy(this.next,this),this.options.interval)),this},c.prototype.getItemIndex=function(t){return this.$items=t.parent().children(".item"),this.$items.index(t||this.$active)},c.prototype.getItemForDirection=function(t,e){var i=this.getItemIndex(e);if(("prev"==t&&0===i||"next"==t&&i==this.$items.length-1)&&!this.options.wrap)return e;var o=(i+("prev"==t?-1:1))%this.$items.length;return this.$items.eq(o)},c.prototype.to=function(t){var e=this,i=this.getItemIndex(this.$active=this.$element.find(".item.active"));if(!(t>this.$items.length-1||t<0))return this.sliding?this.$element.one("slid.bs.carousel",function(){e.to(t)}):i==t?this.pause().cycle():this.slide(i<t?"next":"prev",this.$items.eq(t))},c.prototype.pause=function(t){return t||(this.paused=!0),this.$element.find(".next, .prev").length&&p.support.transition&&(this.$element.trigger(p.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},c.prototype.next=function(){if(!this.sliding)return this.slide("next")},c.prototype.prev=function(){if(!this.sliding)return this.slide("prev")},c.prototype.slide=function(t,e){var i=this.$element.find(".item.active"),o=e||this.getItemForDirection(t,i),n=this.interval,s="next"==t?"left":"right",a=this;if(o.hasClass("active"))return this.sliding=!1;var r=o[0],l=p.Event("slide.bs.carousel",{relatedTarget:r,direction:s});if(this.$element.trigger(l),!l.isDefaultPrevented()){if(this.sliding=!0,n&&this.pause(),this.$indicators.length){this.$indicators.find(".active").removeClass("active");var h=p(this.$indicators.children()[this.getItemIndex(o)]);h&&h.addClass("active")}var d=p.Event("slid.bs.carousel",{relatedTarget:r,direction:s});return p.support.transition&&this.$element.hasClass("slide")?(o.addClass(t),"object"==typeof o&&o.length&&o[0].offsetWidth,i.addClass(s),o.addClass(s),i.one("bsTransitionEnd",function(){o.removeClass([t,s].join(" ")).addClass("active"),i.removeClass(["active",s].join(" ")),a.sliding=!1,setTimeout(function(){a.$element.trigger(d)},0)}).emulateTransitionEnd(c.TRANSITION_DURATION)):(i.removeClass("active"),o.addClass("active"),this.sliding=!1,this.$element.trigger(d)),n&&this.cycle(),this}};var t=p.fn.carousel;p.fn.carousel=r,p.fn.carousel.Constructor=c,p.fn.carousel.noConflict=function(){return p.fn.carousel=t,this};var e=function(t){var e=p(this),i=e.attr("href");i&&(i=i.replace(/.*(?=#[^\s]+$)/,""));var o=e.attr("data-target")||i,n=p(document).find(o);if(n.hasClass("carousel")){var s=p.extend({},n.data(),e.data()),a=e.attr("data-slide-to");a&&(s.interval=!1),r.call(n,s),a&&n.data("bs.carousel").to(a),t.preventDefault()}};p(document).on("click.bs.carousel.data-api","[data-slide]",e).on("click.bs.carousel.data-api","[data-slide-to]",e),p(window).on("load",function(){p('[data-ride="carousel"]').each(function(){var t=p(this);r.call(t,t.data())})})}(jQuery),function(a){"use strict";var r=function(t,e){this.$element=a(t),this.options=a.extend({},r.DEFAULTS,e),this.$trigger=a('[data-toggle="collapse"][href="#'+t.id+'"],[data-toggle="collapse"][data-target="#'+t.id+'"]'),this.transitioning=null,this.options.parent?this.$parent=this.getParent():this.addAriaAndCollapsedClass(this.$element,this.$trigger),this.options.toggle&&this.toggle()};function n(t){var e,i=t.attr("data-target")||(e=t.attr("href"))&&e.replace(/.*(?=#[^\s]+$)/,"");return a(document).find(i)}function l(o){return this.each(function(){var t=a(this),e=t.data("bs.collapse"),i=a.extend({},r.DEFAULTS,t.data(),"object"==typeof o&&o);!e&&i.toggle&&/show|hide/.test(o)&&(i.toggle=!1),e||t.data("bs.collapse",e=new r(this,i)),"string"==typeof o&&e[o]()})}r.VERSION="3.4.1",r.TRANSITION_DURATION=350,r.DEFAULTS={toggle:!0},r.prototype.dimension=function(){return this.$element.hasClass("width")?"width":"height"},r.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var t,e=this.$parent&&this.$parent.children(".panel").children(".in, .collapsing");if(!(e&&e.length&&(t=e.data("bs.collapse"))&&t.transitioning)){var i=a.Event("show.bs.collapse");if(this.$element.trigger(i),!i.isDefaultPrevented()){e&&e.length&&(l.call(e,"hide"),t||e.data("bs.collapse",null));var o=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[o](0).attr("aria-expanded",!0),this.$trigger.removeClass("collapsed").attr("aria-expanded",!0),this.transitioning=1;var n=function(){this.$element.removeClass("collapsing").addClass("collapse in")[o](""),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!a.support.transition)return n.call(this);var s=a.camelCase(["scroll",o].join("-"));this.$element.one("bsTransitionEnd",a.proxy(n,this)).emulateTransitionEnd(r.TRANSITION_DURATION)[o](this.$element[0][s])}}}},r.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var t=a.Event("hide.bs.collapse");if(this.$element.trigger(t),!t.isDefaultPrevented()){var e=this.dimension();this.$element[e](this.$element[e]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse in").attr("aria-expanded",!1),this.$trigger.addClass("collapsed").attr("aria-expanded",!1),this.transitioning=1;var i=function(){this.transitioning=0,this.$element.removeClass("collapsing").addClass("collapse").trigger("hidden.bs.collapse")};if(!a.support.transition)return i.call(this);this.$element[e](0).one("bsTransitionEnd",a.proxy(i,this)).emulateTransitionEnd(r.TRANSITION_DURATION)}}},r.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()},r.prototype.getParent=function(){return a(document).find(this.options.parent).find('[data-toggle="collapse"][data-parent="'+this.options.parent+'"]').each(a.proxy(function(t,e){var i=a(e);this.addAriaAndCollapsedClass(n(i),i)},this)).end()},r.prototype.addAriaAndCollapsedClass=function(t,e){var i=t.hasClass("in");t.attr("aria-expanded",i),e.toggleClass("collapsed",!i).attr("aria-expanded",i)};var t=a.fn.collapse;a.fn.collapse=l,a.fn.collapse.Constructor=r,a.fn.collapse.noConflict=function(){return a.fn.collapse=t,this},a(document).on("click.bs.collapse.data-api",'[data-toggle="collapse"]',function(t){var e=a(this);e.attr("data-target")||t.preventDefault();var i=n(e),o=i.data("bs.collapse")?"toggle":e.data();l.call(i,o)})}(jQuery),function(a){"use strict";var r='[data-toggle="dropdown"]',o=function(t){a(t).on("click.bs.dropdown",this.toggle)};function l(t){var e=t.attr("data-target");e||(e=(e=t.attr("href"))&&/#[A-Za-z]/.test(e)&&e.replace(/.*(?=#[^\s]*$)/,""));var i="#"!==e?a(document).find(e):null;return i&&i.length?i:t.parent()}function s(o){o&&3===o.which||(a(".dropdown-backdrop").remove(),a(r).each(function(){var t=a(this),e=l(t),i={relatedTarget:this};e.hasClass("open")&&(o&&"click"==o.type&&/input|textarea/i.test(o.target.tagName)&&a.contains(e[0],o.target)||(e.trigger(o=a.Event("hide.bs.dropdown",i)),o.isDefaultPrevented()||(t.attr("aria-expanded","false"),e.removeClass("open").trigger(a.Event("hidden.bs.dropdown",i)))))}))}o.VERSION="3.4.1",o.prototype.toggle=function(t){var e=a(this);if(!e.is(".disabled, :disabled")){var i=l(e),o=i.hasClass("open");if(s(),!o){"ontouchstart"in document.documentElement&&!i.closest(".navbar-nav").length&&a(document.createElement("div")).addClass("dropdown-backdrop").insertAfter(a(this)).on("click",s);var n={relatedTarget:this};if(i.trigger(t=a.Event("show.bs.dropdown",n)),t.isDefaultPrevented())return;e.trigger("focus").attr("aria-expanded","true"),i.toggleClass("open").trigger(a.Event("shown.bs.dropdown",n))}return!1}},o.prototype.keydown=function(t){if(/(38|40|27|32)/.test(t.which)&&!/input|textarea/i.test(t.target.tagName)){var e=a(this);if(t.preventDefault(),t.stopPropagation(),!e.is(".disabled, :disabled")){var i=l(e),o=i.hasClass("open");if(!o&&27!=t.which||o&&27==t.which)return 27==t.which&&i.find(r).trigger("focus"),e.trigger("click");var n=i.find(".dropdown-menu li:not(.disabled):visible a");if(n.length){var s=n.index(t.target);38==t.which&&0<s&&s--,40==t.which&&s<n.length-1&&s++,~s||(s=0),n.eq(s).trigger("focus")}}}};var t=a.fn.dropdown;a.fn.dropdown=function e(i){return this.each(function(){var t=a(this),e=t.data("bs.dropdown");e||t.data("bs.dropdown",e=new o(this)),"string"==typeof i&&e[i].call(t)})},a.fn.dropdown.Constructor=o,a.fn.dropdown.noConflict=function(){return a.fn.dropdown=t,this},a(document).on("click.bs.dropdown.data-api",s).on("click.bs.dropdown.data-api",".dropdown form",function(t){t.stopPropagation()}).on("click.bs.dropdown.data-api",r,o.prototype.toggle).on("keydown.bs.dropdown.data-api",r,o.prototype.keydown).on("keydown.bs.dropdown.data-api",".dropdown-menu",o.prototype.keydown)}(jQuery),function(a){"use strict";var s=function(t,e){this.options=e,this.$body=a(document.body),this.$element=a(t),this.$dialog=this.$element.find(".modal-dialog"),this.$backdrop=null,this.isShown=null,this.originalBodyPad=null,this.scrollbarWidth=0,this.ignoreBackdropClick=!1,this.fixedContent=".navbar-fixed-top, .navbar-fixed-bottom",this.options.remote&&this.$element.find(".modal-content").load(this.options.remote,a.proxy(function(){this.$element.trigger("loaded.bs.modal")},this))};function r(o,n){return this.each(function(){var t=a(this),e=t.data("bs.modal"),i=a.extend({},s.DEFAULTS,t.data(),"object"==typeof o&&o);e||t.data("bs.modal",e=new s(this,i)),"string"==typeof o?e[o](n):i.show&&e.show(n)})}s.VERSION="3.4.1",s.TRANSITION_DURATION=300,s.BACKDROP_TRANSITION_DURATION=150,s.DEFAULTS={backdrop:!0,keyboard:!0,show:!0},s.prototype.toggle=function(t){return this.isShown?this.hide():this.show(t)},s.prototype.show=function(i){var o=this,t=a.Event("show.bs.modal",{relatedTarget:i});this.$element.trigger(t),this.isShown||t.isDefaultPrevented()||(this.isShown=!0,this.checkScrollbar(),this.setScrollbar(),this.$body.addClass("modal-open"),this.escape(),this.resize(),this.$element.on("click.dismiss.bs.modal",'[data-dismiss="modal"]',a.proxy(this.hide,this)),this.$dialog.on("mousedown.dismiss.bs.modal",function(){o.$element.one("mouseup.dismiss.bs.modal",function(t){a(t.target).is(o.$element)&&(o.ignoreBackdropClick=!0)})}),this.backdrop(function(){var t=a.support.transition&&o.$element.hasClass("fade");o.$element.parent().length||o.$element.appendTo(o.$body),o.$element.show().scrollTop(0),o.adjustDialog(),t&&o.$element[0].offsetWidth,o.$element.addClass("in"),o.enforceFocus();var e=a.Event("shown.bs.modal",{relatedTarget:i});t?o.$dialog.one("bsTransitionEnd",function(){o.$element.trigger("focus").trigger(e)}).emulateTransitionEnd(s.TRANSITION_DURATION):o.$element.trigger("focus").trigger(e)}))},s.prototype.hide=function(t){t&&t.preventDefault(),t=a.Event("hide.bs.modal"),this.$element.trigger(t),this.isShown&&!t.isDefaultPrevented()&&(this.isShown=!1,this.escape(),this.resize(),a(document).off("focusin.bs.modal"),this.$element.removeClass("in").off("click.dismiss.bs.modal").off("mouseup.dismiss.bs.modal"),this.$dialog.off("mousedown.dismiss.bs.modal"),a.support.transition&&this.$element.hasClass("fade")?this.$element.one("bsTransitionEnd",a.proxy(this.hideModal,this)).emulateTransitionEnd(s.TRANSITION_DURATION):this.hideModal())},s.prototype.enforceFocus=function(){a(document).off("focusin.bs.modal").on("focusin.bs.modal",a.proxy(function(t){document===t.target||this.$element[0]===t.target||this.$element.has(t.target).length||this.$element.trigger("focus")},this))},s.prototype.escape=function(){this.isShown&&this.options.keyboard?this.$element.on("keydown.dismiss.bs.modal",a.proxy(function(t){27==t.which&&this.hide()},this)):this.isShown||this.$element.off("keydown.dismiss.bs.modal")},s.prototype.resize=function(){this.isShown?a(window).on("resize.bs.modal",a.proxy(this.handleUpdate,this)):a(window).off("resize.bs.modal")},s.prototype.hideModal=function(){var t=this;this.$element.hide(),this.backdrop(function(){t.$body.removeClass("modal-open"),t.resetAdjustments(),t.resetScrollbar(),t.$element.trigger("hidden.bs.modal")})},s.prototype.removeBackdrop=function(){this.$backdrop&&this.$backdrop.remove(),this.$backdrop=null},s.prototype.backdrop=function(t){var e=this,i=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var o=a.support.transition&&i;if(this.$backdrop=a(document.createElement("div")).addClass("modal-backdrop "+i).appendTo(this.$body),this.$element.on("click.dismiss.bs.modal",a.proxy(function(t){this.ignoreBackdropClick?this.ignoreBackdropClick=!1:t.target===t.currentTarget&&("static"==this.options.backdrop?this.$element[0].focus():this.hide())},this)),o&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),!t)return;o?this.$backdrop.one("bsTransitionEnd",t).emulateTransitionEnd(s.BACKDROP_TRANSITION_DURATION):t()}else if(!this.isShown&&this.$backdrop){this.$backdrop.removeClass("in");var n=function(){e.removeBackdrop(),t&&t()};a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one("bsTransitionEnd",n).emulateTransitionEnd(s.BACKDROP_TRANSITION_DURATION):n()}else t&&t()},s.prototype.handleUpdate=function(){this.adjustDialog()},s.prototype.adjustDialog=function(){var t=this.$element[0].scrollHeight>document.documentElement.clientHeight;this.$element.css({paddingLeft:!this.bodyIsOverflowing&&t?this.scrollbarWidth:"",paddingRight:this.bodyIsOverflowing&&!t?this.scrollbarWidth:""})},s.prototype.resetAdjustments=function(){this.$element.css({paddingLeft:"",paddingRight:""})},s.prototype.checkScrollbar=function(){var t=window.innerWidth;if(!t){var e=document.documentElement.getBoundingClientRect();t=e.right-Math.abs(e.left)}this.bodyIsOverflowing=document.body.clientWidth<t,this.scrollbarWidth=this.measureScrollbar()},s.prototype.setScrollbar=function(){var t=parseInt(this.$body.css("padding-right")||0,10);this.originalBodyPad=document.body.style.paddingRight||"";var n=this.scrollbarWidth;this.bodyIsOverflowing&&(this.$body.css("padding-right",t+n),a(this.fixedContent).each(function(t,e){var i=e.style.paddingRight,o=a(e).css("padding-right");a(e).data("padding-right",i).css("padding-right",parseFloat(o)+n+"px")}))},s.prototype.resetScrollbar=function(){this.$body.css("padding-right",this.originalBodyPad),a(this.fixedContent).each(function(t,e){var i=a(e).data("padding-right");a(e).removeData("padding-right"),e.style.paddingRight=i||""})},s.prototype.measureScrollbar=function(){var t=document.createElement("div");t.className="modal-scrollbar-measure",this.$body.append(t);var e=t.offsetWidth-t.clientWidth;return this.$body[0].removeChild(t),e};var t=a.fn.modal;a.fn.modal=r,a.fn.modal.Constructor=s,a.fn.modal.noConflict=function(){return a.fn.modal=t,this},a(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(t){var e=a(this),i=e.attr("href"),o=e.attr("data-target")||i&&i.replace(/.*(?=#[^\s]+$)/,""),n=a(document).find(o),s=n.data("bs.modal")?"toggle":a.extend({remote:!/#/.test(i)&&i},n.data(),e.data());e.is("a")&&t.preventDefault(),n.one("show.bs.modal",function(t){t.isDefaultPrevented()||n.one("hidden.bs.modal",function(){e.is(":visible")&&e.trigger("focus")})}),r.call(n,s,this)})}(jQuery),function(g){"use strict";var o=["sanitize","whiteList","sanitizeFn"],a=["background","cite","href","itemtype","longdesc","poster","src","xlink:href"],t={"*":["class","dir","id","lang","role",/^aria-[\w-]*$/i],a:["target","href","title","rel"],area:[],b:[],br:[],col:[],code:[],div:[],em:[],hr:[],h1:[],h2:[],h3:[],h4:[],h5:[],h6:[],i:[],img:["src","alt","title","width","height"],li:[],ol:[],p:[],pre:[],s:[],small:[],span:[],sub:[],sup:[],strong:[],u:[],ul:[]},r=/^(?:(?:https?|mailto|ftp|tel|file):|[^&:/?#]*(?:[/?#]|$))/gi,l=/^data:(?:image\/(?:bmp|gif|jpeg|jpg|png|tiff|webp)|video\/(?:mpeg|mp4|ogg|webm)|audio\/(?:mp3|oga|ogg|opus));base64,[a-z0-9+/]+=*$/i;function u(t,e){var i=t.nodeName.toLowerCase();if(-1!==g.inArray(i,e))return-1===g.inArray(i,a)||Boolean(t.nodeValue.match(r)||t.nodeValue.match(l));for(var o=g(e).filter(function(t,e){return e instanceof RegExp}),n=0,s=o.length;n<s;n++)if(i.match(o[n]))return!0;return!1}function n(t,e,i){if(0===t.length)return t;if(i&&"function"==typeof i)return i(t);if(!document.implementation||!document.implementation.createHTMLDocument)return t;var o=document.implementation.createHTMLDocument("sanitization");o.body.innerHTML=t;for(var n=g.map(e,function(t,e){return e}),s=g(o.body).find("*"),a=0,r=s.length;a<r;a++){var l=s[a],h=l.nodeName.toLowerCase();if(-1!==g.inArray(h,n))for(var d=g.map(l.attributes,function(t){return t}),p=[].concat(e["*"]||[],e[h]||[]),c=0,f=d.length;c<f;c++)u(d[c],p)||l.removeAttribute(d[c].nodeName);else l.parentNode.removeChild(l)}return o.body.innerHTML}var m=function(t,e){this.type=null,this.options=null,this.enabled=null,this.timeout=null,this.hoverState=null,this.$element=null,this.inState=null,this.init("tooltip",t,e)};m.VERSION="3.4.1",m.TRANSITION_DURATION=150,m.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!1,container:!1,viewport:{selector:"body",padding:0},sanitize:!0,sanitizeFn:null,whiteList:t},m.prototype.init=function(t,e,i){if(this.enabled=!0,this.type=t,this.$element=g(e),this.options=this.getOptions(i),this.$viewport=this.options.viewport&&g(document).find(g.isFunction(this.options.viewport)?this.options.viewport.call(this,this.$element):this.options.viewport.selector||this.options.viewport),this.inState={click:!1,hover:!1,focus:!1},this.$element[0]instanceof document.constructor&&!this.options.selector)throw new Error("`selector` option must be specified when initializing "+this.type+" on the window.document object!");for(var o=this.options.trigger.split(" "),n=o.length;n--;){var s=o[n];if("click"==s)this.$element.on("click."+this.type,this.options.selector,g.proxy(this.toggle,this));else if("manual"!=s){var a="hover"==s?"mouseenter":"focusin",r="hover"==s?"mouseleave":"focusout";this.$element.on(a+"."+this.type,this.options.selector,g.proxy(this.enter,this)),this.$element.on(r+"."+this.type,this.options.selector,g.proxy(this.leave,this))}}this.options.selector?this._options=g.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},m.prototype.getDefaults=function(){return m.DEFAULTS},m.prototype.getOptions=function(t){var e=this.$element.data();for(var i in e)e.hasOwnProperty(i)&&-1!==g.inArray(i,o)&&delete e[i];return(t=g.extend({},this.getDefaults(),e,t)).delay&&"number"==typeof t.delay&&(t.delay={show:t.delay,hide:t.delay}),t.sanitize&&(t.template=n(t.template,t.whiteList,t.sanitizeFn)),t},m.prototype.getDelegateOptions=function(){var i={},o=this.getDefaults();return this._options&&g.each(this._options,function(t,e){o[t]!=e&&(i[t]=e)}),i},m.prototype.enter=function(t){var e=t instanceof this.constructor?t:g(t.currentTarget).data("bs."+this.type);if(e||(e=new this.constructor(t.currentTarget,this.getDelegateOptions()),g(t.currentTarget).data("bs."+this.type,e)),t instanceof g.Event&&(e.inState["focusin"==t.type?"focus":"hover"]=!0),e.tip().hasClass("in")||"in"==e.hoverState)e.hoverState="in";else{if(clearTimeout(e.timeout),e.hoverState="in",!e.options.delay||!e.options.delay.show)return e.show();e.timeout=setTimeout(function(){"in"==e.hoverState&&e.show()},e.options.delay.show)}},m.prototype.isInStateTrue=function(){for(var t in this.inState)if(this.inState[t])return!0;return!1},m.prototype.leave=function(t){var e=t instanceof this.constructor?t:g(t.currentTarget).data("bs."+this.type);if(e||(e=new this.constructor(t.currentTarget,this.getDelegateOptions()),g(t.currentTarget).data("bs."+this.type,e)),t instanceof g.Event&&(e.inState["focusout"==t.type?"focus":"hover"]=!1),!e.isInStateTrue()){if(clearTimeout(e.timeout),e.hoverState="out",!e.options.delay||!e.options.delay.hide)return e.hide();e.timeout=setTimeout(function(){"out"==e.hoverState&&e.hide()},e.options.delay.hide)}},m.prototype.show=function(){var t=g.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(t);var e=g.contains(this.$element[0].ownerDocument.documentElement,this.$element[0]);if(t.isDefaultPrevented()||!e)return;var i=this,o=this.tip(),n=this.getUID(this.type);this.setContent(),o.attr("id",n),this.$element.attr("aria-describedby",n),this.options.animation&&o.addClass("fade");var s="function"==typeof this.options.placement?this.options.placement.call(this,o[0],this.$element[0]):this.options.placement,a=/\s?auto?\s?/i,r=a.test(s);r&&(s=s.replace(a,"")||"top"),o.detach().css({top:0,left:0,display:"block"}).addClass(s).data("bs."+this.type,this),this.options.container?o.appendTo(g(document).find(this.options.container)):o.insertAfter(this.$element),this.$element.trigger("inserted.bs."+this.type);var l=this.getPosition(),h=o[0].offsetWidth,d=o[0].offsetHeight;if(r){var p=s,c=this.getPosition(this.$viewport);s="bottom"==s&&l.bottom+d>c.bottom?"top":"top"==s&&l.top-d<c.top?"bottom":"right"==s&&l.right+h>c.width?"left":"left"==s&&l.left-h<c.left?"right":s,o.removeClass(p).addClass(s)}var f=this.getCalculatedOffset(s,l,h,d);this.applyPlacement(f,s);var u=function(){var t=i.hoverState;i.$element.trigger("shown.bs."+i.type),i.hoverState=null,"out"==t&&i.leave(i)};g.support.transition&&this.$tip.hasClass("fade")?o.one("bsTransitionEnd",u).emulateTransitionEnd(m.TRANSITION_DURATION):u()}},m.prototype.applyPlacement=function(t,e){var i=this.tip(),o=i[0].offsetWidth,n=i[0].offsetHeight,s=parseInt(i.css("margin-top"),10),a=parseInt(i.css("margin-left"),10);isNaN(s)&&(s=0),isNaN(a)&&(a=0),t.top+=s,t.left+=a,g.offset.setOffset(i[0],g.extend({using:function(t){i.css({top:Math.round(t.top),left:Math.round(t.left)})}},t),0),i.addClass("in");var r=i[0].offsetWidth,l=i[0].offsetHeight;"top"==e&&l!=n&&(t.top=t.top+n-l);var h=this.getViewportAdjustedDelta(e,t,r,l);h.left?t.left+=h.left:t.top+=h.top;var d=/top|bottom/.test(e),p=d?2*h.left-o+r:2*h.top-n+l,c=d?"offsetWidth":"offsetHeight";i.offset(t),this.replaceArrow(p,i[0][c],d)},m.prototype.replaceArrow=function(t,e,i){this.arrow().css(i?"left":"top",50*(1-t/e)+"%").css(i?"top":"left","")},m.prototype.setContent=function(){var t=this.tip(),e=this.getTitle();this.options.html?(this.options.sanitize&&(e=n(e,this.options.whiteList,this.options.sanitizeFn)),t.find(".tooltip-inner").html(e)):t.find(".tooltip-inner").text(e),t.removeClass("fade in top bottom left right")},m.prototype.hide=function(t){var e=this,i=g(this.$tip),o=g.Event("hide.bs."+this.type);function n(){"in"!=e.hoverState&&i.detach(),e.$element&&e.$element.removeAttr("aria-describedby").trigger("hidden.bs."+e.type),t&&t()}if(this.$element.trigger(o),!o.isDefaultPrevented())return i.removeClass("in"),g.support.transition&&i.hasClass("fade")?i.one("bsTransitionEnd",n).emulateTransitionEnd(m.TRANSITION_DURATION):n(),this.hoverState=null,this},m.prototype.fixTitle=function(){var t=this.$element;(t.attr("title")||"string"!=typeof t.attr("data-original-title"))&&t.attr("data-original-title",t.attr("title")||"").attr("title","")},m.prototype.hasContent=function(){return this.getTitle()},m.prototype.getPosition=function(t){var e=(t=t||this.$element)[0],i="BODY"==e.tagName,o=e.getBoundingClientRect();null==o.width&&(o=g.extend({},o,{width:o.right-o.left,height:o.bottom-o.top}));var n=window.SVGElement&&e instanceof window.SVGElement,s=i?{top:0,left:0}:n?null:t.offset(),a={scroll:i?document.documentElement.scrollTop||document.body.scrollTop:t.scrollTop()},r=i?{width:g(window).width(),height:g(window).height()}:null;return g.extend({},o,a,r,s)},m.prototype.getCalculatedOffset=function(t,e,i,o){return"bottom"==t?{top:e.top+e.height,left:e.left+e.width/2-i/2}:"top"==t?{top:e.top-o,left:e.left+e.width/2-i/2}:"left"==t?{top:e.top+e.height/2-o/2,left:e.left-i}:{top:e.top+e.height/2-o/2,left:e.left+e.width}},m.prototype.getViewportAdjustedDelta=function(t,e,i,o){var n={top:0,left:0};if(!this.$viewport)return n;var s=this.options.viewport&&this.options.viewport.padding||0,a=this.getPosition(this.$viewport);if(/right|left/.test(t)){var r=e.top-s-a.scroll,l=e.top+s-a.scroll+o;r<a.top?n.top=a.top-r:l>a.top+a.height&&(n.top=a.top+a.height-l)}else{var h=e.left-s,d=e.left+s+i;h<a.left?n.left=a.left-h:d>a.right&&(n.left=a.left+a.width-d)}return n},m.prototype.getTitle=function(){var t=this.$element,e=this.options;return t.attr("data-original-title")||("function"==typeof e.title?e.title.call(t[0]):e.title)},m.prototype.getUID=function(t){for(;t+=~~(1e6*Math.random()),document.getElementById(t););return t},m.prototype.tip=function(){if(!this.$tip&&(this.$tip=g(this.options.template),1!=this.$tip.length))throw new Error(this.type+" `template` option must consist of exactly 1 top-level element!");return this.$tip},m.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},m.prototype.enable=function(){this.enabled=!0},m.prototype.disable=function(){this.enabled=!1},m.prototype.toggleEnabled=function(){this.enabled=!this.enabled},m.prototype.toggle=function(t){var e=this;t&&((e=g(t.currentTarget).data("bs."+this.type))||(e=new this.constructor(t.currentTarget,this.getDelegateOptions()),g(t.currentTarget).data("bs."+this.type,e))),t?(e.inState.click=!e.inState.click,e.isInStateTrue()?e.enter(e):e.leave(e)):e.tip().hasClass("in")?e.leave(e):e.enter(e)},m.prototype.destroy=function(){var t=this;clearTimeout(this.timeout),this.hide(function(){t.$element.off("."+t.type).removeData("bs."+t.type),t.$tip&&t.$tip.detach(),t.$tip=null,t.$arrow=null,t.$viewport=null,t.$element=null})},m.prototype.sanitizeHtml=function(t){return n(t,this.options.whiteList,this.options.sanitizeFn)};var e=g.fn.tooltip;g.fn.tooltip=function i(o){return this.each(function(){var t=g(this),e=t.data("bs.tooltip"),i="object"==typeof o&&o;!e&&/destroy|hide/.test(o)||(e||t.data("bs.tooltip",e=new m(this,i)),"string"==typeof o&&e[o]())})},g.fn.tooltip.Constructor=m,g.fn.tooltip.noConflict=function(){return g.fn.tooltip=e,this}}(jQuery),function(n){"use strict";var s=function(t,e){this.init("popover",t,e)};if(!n.fn.tooltip)throw new Error("Popover requires tooltip.js");s.VERSION="3.4.1",s.DEFAULTS=n.extend({},n.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:'<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'}),((s.prototype=n.extend({},n.fn.tooltip.Constructor.prototype)).constructor=s).prototype.getDefaults=function(){return s.DEFAULTS},s.prototype.setContent=function(){var t=this.tip(),e=this.getTitle(),i=this.getContent();if(this.options.html){var o=typeof i;this.options.sanitize&&(e=this.sanitizeHtml(e),"string"===o&&(i=this.sanitizeHtml(i))),t.find(".popover-title").html(e),t.find(".popover-content").children().detach().end()["string"===o?"html":"append"](i)}else t.find(".popover-title").text(e),t.find(".popover-content").children().detach().end().text(i);t.removeClass("fade top bottom left right in"),t.find(".popover-title").html()||t.find(".popover-title").hide()},s.prototype.hasContent=function(){return this.getTitle()||this.getContent()},s.prototype.getContent=function(){var t=this.$element,e=this.options;return t.attr("data-content")||("function"==typeof e.content?e.content.call(t[0]):e.content)},s.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")};var t=n.fn.popover;n.fn.popover=function e(o){return this.each(function(){var t=n(this),e=t.data("bs.popover"),i="object"==typeof o&&o;!e&&/destroy|hide/.test(o)||(e||t.data("bs.popover",e=new s(this,i)),"string"==typeof o&&e[o]())})},n.fn.popover.Constructor=s,n.fn.popover.noConflict=function(){return n.fn.popover=t,this}}(jQuery),function(s){"use strict";function n(t,e){this.$body=s(document.body),this.$scrollElement=s(t).is(document.body)?s(window):s(t),this.options=s.extend({},n.DEFAULTS,e),this.selector=(this.options.target||"")+" .nav li > a",this.offsets=[],this.targets=[],this.activeTarget=null,this.scrollHeight=0,this.$scrollElement.on("scroll.bs.scrollspy",s.proxy(this.process,this)),this.refresh(),this.process()}function e(o){return this.each(function(){var t=s(this),e=t.data("bs.scrollspy"),i="object"==typeof o&&o;e||t.data("bs.scrollspy",e=new n(this,i)),"string"==typeof o&&e[o]()})}n.VERSION="3.4.1",n.DEFAULTS={offset:10},n.prototype.getScrollHeight=function(){return this.$scrollElement[0].scrollHeight||Math.max(this.$body[0].scrollHeight,document.documentElement.scrollHeight)},n.prototype.refresh=function(){var t=this,o="offset",n=0;this.offsets=[],this.targets=[],this.scrollHeight=this.getScrollHeight(),s.isWindow(this.$scrollElement[0])||(o="position",n=this.$scrollElement.scrollTop()),this.$body.find(this.selector).map(function(){var t=s(this),e=t.data("target")||t.attr("href"),i=/^#./.test(e)&&s(e);return i&&i.length&&i.is(":visible")&&[[i[o]().top+n,e]]||null}).sort(function(t,e){return t[0]-e[0]}).each(function(){t.offsets.push(this[0]),t.targets.push(this[1])})},n.prototype.process=function(){var t,e=this.$scrollElement.scrollTop()+this.options.offset,i=this.getScrollHeight(),o=this.options.offset+i-this.$scrollElement.height(),n=this.offsets,s=this.targets,a=this.activeTarget;if(this.scrollHeight!=i&&this.refresh(),o<=e)return a!=(t=s[s.length-1])&&this.activate(t);if(a&&e<n[0])return this.activeTarget=null,this.clear();for(t=n.length;t--;)a!=s[t]&&e>=n[t]&&(n[t+1]===undefined||e<n[t+1])&&this.activate(s[t])},n.prototype.activate=function(t){this.activeTarget=t,this.clear();var e=this.selector+'[data-target="'+t+'"],'+this.selector+'[href="'+t+'"]',i=s(e).parents("li").addClass("active");i.parent(".dropdown-menu").length&&(i=i.closest("li.dropdown").addClass("active")),i.trigger("activate.bs.scrollspy")},n.prototype.clear=function(){s(this.selector).parentsUntil(this.options.target,".active").removeClass("active")};var t=s.fn.scrollspy;s.fn.scrollspy=e,s.fn.scrollspy.Constructor=n,s.fn.scrollspy.noConflict=function(){return s.fn.scrollspy=t,this},s(window).on("load.bs.scrollspy.data-api",function(){s('[data-spy="scroll"]').each(function(){var t=s(this);e.call(t,t.data())})})}(jQuery),function(r){"use strict";var a=function(t){this.element=r(t)};function e(i){return this.each(function(){var t=r(this),e=t.data("bs.tab");e||t.data("bs.tab",e=new a(this)),"string"==typeof i&&e[i]()})}a.VERSION="3.4.1",a.TRANSITION_DURATION=150,a.prototype.show=function(){var t=this.element,e=t.closest("ul:not(.dropdown-menu)"),i=t.data("target");if(i||(i=(i=t.attr("href"))&&i.replace(/.*(?=#[^\s]*$)/,"")),!t.parent("li").hasClass("active")){var o=e.find(".active:last a"),n=r.Event("hide.bs.tab",{relatedTarget:t[0]}),s=r.Event("show.bs.tab",{relatedTarget:o[0]});if(o.trigger(n),t.trigger(s),!s.isDefaultPrevented()&&!n.isDefaultPrevented()){var a=r(document).find(i);this.activate(t.closest("li"),e),this.activate(a,a.parent(),function(){o.trigger({type:"hidden.bs.tab",relatedTarget:t[0]}),t.trigger({type:"shown.bs.tab",relatedTarget:o[0]})})}}},a.prototype.activate=function(t,e,i){var o=e.find("> .active"),n=i&&r.support.transition&&(o.length&&o.hasClass("fade")||!!e.find("> .fade").length);function s(){o.removeClass("active").find("> .dropdown-menu > .active").removeClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!1),t.addClass("active").find('[data-toggle="tab"]').attr("aria-expanded",!0),n?(t[0].offsetWidth,t.addClass("in")):t.removeClass("fade"),t.parent(".dropdown-menu").length&&t.closest("li.dropdown").addClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!0),i&&i()}o.length&&n?o.one("bsTransitionEnd",s).emulateTransitionEnd(a.TRANSITION_DURATION):s(),o.removeClass("in")};var t=r.fn.tab;r.fn.tab=e,r.fn.tab.Constructor=a,r.fn.tab.noConflict=function(){return r.fn.tab=t,this};var i=function(t){t.preventDefault(),e.call(r(this),"show")};r(document).on("click.bs.tab.data-api",'[data-toggle="tab"]',i).on("click.bs.tab.data-api",'[data-toggle="pill"]',i)}(jQuery),function(l){"use strict";var h=function(t,e){this.options=l.extend({},h.DEFAULTS,e);var i=this.options.target===h.DEFAULTS.target?l(this.options.target):l(document).find(this.options.target);this.$target=i.on("scroll.bs.affix.data-api",l.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",l.proxy(this.checkPositionWithEventLoop,this)),this.$element=l(t),this.affixed=null,this.unpin=null,this.pinnedOffset=null,this.checkPosition()};function i(o){return this.each(function(){var t=l(this),e=t.data("bs.affix"),i="object"==typeof o&&o;e||t.data("bs.affix",e=new h(this,i)),"string"==typeof o&&e[o]()})}h.VERSION="3.4.1",h.RESET="affix affix-top affix-bottom",h.DEFAULTS={offset:0,target:window},h.prototype.getState=function(t,e,i,o){var n=this.$target.scrollTop(),s=this.$element.offset(),a=this.$target.height();if(null!=i&&"top"==this.affixed)return n<i&&"top";if("bottom"==this.affixed)return null!=i?!(n+this.unpin<=s.top)&&"bottom":!(n+a<=t-o)&&"bottom";var r=null==this.affixed,l=r?n:s.top;return null!=i&&n<=i?"top":null!=o&&t-o<=l+(r?a:e)&&"bottom"},h.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset;this.$element.removeClass(h.RESET).addClass("affix");var t=this.$target.scrollTop(),e=this.$element.offset();return this.pinnedOffset=e.top-t},h.prototype.checkPositionWithEventLoop=function(){setTimeout(l.proxy(this.checkPosition,this),1)},h.prototype.checkPosition=function(){if(this.$element.is(":visible")){var t=this.$element.height(),e=this.options.offset,i=e.top,o=e.bottom,n=Math.max(l(document).height(),l(document.body).height());"object"!=typeof e&&(o=i=e),"function"==typeof i&&(i=e.top(this.$element)),"function"==typeof o&&(o=e.bottom(this.$element));var s=this.getState(n,t,i,o);if(this.affixed!=s){null!=this.unpin&&this.$element.css("top","");var a="affix"+(s?"-"+s:""),r=l.Event(a+".bs.affix");if(this.$element.trigger(r),r.isDefaultPrevented())return;this.affixed=s,this.unpin="bottom"==s?this.getPinnedOffset():null,this.$element.removeClass(h.RESET).addClass(a).trigger(a.replace("affix","affixed")+".bs.affix")}"bottom"==s&&this.$element.offset({top:n-t-o})}};var t=l.fn.affix;l.fn.affix=i,l.fn.affix.Constructor=h,l.fn.affix.noConflict=function(){return l.fn.affix=t,this},l(window).on("load",function(){l('[data-spy="affix"]').each(function(){var t=l(this),e=t.data();e.offset=e.offset||{},null!=e.offsetBottom&&(e.offset.bottom=e.offsetBottom),null!=e.offsetTop&&(e.offset.top=e.offsetTop),i.call(t,e)})})}(jQuery);
\ No newline at end of file
+if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");!function(t){"use strict";var e=jQuery.fn.jquery.split(" ")[0].split(".");if(e[0]<2&&e[1]<9||1==e[0]&&9==e[1]&&e[2]<1||3<e[0])throw new Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher, but lower than version 4")}(),function(n){"use strict";n.fn.emulateTransitionEnd=function(t){var e=!1,i=this;n(this).one("bsTransitionEnd",function(){e=!0});return setTimeout(function(){e||n(i).trigger(n.support.transition.end)},t),this},n(function(){n.support.transition=function o(){var t=document.createElement("bootstrap"),e={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var i in e)if(t.style[i]!==undefined)return{end:e[i]};return!1}(),n.support.transition&&(n.event.special.bsTransitionEnd={bindType:n.support.transition.end,delegateType:n.support.transition.end,handle:function(t){if(n(t.target).is(this))return t.handleObj.handler.apply(this,arguments)}})})}(jQuery),function(s){"use strict";var e='[data-dismiss="alert"]',a=function(t){s(t).on("click",e,this.close)};a.VERSION="3.4.1",a.TRANSITION_DURATION=150,a.prototype.close=function(t){var e=s(this),i=e.attr("data-target");i||(i=(i=e.attr("href"))&&i.replace(/.*(?=#[^\s]*$)/,"")),i="#"===i?[]:i;var o=s(document).find(i);function n(){o.detach().trigger("closed.bs.alert").remove()}t&&t.preventDefault(),o.length||(o=e.closest(".alert")),o.trigger(t=s.Event("close.bs.alert")),t.isDefaultPrevented()||(o.removeClass("in"),s.support.transition&&o.hasClass("fade")?o.one("bsTransitionEnd",n).emulateTransitionEnd(a.TRANSITION_DURATION):n())};var t=s.fn.alert;s.fn.alert=function o(i){return this.each(function(){var t=s(this),e=t.data("bs.alert");e||t.data("bs.alert",e=new a(this)),"string"==typeof i&&e[i].call(t)})},s.fn.alert.Constructor=a,s.fn.alert.noConflict=function(){return s.fn.alert=t,this},s(document).on("click.bs.alert.data-api",e,a.prototype.close)}(jQuery),function(s){"use strict";var n=function(t,e){this.$element=s(t),this.options=s.extend({},n.DEFAULTS,e),this.isLoading=!1};function i(o){return this.each(function(){var t=s(this),e=t.data("bs.button"),i="object"==typeof o&&o;e||t.data("bs.button",e=new n(this,i)),"toggle"==o?e.toggle():o&&e.setState(o)})}n.VERSION="3.4.1",n.DEFAULTS={loadingText:"loading..."},n.prototype.setState=function(t){var e="disabled",i=this.$element,o=i.is("input")?"val":"html",n=i.data();t+="Text",null==n.resetText&&i.data("resetText",i[o]()),setTimeout(s.proxy(function(){i[o](null==n[t]?this.options[t]:n[t]),"loadingText"==t?(this.isLoading=!0,i.addClass(e).attr(e,e).prop(e,!0)):this.isLoading&&(this.isLoading=!1,i.removeClass(e).removeAttr(e).prop(e,!1))},this),0)},n.prototype.toggle=function(){var t=!0,e=this.$element.closest('[data-toggle="buttons"]');if(e.length){var i=this.$element.find("input");"radio"==i.prop("type")?(i.prop("checked")&&(t=!1),e.find(".active").removeClass("active"),this.$element.addClass("active")):"checkbox"==i.prop("type")&&(i.prop("checked")!==this.$element.hasClass("active")&&(t=!1),this.$element.toggleClass("active")),i.prop("checked",this.$element.hasClass("active")),t&&i.trigger("change")}else this.$element.attr("aria-pressed",!this.$element.hasClass("active")),this.$element.toggleClass("active")};var t=s.fn.button;s.fn.button=i,s.fn.button.Constructor=n,s.fn.button.noConflict=function(){return s.fn.button=t,this},s(document).on("click.bs.button.data-api",'[data-toggle^="button"]',function(t){var e=s(t.target).closest(".btn");i.call(e,"toggle"),s(t.target).is('input[type="radio"], input[type="checkbox"]')||(t.preventDefault(),e.is("input,button")?e.trigger("focus"):e.find("input:visible,button:visible").first().trigger("focus"))}).on("focus.bs.button.data-api blur.bs.button.data-api",'[data-toggle^="button"]',function(t){s(t.target).closest(".btn").toggleClass("focus",/^focus(in)?$/.test(t.type))})}(jQuery),function(p){"use strict";var c=function(t,e){this.$element=p(t),this.$indicators=this.$element.find(".carousel-indicators"),this.options=e,this.paused=null,this.sliding=null,this.interval=null,this.$active=null,this.$items=null,this.options.keyboard&&this.$element.on("keydown.bs.carousel",p.proxy(this.keydown,this)),"hover"==this.options.pause&&!("ontouchstart"in document.documentElement)&&this.$element.on("mouseenter.bs.carousel",p.proxy(this.pause,this)).on("mouseleave.bs.carousel",p.proxy(this.cycle,this))};function r(n){return this.each(function(){var t=p(this),e=t.data("bs.carousel"),i=p.extend({},c.DEFAULTS,t.data(),"object"==typeof n&&n),o="string"==typeof n?n:i.slide;e||t.data("bs.carousel",e=new c(this,i)),"number"==typeof n?e.to(n):o?e[o]():i.interval&&e.pause().cycle()})}c.VERSION="3.4.1",c.TRANSITION_DURATION=600,c.DEFAULTS={interval:5e3,pause:"hover",wrap:!0,keyboard:!0},c.prototype.keydown=function(t){if(!/input|textarea/i.test(t.target.tagName)){switch(t.which){case 37:this.prev();break;case 39:this.next();break;default:return}t.preventDefault()}},c.prototype.cycle=function(t){return t||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(p.proxy(this.next,this),this.options.interval)),this},c.prototype.getItemIndex=function(t){return this.$items=t.parent().children(".item"),this.$items.index(t||this.$active)},c.prototype.getItemForDirection=function(t,e){var i=this.getItemIndex(e);if(("prev"==t&&0===i||"next"==t&&i==this.$items.length-1)&&!this.options.wrap)return e;var o=(i+("prev"==t?-1:1))%this.$items.length;return this.$items.eq(o)},c.prototype.to=function(t){var e=this,i=this.getItemIndex(this.$active=this.$element.find(".item.active"));if(!(t>this.$items.length-1||t<0))return this.sliding?this.$element.one("slid.bs.carousel",function(){e.to(t)}):i==t?this.pause().cycle():this.slide(i<t?"next":"prev",this.$items.eq(t))},c.prototype.pause=function(t){return t||(this.paused=!0),this.$element.find(".next, .prev").length&&p.support.transition&&(this.$element.trigger(p.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},c.prototype.next=function(){if(!this.sliding)return this.slide("next")},c.prototype.prev=function(){if(!this.sliding)return this.slide("prev")},c.prototype.slide=function(t,e){var i=this.$element.find(".item.active"),o=e||this.getItemForDirection(t,i),n=this.interval,s="next"==t?"left":"right",a=this;if(o.hasClass("active"))return this.sliding=!1;var r=o[0],l=p.Event("slide.bs.carousel",{relatedTarget:r,direction:s});if(this.$element.trigger(l),!l.isDefaultPrevented()){if(this.sliding=!0,n&&this.pause(),this.$indicators.length){this.$indicators.find(".active").removeClass("active");var h=p(this.$indicators.children()[this.getItemIndex(o)]);h&&h.addClass("active")}var d=p.Event("slid.bs.carousel",{relatedTarget:r,direction:s});return p.support.transition&&this.$element.hasClass("slide")?(o.addClass(t),"object"==typeof o&&o.length&&o[0].offsetWidth,i.addClass(s),o.addClass(s),i.one("bsTransitionEnd",function(){o.removeClass([t,s].join(" ")).addClass("active"),i.removeClass(["active",s].join(" ")),a.sliding=!1,setTimeout(function(){a.$element.trigger(d)},0)}).emulateTransitionEnd(c.TRANSITION_DURATION)):(i.removeClass("active"),o.addClass("active"),this.sliding=!1,this.$element.trigger(d)),n&&this.cycle(),this}};var t=p.fn.carousel;p.fn.carousel=r,p.fn.carousel.Constructor=c,p.fn.carousel.noConflict=function(){return p.fn.carousel=t,this};var e=function(t){var e=p(this),i=e.attr("href");i&&(i=i.replace(/.*(?=#[^\s]+$)/,""));var o=e.attr("data-target")||i,n=p(document).find(o);if(n.hasClass("carousel")){var s=p.extend({},n.data(),e.data()),a=e.attr("data-slide-to");a&&(s.interval=!1),r.call(n,s),a&&n.data("bs.carousel").to(a),t.preventDefault()}};p(document).on("click.bs.carousel.data-api","[data-slide]",e).on("click.bs.carousel.data-api","[data-slide-to]",e),p(window).on("load",function(){p('[data-ride="carousel"]').each(function(){var t=p(this);r.call(t,t.data())})})}(jQuery),function(a){"use strict";var r=function(t,e){this.$element=a(t),this.options=a.extend({},r.DEFAULTS,e),this.$trigger=a('[data-toggle="collapse"][href="#'+t.id+'"],[data-toggle="collapse"][data-target="#'+t.id+'"]'),this.transitioning=null,this.options.parent?this.$parent=this.getParent():this.addAriaAndCollapsedClass(this.$element,this.$trigger),this.options.toggle&&this.toggle()};function n(t){var e,i=t.attr("data-target")||(e=t.attr("href"))&&e.replace(/.*(?=#[^\s]+$)/,"");return a(document).find(i)}function l(o){return this.each(function(){var t=a(this),e=t.data("bs.collapse"),i=a.extend({},r.DEFAULTS,t.data(),"object"==typeof o&&o);!e&&i.toggle&&/show|hide/.test(o)&&(i.toggle=!1),e||t.data("bs.collapse",e=new r(this,i)),"string"==typeof o&&e[o]()})}r.VERSION="3.4.1",r.TRANSITION_DURATION=350,r.DEFAULTS={toggle:!0},r.prototype.dimension=function(){return this.$element.hasClass("width")?"width":"height"},r.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var t,e=this.$parent&&this.$parent.children(".panel").children(".in, .collapsing");if(!(e&&e.length&&(t=e.data("bs.collapse"))&&t.transitioning)){var i=a.Event("show.bs.collapse");if(this.$element.trigger(i),!i.isDefaultPrevented()){e&&e.length&&(l.call(e,"hide"),t||e.data("bs.collapse",null));var o=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[o](0).attr("aria-expanded",!0),this.$trigger.removeClass("collapsed").attr("aria-expanded",!0),this.transitioning=1;var n=function(){this.$element.removeClass("collapsing").addClass("collapse in")[o](""),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!a.support.transition)return n.call(this);var s=a.camelCase(["scroll",o].join("-"));this.$element.one("bsTransitionEnd",a.proxy(n,this)).emulateTransitionEnd(r.TRANSITION_DURATION)[o](this.$element[0][s])}}}},r.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var t=a.Event("hide.bs.collapse");if(this.$element.trigger(t),!t.isDefaultPrevented()){var e=this.dimension();this.$element[e](this.$element[e]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse in").attr("aria-expanded",!1),this.$trigger.addClass("collapsed").attr("aria-expanded",!1),this.transitioning=1;var i=function(){this.transitioning=0,this.$element.removeClass("collapsing").addClass("collapse").trigger("hidden.bs.collapse")};if(!a.support.transition)return i.call(this);this.$element[e](0).one("bsTransitionEnd",a.proxy(i,this)).emulateTransitionEnd(r.TRANSITION_DURATION)}}},r.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()},r.prototype.getParent=function(){return a(document).find(this.options.parent).find('[data-toggle="collapse"][data-bs-parent="'+this.options.parent+'"]').each(a.proxy(function(t,e){var i=a(e);this.addAriaAndCollapsedClass(n(i),i)},this)).end()},r.prototype.addAriaAndCollapsedClass=function(t,e){var i=t.hasClass("in");t.attr("aria-expanded",i),e.toggleClass("collapsed",!i).attr("aria-expanded",i)};var t=a.fn.collapse;a.fn.collapse=l,a.fn.collapse.Constructor=r,a.fn.collapse.noConflict=function(){return a.fn.collapse=t,this},a(document).on("click.bs.collapse.data-api",'[data-toggle="collapse"]',function(t){var e=a(this);e.attr("data-target")||t.preventDefault();var i=n(e),o=i.data("bs.collapse")?"toggle":e.data();l.call(i,o)})}(jQuery),function(a){"use strict";var r='[data-toggle="dropdown"]',o=function(t){a(t).on("click.bs.dropdown",this.toggle)};function l(t){var e=t.attr("data-target");e||(e=(e=t.attr("href"))&&/#[A-Za-z]/.test(e)&&e.replace(/.*(?=#[^\s]*$)/,""));var i="#"!==e?a(document).find(e):null;return i&&i.length?i:t.parent()}function s(o){o&&3===o.which||(a(".dropdown-backdrop").remove(),a(r).each(function(){var t=a(this),e=l(t),i={relatedTarget:this};e.hasClass("open")&&(o&&"click"==o.type&&/input|textarea/i.test(o.target.tagName)&&a.contains(e[0],o.target)||(e.trigger(o=a.Event("hide.bs.dropdown",i)),o.isDefaultPrevented()||(t.attr("aria-expanded","false"),e.removeClass("open").trigger(a.Event("hidden.bs.dropdown",i)))))}))}o.VERSION="3.4.1",o.prototype.toggle=function(t){var e=a(this);if(!e.is(".disabled, :disabled")){var i=l(e),o=i.hasClass("open");if(s(),!o){"ontouchstart"in document.documentElement&&!i.closest(".navbar-nav").length&&a(document.createElement("div")).addClass("dropdown-backdrop").insertAfter(a(this)).on("click",s);var n={relatedTarget:this};if(i.trigger(t=a.Event("show.bs.dropdown",n)),t.isDefaultPrevented())return;e.trigger("focus").attr("aria-expanded","true"),i.toggleClass("open").trigger(a.Event("shown.bs.dropdown",n))}return!1}},o.prototype.keydown=function(t){if(/(38|40|27|32)/.test(t.which)&&!/input|textarea/i.test(t.target.tagName)){var e=a(this);if(t.preventDefault(),t.stopPropagation(),!e.is(".disabled, :disabled")){var i=l(e),o=i.hasClass("open");if(!o&&27!=t.which||o&&27==t.which)return 27==t.which&&i.find(r).trigger("focus"),e.trigger("click");var n=i.find(".dropdown-menu li:not(.disabled):visible a");if(n.length){var s=n.index(t.target);38==t.which&&0<s&&s--,40==t.which&&s<n.length-1&&s++,~s||(s=0),n.eq(s).trigger("focus")}}}};var t=a.fn.dropdown;a.fn.dropdown=function e(i){return this.each(function(){var t=a(this),e=t.data("bs.dropdown");e||t.data("bs.dropdown",e=new o(this)),"string"==typeof i&&e[i].call(t)})},a.fn.dropdown.Constructor=o,a.fn.dropdown.noConflict=function(){return a.fn.dropdown=t,this},a(document).on("click.bs.dropdown.data-api",s).on("click.bs.dropdown.data-api",".dropdown form",function(t){t.stopPropagation()}).on("click.bs.dropdown.data-api",r,o.prototype.toggle).on("keydown.bs.dropdown.data-api",r,o.prototype.keydown).on("keydown.bs.dropdown.data-api",".dropdown-menu",o.prototype.keydown)}(jQuery),function(a){"use strict";var s=function(t,e){this.options=e,this.$body=a(document.body),this.$element=a(t),this.$dialog=this.$element.find(".modal-dialog"),this.$backdrop=null,this.isShown=null,this.originalBodyPad=null,this.scrollbarWidth=0,this.ignoreBackdropClick=!1,this.fixedContent=".navbar-fixed-top, .navbar-fixed-bottom",this.options.remote&&this.$element.find(".modal-content").load(this.options.remote,a.proxy(function(){this.$element.trigger("loaded.bs.modal")},this))};function r(o,n){return this.each(function(){var t=a(this),e=t.data("bs.modal"),i=a.extend({},s.DEFAULTS,t.data(),"object"==typeof o&&o);e||t.data("bs.modal",e=new s(this,i)),"string"==typeof o?e[o](n):i.show&&e.show(n)})}s.VERSION="3.4.1",s.TRANSITION_DURATION=300,s.BACKDROP_TRANSITION_DURATION=150,s.DEFAULTS={backdrop:!0,keyboard:!0,show:!0},s.prototype.toggle=function(t){return this.isShown?this.hide():this.show(t)},s.prototype.show=function(i){var o=this,t=a.Event("show.bs.modal",{relatedTarget:i});this.$element.trigger(t),this.isShown||t.isDefaultPrevented()||(this.isShown=!0,this.checkScrollbar(),this.setScrollbar(),this.$body.addClass("modal-open"),this.escape(),this.resize(),this.$element.on("click.dismiss.bs.modal",'[data-dismiss="modal"]',a.proxy(this.hide,this)),this.$dialog.on("mousedown.dismiss.bs.modal",function(){o.$element.one("mouseup.dismiss.bs.modal",function(t){a(t.target).is(o.$element)&&(o.ignoreBackdropClick=!0)})}),this.backdrop(function(){var t=a.support.transition&&o.$element.hasClass("fade");o.$element.parent().length||o.$element.appendTo(o.$body),o.$element.show().scrollTop(0),o.adjustDialog(),t&&o.$element[0].offsetWidth,o.$element.addClass("in"),o.enforceFocus();var e=a.Event("shown.bs.modal",{relatedTarget:i});t?o.$dialog.one("bsTransitionEnd",function(){o.$element.trigger("focus").trigger(e)}).emulateTransitionEnd(s.TRANSITION_DURATION):o.$element.trigger("focus").trigger(e)}))},s.prototype.hide=function(t){t&&t.preventDefault(),t=a.Event("hide.bs.modal"),this.$element.trigger(t),this.isShown&&!t.isDefaultPrevented()&&(this.isShown=!1,this.escape(),this.resize(),a(document).off("focusin.bs.modal"),this.$element.removeClass("in").off("click.dismiss.bs.modal").off("mouseup.dismiss.bs.modal"),this.$dialog.off("mousedown.dismiss.bs.modal"),a.support.transition&&this.$element.hasClass("fade")?this.$element.one("bsTransitionEnd",a.proxy(this.hideModal,this)).emulateTransitionEnd(s.TRANSITION_DURATION):this.hideModal())},s.prototype.enforceFocus=function(){a(document).off("focusin.bs.modal").on("focusin.bs.modal",a.proxy(function(t){document===t.target||this.$element[0]===t.target||this.$element.has(t.target).length||this.$element.trigger("focus")},this))},s.prototype.escape=function(){this.isShown&&this.options.keyboard?this.$element.on("keydown.dismiss.bs.modal",a.proxy(function(t){27==t.which&&this.hide()},this)):this.isShown||this.$element.off("keydown.dismiss.bs.modal")},s.prototype.resize=function(){this.isShown?a(window).on("resize.bs.modal",a.proxy(this.handleUpdate,this)):a(window).off("resize.bs.modal")},s.prototype.hideModal=function(){var t=this;this.$element.hide(),this.backdrop(function(){t.$body.removeClass("modal-open"),t.resetAdjustments(),t.resetScrollbar(),t.$element.trigger("hidden.bs.modal")})},s.prototype.removeBackdrop=function(){this.$backdrop&&this.$backdrop.remove(),this.$backdrop=null},s.prototype.backdrop=function(t){var e=this,i=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var o=a.support.transition&&i;if(this.$backdrop=a(document.createElement("div")).addClass("modal-backdrop "+i).appendTo(this.$body),this.$element.on("click.dismiss.bs.modal",a.proxy(function(t){this.ignoreBackdropClick?this.ignoreBackdropClick=!1:t.target===t.currentTarget&&("static"==this.options.backdrop?this.$element[0].focus():this.hide())},this)),o&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),!t)return;o?this.$backdrop.one("bsTransitionEnd",t).emulateTransitionEnd(s.BACKDROP_TRANSITION_DURATION):t()}else if(!this.isShown&&this.$backdrop){this.$backdrop.removeClass("in");var n=function(){e.removeBackdrop(),t&&t()};a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one("bsTransitionEnd",n).emulateTransitionEnd(s.BACKDROP_TRANSITION_DURATION):n()}else t&&t()},s.prototype.handleUpdate=function(){this.adjustDialog()},s.prototype.adjustDialog=function(){var t=this.$element[0].scrollHeight>document.documentElement.clientHeight;this.$element.css({paddingLeft:!this.bodyIsOverflowing&&t?this.scrollbarWidth:"",paddingRight:this.bodyIsOverflowing&&!t?this.scrollbarWidth:""})},s.prototype.resetAdjustments=function(){this.$element.css({paddingLeft:"",paddingRight:""})},s.prototype.checkScrollbar=function(){var t=window.innerWidth;if(!t){var e=document.documentElement.getBoundingClientRect();t=e.right-Math.abs(e.left)}this.bodyIsOverflowing=document.body.clientWidth<t,this.scrollbarWidth=this.measureScrollbar()},s.prototype.setScrollbar=function(){var t=parseInt(this.$body.css("padding-right")||0,10);this.originalBodyPad=document.body.style.paddingRight||"";var n=this.scrollbarWidth;this.bodyIsOverflowing&&(this.$body.css("padding-right",t+n),a(this.fixedContent).each(function(t,e){var i=e.style.paddingRight,o=a(e).css("padding-right");a(e).data("padding-right",i).css("padding-right",parseFloat(o)+n+"px")}))},s.prototype.resetScrollbar=function(){this.$body.css("padding-right",this.originalBodyPad),a(this.fixedContent).each(function(t,e){var i=a(e).data("padding-right");a(e).removeData("padding-right"),e.style.paddingRight=i||""})},s.prototype.measureScrollbar=function(){var t=document.createElement("div");t.className="modal-scrollbar-measure",this.$body.append(t);var e=t.offsetWidth-t.clientWidth;return this.$body[0].removeChild(t),e};var t=a.fn.modal;a.fn.modal=r,a.fn.modal.Constructor=s,a.fn.modal.noConflict=function(){return a.fn.modal=t,this},a(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(t){var e=a(this),i=e.attr("href"),o=e.attr("data-target")||i&&i.replace(/.*(?=#[^\s]+$)/,""),n=a(document).find(o),s=n.data("bs.modal")?"toggle":a.extend({remote:!/#/.test(i)&&i},n.data(),e.data());e.is("a")&&t.preventDefault(),n.one("show.bs.modal",function(t){t.isDefaultPrevented()||n.one("hidden.bs.modal",function(){e.is(":visible")&&e.trigger("focus")})}),r.call(n,s,this)})}(jQuery),function(g){"use strict";var o=["sanitize","whiteList","sanitizeFn"],a=["background","cite","href","itemtype","longdesc","poster","src","xlink:href"],t={"*":["class","dir","id","lang","role",/^aria-[\w-]*$/i],a:["target","href","title","rel"],area:[],b:[],br:[],col:[],code:[],div:[],em:[],hr:[],h1:[],h2:[],h3:[],h4:[],h5:[],h6:[],i:[],img:["src","alt","title","width","height"],li:[],ol:[],p:[],pre:[],s:[],small:[],span:[],sub:[],sup:[],strong:[],u:[],ul:[]},r=/^(?:(?:https?|mailto|ftp|tel|file):|[^&:/?#]*(?:[/?#]|$))/gi,l=/^data:(?:image\/(?:bmp|gif|jpeg|jpg|png|tiff|webp)|video\/(?:mpeg|mp4|ogg|webm)|audio\/(?:mp3|oga|ogg|opus));base64,[a-z0-9+/]+=*$/i;function u(t,e){var i=t.nodeName.toLowerCase();if(-1!==g.inArray(i,e))return-1===g.inArray(i,a)||Boolean(t.nodeValue.match(r)||t.nodeValue.match(l));for(var o=g(e).filter(function(t,e){return e instanceof RegExp}),n=0,s=o.length;n<s;n++)if(i.match(o[n]))return!0;return!1}function n(t,e,i){if(0===t.length)return t;if(i&&"function"==typeof i)return i(t);if(!document.implementation||!document.implementation.createHTMLDocument)return t;var o=document.implementation.createHTMLDocument("sanitization");o.body.innerHTML=t;for(var n=g.map(e,function(t,e){return e}),s=g(o.body).find("*"),a=0,r=s.length;a<r;a++){var l=s[a],h=l.nodeName.toLowerCase();if(-1!==g.inArray(h,n))for(var d=g.map(l.attributes,function(t){return t}),p=[].concat(e["*"]||[],e[h]||[]),c=0,f=d.length;c<f;c++)u(d[c],p)||l.removeAttribute(d[c].nodeName);else l.parentNode.removeChild(l)}return o.body.innerHTML}var m=function(t,e){this.type=null,this.options=null,this.enabled=null,this.timeout=null,this.hoverState=null,this.$element=null,this.inState=null,this.init("tooltip",t,e)};m.VERSION="3.4.1",m.TRANSITION_DURATION=150,m.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!1,container:!1,viewport:{selector:"body",padding:0},sanitize:!0,sanitizeFn:null,whiteList:t},m.prototype.init=function(t,e,i){if(this.enabled=!0,this.type=t,this.$element=g(e),this.options=this.getOptions(i),this.$viewport=this.options.viewport&&g(document).find(g.isFunction(this.options.viewport)?this.options.viewport.call(this,this.$element):this.options.viewport.selector||this.options.viewport),this.inState={click:!1,hover:!1,focus:!1},this.$element[0]instanceof document.constructor&&!this.options.selector)throw new Error("`selector` option must be specified when initializing "+this.type+" on the window.document object!");for(var o=this.options.trigger.split(" "),n=o.length;n--;){var s=o[n];if("click"==s)this.$element.on("click."+this.type,this.options.selector,g.proxy(this.toggle,this));else if("manual"!=s){var a="hover"==s?"mouseenter":"focusin",r="hover"==s?"mouseleave":"focusout";this.$element.on(a+"."+this.type,this.options.selector,g.proxy(this.enter,this)),this.$element.on(r+"."+this.type,this.options.selector,g.proxy(this.leave,this))}}this.options.selector?this._options=g.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},m.prototype.getDefaults=function(){return m.DEFAULTS},m.prototype.getOptions=function(t){var e=this.$element.data();for(var i in e)e.hasOwnProperty(i)&&-1!==g.inArray(i,o)&&delete e[i];return(t=g.extend({},this.getDefaults(),e,t)).delay&&"number"==typeof t.delay&&(t.delay={show:t.delay,hide:t.delay}),t.sanitize&&(t.template=n(t.template,t.whiteList,t.sanitizeFn)),t},m.prototype.getDelegateOptions=function(){var i={},o=this.getDefaults();return this._options&&g.each(this._options,function(t,e){o[t]!=e&&(i[t]=e)}),i},m.prototype.enter=function(t){var e=t instanceof this.constructor?t:g(t.currentTarget).data("bs."+this.type);if(e||(e=new this.constructor(t.currentTarget,this.getDelegateOptions()),g(t.currentTarget).data("bs."+this.type,e)),t instanceof g.Event&&(e.inState["focusin"==t.type?"focus":"hover"]=!0),e.tip().hasClass("in")||"in"==e.hoverState)e.hoverState="in";else{if(clearTimeout(e.timeout),e.hoverState="in",!e.options.delay||!e.options.delay.show)return e.show();e.timeout=setTimeout(function(){"in"==e.hoverState&&e.show()},e.options.delay.show)}},m.prototype.isInStateTrue=function(){for(var t in this.inState)if(this.inState[t])return!0;return!1},m.prototype.leave=function(t){var e=t instanceof this.constructor?t:g(t.currentTarget).data("bs."+this.type);if(e||(e=new this.constructor(t.currentTarget,this.getDelegateOptions()),g(t.currentTarget).data("bs."+this.type,e)),t instanceof g.Event&&(e.inState["focusout"==t.type?"focus":"hover"]=!1),!e.isInStateTrue()){if(clearTimeout(e.timeout),e.hoverState="out",!e.options.delay||!e.options.delay.hide)return e.hide();e.timeout=setTimeout(function(){"out"==e.hoverState&&e.hide()},e.options.delay.hide)}},m.prototype.show=function(){var t=g.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(t);var e=g.contains(this.$element[0].ownerDocument.documentElement,this.$element[0]);if(t.isDefaultPrevented()||!e)return;var i=this,o=this.tip(),n=this.getUID(this.type);this.setContent(),o.attr("id",n),this.$element.attr("aria-describedby",n),this.options.animation&&o.addClass("fade");var s="function"==typeof this.options.placement?this.options.placement.call(this,o[0],this.$element[0]):this.options.placement,a=/\s?auto?\s?/i,r=a.test(s);r&&(s=s.replace(a,"")||"top"),o.detach().css({top:0,left:0,display:"block"}).addClass(s).data("bs."+this.type,this),this.options.container?o.appendTo(g(document).find(this.options.container)):o.insertAfter(this.$element),this.$element.trigger("inserted.bs."+this.type);var l=this.getPosition(),h=o[0].offsetWidth,d=o[0].offsetHeight;if(r){var p=s,c=this.getPosition(this.$viewport);s="bottom"==s&&l.bottom+d>c.bottom?"top":"top"==s&&l.top-d<c.top?"bottom":"right"==s&&l.right+h>c.width?"left":"left"==s&&l.left-h<c.left?"right":s,o.removeClass(p).addClass(s)}var f=this.getCalculatedOffset(s,l,h,d);this.applyPlacement(f,s);var u=function(){var t=i.hoverState;i.$element.trigger("shown.bs."+i.type),i.hoverState=null,"out"==t&&i.leave(i)};g.support.transition&&this.$tip.hasClass("fade")?o.one("bsTransitionEnd",u).emulateTransitionEnd(m.TRANSITION_DURATION):u()}},m.prototype.applyPlacement=function(t,e){var i=this.tip(),o=i[0].offsetWidth,n=i[0].offsetHeight,s=parseInt(i.css("margin-top"),10),a=parseInt(i.css("margin-left"),10);isNaN(s)&&(s=0),isNaN(a)&&(a=0),t.top+=s,t.left+=a,g.offset.setOffset(i[0],g.extend({using:function(t){i.css({top:Math.round(t.top),left:Math.round(t.left)})}},t),0),i.addClass("in");var r=i[0].offsetWidth,l=i[0].offsetHeight;"top"==e&&l!=n&&(t.top=t.top+n-l);var h=this.getViewportAdjustedDelta(e,t,r,l);h.left?t.left+=h.left:t.top+=h.top;var d=/top|bottom/.test(e),p=d?2*h.left-o+r:2*h.top-n+l,c=d?"offsetWidth":"offsetHeight";i.offset(t),this.replaceArrow(p,i[0][c],d)},m.prototype.replaceArrow=function(t,e,i){this.arrow().css(i?"left":"top",50*(1-t/e)+"%").css(i?"top":"left","")},m.prototype.setContent=function(){var t=this.tip(),e=this.getTitle();this.options.html?(this.options.sanitize&&(e=n(e,this.options.whiteList,this.options.sanitizeFn)),t.find(".tooltip-inner").html(e)):t.find(".tooltip-inner").text(e),t.removeClass("fade in top bottom left right")},m.prototype.hide=function(t){var e=this,i=g(this.$tip),o=g.Event("hide.bs."+this.type);function n(){"in"!=e.hoverState&&i.detach(),e.$element&&e.$element.removeAttr("aria-describedby").trigger("hidden.bs."+e.type),t&&t()}if(this.$element.trigger(o),!o.isDefaultPrevented())return i.removeClass("in"),g.support.transition&&i.hasClass("fade")?i.one("bsTransitionEnd",n).emulateTransitionEnd(m.TRANSITION_DURATION):n(),this.hoverState=null,this},m.prototype.fixTitle=function(){var t=this.$element;(t.attr("title")||"string"!=typeof t.attr("data-original-title"))&&t.attr("data-original-title",t.attr("title")||"").attr("title","")},m.prototype.hasContent=function(){return this.getTitle()},m.prototype.getPosition=function(t){var e=(t=t||this.$element)[0],i="BODY"==e.tagName,o=e.getBoundingClientRect();null==o.width&&(o=g.extend({},o,{width:o.right-o.left,height:o.bottom-o.top}));var n=window.SVGElement&&e instanceof window.SVGElement,s=i?{top:0,left:0}:n?null:t.offset(),a={scroll:i?document.documentElement.scrollTop||document.body.scrollTop:t.scrollTop()},r=i?{width:g(window).width(),height:g(window).height()}:null;return g.extend({},o,a,r,s)},m.prototype.getCalculatedOffset=function(t,e,i,o){return"bottom"==t?{top:e.top+e.height,left:e.left+e.width/2-i/2}:"top"==t?{top:e.top-o,left:e.left+e.width/2-i/2}:"left"==t?{top:e.top+e.height/2-o/2,left:e.left-i}:{top:e.top+e.height/2-o/2,left:e.left+e.width}},m.prototype.getViewportAdjustedDelta=function(t,e,i,o){var n={top:0,left:0};if(!this.$viewport)return n;var s=this.options.viewport&&this.options.viewport.padding||0,a=this.getPosition(this.$viewport);if(/right|left/.test(t)){var r=e.top-s-a.scroll,l=e.top+s-a.scroll+o;r<a.top?n.top=a.top-r:l>a.top+a.height&&(n.top=a.top+a.height-l)}else{var h=e.left-s,d=e.left+s+i;h<a.left?n.left=a.left-h:d>a.right&&(n.left=a.left+a.width-d)}return n},m.prototype.getTitle=function(){var t=this.$element,e=this.options;return t.attr("data-original-title")||("function"==typeof e.title?e.title.call(t[0]):e.title)},m.prototype.getUID=function(t){for(;t+=~~(1e6*Math.random()),document.getElementById(t););return t},m.prototype.tip=function(){if(!this.$tip&&(this.$tip=g(this.options.template),1!=this.$tip.length))throw new Error(this.type+" `template` option must consist of exactly 1 top-level element!");return this.$tip},m.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},m.prototype.enable=function(){this.enabled=!0},m.prototype.disable=function(){this.enabled=!1},m.prototype.toggleEnabled=function(){this.enabled=!this.enabled},m.prototype.toggle=function(t){var e=this;t&&((e=g(t.currentTarget).data("bs."+this.type))||(e=new this.constructor(t.currentTarget,this.getDelegateOptions()),g(t.currentTarget).data("bs."+this.type,e))),t?(e.inState.click=!e.inState.click,e.isInStateTrue()?e.enter(e):e.leave(e)):e.tip().hasClass("in")?e.leave(e):e.enter(e)},m.prototype.destroy=function(){var t=this;clearTimeout(this.timeout),this.hide(function(){t.$element.off("."+t.type).removeData("bs."+t.type),t.$tip&&t.$tip.detach(),t.$tip=null,t.$arrow=null,t.$viewport=null,t.$element=null})},m.prototype.sanitizeHtml=function(t){return n(t,this.options.whiteList,this.options.sanitizeFn)};var e=g.fn.tooltip;g.fn.tooltip=function i(o){return this.each(function(){var t=g(this),e=t.data("bs.tooltip"),i="object"==typeof o&&o;!e&&/destroy|hide/.test(o)||(e||t.data("bs.tooltip",e=new m(this,i)),"string"==typeof o&&e[o]())})},g.fn.tooltip.Constructor=m,g.fn.tooltip.noConflict=function(){return g.fn.tooltip=e,this}}(jQuery),function(n){"use strict";var s=function(t,e){this.init("popover",t,e)};if(!n.fn.tooltip)throw new Error("Popover requires tooltip.js");s.VERSION="3.4.1",s.DEFAULTS=n.extend({},n.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:'<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'}),((s.prototype=n.extend({},n.fn.tooltip.Constructor.prototype)).constructor=s).prototype.getDefaults=function(){return s.DEFAULTS},s.prototype.setContent=function(){var t=this.tip(),e=this.getTitle(),i=this.getContent();if(this.options.html){var o=typeof i;this.options.sanitize&&(e=this.sanitizeHtml(e),"string"===o&&(i=this.sanitizeHtml(i))),t.find(".popover-title").html(e),t.find(".popover-content").children().detach().end()["string"===o?"html":"append"](i)}else t.find(".popover-title").text(e),t.find(".popover-content").children().detach().end().text(i);t.removeClass("fade top bottom left right in"),t.find(".popover-title").html()||t.find(".popover-title").hide()},s.prototype.hasContent=function(){return this.getTitle()||this.getContent()},s.prototype.getContent=function(){var t=this.$element,e=this.options;return t.attr("data-content")||("function"==typeof e.content?e.content.call(t[0]):e.content)},s.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")};var t=n.fn.popover;n.fn.popover=function e(o){return this.each(function(){var t=n(this),e=t.data("bs.popover"),i="object"==typeof o&&o;!e&&/destroy|hide/.test(o)||(e||t.data("bs.popover",e=new s(this,i)),"string"==typeof o&&e[o]())})},n.fn.popover.Constructor=s,n.fn.popover.noConflict=function(){return n.fn.popover=t,this}}(jQuery),function(s){"use strict";function n(t,e){this.$body=s(document.body),this.$scrollElement=s(t).is(document.body)?s(window):s(t),this.options=s.extend({},n.DEFAULTS,e),this.selector=(this.options.target||"")+" .nav li > a",this.offsets=[],this.targets=[],this.activeTarget=null,this.scrollHeight=0,this.$scrollElement.on("scroll.bs.scrollspy",s.proxy(this.process,this)),this.refresh(),this.process()}function e(o){return this.each(function(){var t=s(this),e=t.data("bs.scrollspy"),i="object"==typeof o&&o;e||t.data("bs.scrollspy",e=new n(this,i)),"string"==typeof o&&e[o]()})}n.VERSION="3.4.1",n.DEFAULTS={offset:10},n.prototype.getScrollHeight=function(){return this.$scrollElement[0].scrollHeight||Math.max(this.$body[0].scrollHeight,document.documentElement.scrollHeight)},n.prototype.refresh=function(){var t=this,o="offset",n=0;this.offsets=[],this.targets=[],this.scrollHeight=this.getScrollHeight(),s.isWindow(this.$scrollElement[0])||(o="position",n=this.$scrollElement.scrollTop()),this.$body.find(this.selector).map(function(){var t=s(this),e=t.data("target")||t.attr("href"),i=/^#./.test(e)&&s(e);return i&&i.length&&i.is(":visible")&&[[i[o]().top+n,e]]||null}).sort(function(t,e){return t[0]-e[0]}).each(function(){t.offsets.push(this[0]),t.targets.push(this[1])})},n.prototype.process=function(){var t,e=this.$scrollElement.scrollTop()+this.options.offset,i=this.getScrollHeight(),o=this.options.offset+i-this.$scrollElement.height(),n=this.offsets,s=this.targets,a=this.activeTarget;if(this.scrollHeight!=i&&this.refresh(),o<=e)return a!=(t=s[s.length-1])&&this.activate(t);if(a&&e<n[0])return this.activeTarget=null,this.clear();for(t=n.length;t--;)a!=s[t]&&e>=n[t]&&(n[t+1]===undefined||e<n[t+1])&&this.activate(s[t])},n.prototype.activate=function(t){this.activeTarget=t,this.clear();var e=this.selector+'[data-target="'+t+'"],'+this.selector+'[href="'+t+'"]',i=s(e).parents("li").addClass("active");i.parent(".dropdown-menu").length&&(i=i.closest("li.dropdown").addClass("active")),i.trigger("activate.bs.scrollspy")},n.prototype.clear=function(){s(this.selector).parentsUntil(this.options.target,".active").removeClass("active")};var t=s.fn.scrollspy;s.fn.scrollspy=e,s.fn.scrollspy.Constructor=n,s.fn.scrollspy.noConflict=function(){return s.fn.scrollspy=t,this},s(window).on("load.bs.scrollspy.data-api",function(){s('[data-spy="scroll"]').each(function(){var t=s(this);e.call(t,t.data())})})}(jQuery),function(r){"use strict";var a=function(t){this.element=r(t)};function e(i){return this.each(function(){var t=r(this),e=t.data("bs.tab");e||t.data("bs.tab",e=new a(this)),"string"==typeof i&&e[i]()})}a.VERSION="3.4.1",a.TRANSITION_DURATION=150,a.prototype.show=function(){var t=this.element,e=t.closest("ul:not(.dropdown-menu)"),i=t.data("target");if(i||(i=(i=t.attr("href"))&&i.replace(/.*(?=#[^\s]*$)/,"")),!t.parent("li").hasClass("active")){var o=e.find(".active:last a"),n=r.Event("hide.bs.tab",{relatedTarget:t[0]}),s=r.Event("show.bs.tab",{relatedTarget:o[0]});if(o.trigger(n),t.trigger(s),!s.isDefaultPrevented()&&!n.isDefaultPrevented()){var a=r(document).find(i);this.activate(t.closest("li"),e),this.activate(a,a.parent(),function(){o.trigger({type:"hidden.bs.tab",relatedTarget:t[0]}),t.trigger({type:"shown.bs.tab",relatedTarget:o[0]})})}}},a.prototype.activate=function(t,e,i){var o=e.find("> .active"),n=i&&r.support.transition&&(o.length&&o.hasClass("fade")||!!e.find("> .fade").length);function s(){o.removeClass("active").find("> .dropdown-menu > .active").removeClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!1),t.addClass("active").find('[data-toggle="tab"]').attr("aria-expanded",!0),n?(t[0].offsetWidth,t.addClass("in")):t.removeClass("fade"),t.parent(".dropdown-menu").length&&t.closest("li.dropdown").addClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!0),i&&i()}o.length&&n?o.one("bsTransitionEnd",s).emulateTransitionEnd(a.TRANSITION_DURATION):s(),o.removeClass("in")};var t=r.fn.tab;r.fn.tab=e,r.fn.tab.Constructor=a,r.fn.tab.noConflict=function(){return r.fn.tab=t,this};var i=function(t){t.preventDefault(),e.call(r(this),"show")};r(document).on("click.bs.tab.data-api",'[data-toggle="tab"]',i).on("click.bs.tab.data-api",'[data-toggle="pill"]',i)}(jQuery),function(l){"use strict";var h=function(t,e){this.options=l.extend({},h.DEFAULTS,e);var i=this.options.target===h.DEFAULTS.target?l(this.options.target):l(document).find(this.options.target);this.$target=i.on("scroll.bs.affix.data-api",l.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",l.proxy(this.checkPositionWithEventLoop,this)),this.$element=l(t),this.affixed=null,this.unpin=null,this.pinnedOffset=null,this.checkPosition()};function i(o){return this.each(function(){var t=l(this),e=t.data("bs.affix"),i="object"==typeof o&&o;e||t.data("bs.affix",e=new h(this,i)),"string"==typeof o&&e[o]()})}h.VERSION="3.4.1",h.RESET="affix affix-top affix-bottom",h.DEFAULTS={offset:0,target:window},h.prototype.getState=function(t,e,i,o){var n=this.$target.scrollTop(),s=this.$element.offset(),a=this.$target.height();if(null!=i&&"top"==this.affixed)return n<i&&"top";if("bottom"==this.affixed)return null!=i?!(n+this.unpin<=s.top)&&"bottom":!(n+a<=t-o)&&"bottom";var r=null==this.affixed,l=r?n:s.top;return null!=i&&n<=i?"top":null!=o&&t-o<=l+(r?a:e)&&"bottom"},h.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset;this.$element.removeClass(h.RESET).addClass("affix");var t=this.$target.scrollTop(),e=this.$element.offset();return this.pinnedOffset=e.top-t},h.prototype.checkPositionWithEventLoop=function(){setTimeout(l.proxy(this.checkPosition,this),1)},h.prototype.checkPosition=function(){if(this.$element.is(":visible")){var t=this.$element.height(),e=this.options.offset,i=e.top,o=e.bottom,n=Math.max(l(document).height(),l(document.body).height());"object"!=typeof e&&(o=i=e),"function"==typeof i&&(i=e.top(this.$element)),"function"==typeof o&&(o=e.bottom(this.$element));var s=this.getState(n,t,i,o);if(this.affixed!=s){null!=this.unpin&&this.$element.css("top","");var a="affix"+(s?"-"+s:""),r=l.Event(a+".bs.affix");if(this.$element.trigger(r),r.isDefaultPrevented())return;this.affixed=s,this.unpin="bottom"==s?this.getPinnedOffset():null,this.$element.removeClass(h.RESET).addClass(a).trigger(a.replace("affix","affixed")+".bs.affix")}"bottom"==s&&this.$element.offset({top:n-t-o})}};var t=l.fn.affix;l.fn.affix=i,l.fn.affix.Constructor=h,l.fn.affix.noConflict=function(){return l.fn.affix=t,this},l(window).on("load",function(){l('[data-spy="affix"]').each(function(){var t=l(this),e=t.data();e.offset=e.offset||{},null!=e.offsetBottom&&(e.offset.bottom=e.offsetBottom),null!=e.offsetTop&&(e.offset.top=e.offsetTop),i.call(t,e)})})}(jQuery);
\ No newline at end of file
diff --git a/tardis/tardis_portal/templates/tardis_portal/ajax/exps_list.html b/tardis/tardis_portal/templates/tardis_portal/ajax/exps_list.html
index 8aecfea9a4..2bd26a899d 100644
--- a/tardis/tardis_portal/templates/tardis_portal/ajax/exps_list.html
+++ b/tardis/tardis_portal/templates/tardis_portal/ajax/exps_list.html
@@ -15,13 +15,12 @@
 {% for exp in experiments %}
   <div class="card mb-2">
     <div id="toggle-{{exp.id}}"
-         class="card-header accordion-toggle py-2" data-parent="#experiments"
+         class="card-header accordion-toggle py-2" data-bs-parent="#experiments"
          data-bs-toggle="collapse">
       <div class="row">
         <div class="col-md-8 px-1 pb-1">
           <input type="hidden" class="exp-index" value="{{ forloop.counter }}">
-          <a class="explink"
-             href="{% url 'tardis_portal.view_experiment' exp.id %}">{{ exp.title }}</a>
+          <span class="card-title">{{ exp.title }}</span>
         </div>
         <div class="col">
           <div class="badges" id="badge-{{exp.id}}"></div>
@@ -47,6 +46,7 @@
           </div>
         </div>
       </div>
+      <a class="btn btn-light mt-3 w-100" href="{% url 'tardis_portal.view_experiment' exp.id %}">View Experiment</a>
     </div>
   </div>
 {% empty %}
diff --git a/tardis/tardis_portal/templates/tardis_portal/ajax/parameteradd.html b/tardis/tardis_portal/templates/tardis_portal/ajax/parameteradd.html
index 7f4b738812..415c58e8b3 100644
--- a/tardis/tardis_portal/templates/tardis_portal/ajax/parameteradd.html
+++ b/tardis/tardis_portal/templates/tardis_portal/ajax/parameteradd.html
@@ -6,7 +6,7 @@
 {% else %}
   <form id="add_metadata_form"
         action='{{prefix}}/ajax/add_{{type}}_parameters/{{parentObject.id}}/{{schema.id}}/'
-        method='post' data-type="{{type}}" data-parent_object_id="{{parentObject.id}}">
+        method='post' data-type="{{type}}" data-bs-parent_object_id="{{parentObject.id}}">
     {% csrf_token %}
     <div class="form-horizontal">
       <div class="form-group">
@@ -17,7 +17,7 @@
              </label>
           </div>
           <div class="col-md-9 ml-4 mr-0">
-            <select id="schemaselect" class="form-control" data-type="{{type}}" data-parent_object_id="{{parentObject.id}}">
+            <select id="schemaselect" class="form-control" data-type="{{type}}" data-bs-parent_object_id="{{parentObject.id}}">
             {% for schema in all_schema %}
               <option value="{{schema.id}}" {% if schema.id == schema_id %}selected{% endif %}>{{schema.name}}</option>
             {% endfor %}
diff --git a/tardis/tardis_portal/templates/tardis_portal/index.html b/tardis/tardis_portal/templates/tardis_portal/index.html
index f5aabc574d..eb9737d5f9 100644
--- a/tardis/tardis_portal/templates/tardis_portal/index.html
+++ b/tardis/tardis_portal/templates/tardis_portal/index.html
@@ -9,7 +9,7 @@
 {% endblock script %}
 
 {% block content %}
-<div id="content" class="container-fluid">
+<main id="content" class="container">
   <div class="page-header">
     <h1 class="mb-1">Home</h1>
   </div>
@@ -38,12 +38,11 @@ <h3>
             <div class="card mb-2">
               <div id="private-toggle-{{proj.id}}"
                    class="card-header accordion-toggle private-project py-2"
-                   data-bs-toggle="collapse" data-parent="#private-projects">
+                   data-bs-toggle="collapse" data-bs-parent="#private-projects">
                   <div class="row">
                     <div class="col-md-8 px-1 pb-1">
                       <input type="hidden" class="proj-index" value="{{ forloop.counter }}">
-                      <a class="card-title projlink"
-                         href="{% url 'tardis.apps.projects.view_project' proj.id %}">{{ proj.name }}</a>
+                      <span class="card-title">{{ proj.name }}</span>
                     </div>
                     <div class="col">
                      <div class="projectbadges" id="badge-{{proj.id}}"></div>
@@ -65,7 +64,7 @@ <h3>
                     </div>
                   </div>
               </div>
-              <div id="collapse-{{proj.id}}" class="card-body py-2 collapse" data-parent="#private-projects">
+              <div id="collapse-{{proj.id}}" class="card-body py-2 collapse" data-bs-parent="#private-projects">
                   <div class="row">
                     <div class="col-md-9 px-1">
                       <div class="accordion-inner">
@@ -74,6 +73,8 @@ <h3>
                       </div> {% comment %}class="accordion-inner"{% endcomment %}
                     </div>
                   </div>
+                  <a class="btn btn-light mt-3 w-100"
+                         href="{% url 'tardis.apps.projects.view_project' proj.id %}">View Project</a>
               </div>
           </div>
           {% endfor %}
@@ -88,12 +89,11 @@ <h3>
             <div class="card mb-2">
               <div id="private-toggle-{{exp.id}}"
                    class="card-header accordion-toggle private-experiment py-2"
-                   data-bs-toggle="collapse" data-parent="#private-experiments">
+                   data-bs-toggle="collapse" data-bs-parent="#private-experiments">
                   <div class="row">
                     <div class="col-md-8 px-1 pb-1">
                       <input type="hidden" class="exp-index" value="{{ forloop.counter }}">
-                      <a class="card-title explink"
-                         href="{% url 'tardis_portal.view_experiment' exp.id %}">{{ exp.title }}</a>
+                      <span class="card-title">{{ exp.title }}</span>
                     </div>
                     <div class="col">
                      <div class="badges" id="badge-{{exp.id}}"></div>
@@ -120,7 +120,7 @@ <h3>
                     </div>
                   </div>
               </div>
-              <div id="collapse-{{exp.id}}" class="card-body py-2 collapse" data-parent="#private-experiments">
+              <div id="collapse-{{exp.id}}" class="card-body py-2 collapse" data-bs-parent="#private-experiments">
                   <div class="row">
                     <div class="col-md-9 px-1">
                       <div class="accordion-inner">
@@ -129,6 +129,7 @@ <h3>
                       </div> {% comment %}class="accordion-inner"{% endcomment %}
                     </div>
                   </div>
+                  <a class="btn btn-light mt-3 w-100" href="{% url 'tardis_portal.view_experiment' exp.id %}">View Experiment</a>
               </div>
           </div>
         {% endfor %}
@@ -146,12 +147,11 @@ <h3>
             <div class="card mb-2">
               <div id="public-toggle-{{proj.id}}"
                    class="card-header accordion-toggle public-project py-2"
-                   data-bs-toggle="collapse" data-parent="#public-projects">
+                   data-bs-toggle="collapse" data-bs-parent="#public-projects">
                 <div class="row">
                   <div class="col-md-8 px-1 pb-1">
                     <input type="hidden" class="proj-index" value="{{ forloop.counter }}">
-                    <a class="card-title projlink"
-                      href="{% url 'tardis.apps.projects.view_project' proj.id %}">{{ proj.name }}</a>
+                    <span class="card-title projlink">{{ proj.name }}</span>
                   </div>
                   <div class="col">
                     <div class="projectbadges" id="badge-{{proj.id}}"></div>
@@ -175,7 +175,7 @@ <h3>
                   </div>
                 </div>
               </div>
-              <div id="collapsepub-{{proj.id}}" class="card-body py-2 collapse" data-parent="#public-projects">
+              <div id="collapsepub-{{proj.id}}" class="card-body py-2 collapse" data-bs-parent="#public-projects">
                 <div class="row">
                   <div class="col-md-9 px-1">
                     <div class="accordion-inner">
@@ -184,6 +184,8 @@ <h3>
                     </div> {% comment %}class="accordion-inner"{% endcomment %}
                   </div>
                 </div>
+                <a class="btn btn-light mt-3 w-100"
+                href="{% url 'tardis.apps.projects.view_project' proj.id %}">View Project</a>
               </div>
             </div> {% comment %}class="card"{% endcomment %}
             {% empty %}
@@ -203,12 +205,11 @@ <h3>
           <div class="card mb-2">
             <div id="public-toggle-{{exp.id}}"
                  class="card-header accordion-toggle public-experiment py-2"
-                 data-bs-toggle="collapse" data-parent="#public-experiments">
+                 data-bs-toggle="collapse" data-bs-parent="#public-experiments">
               <div class="row">
                 <div class="col-md-8 px-1 pb-1">
                   <input type="hidden" class="exp-index" value="{{ forloop.counter }}">
-                  <a class="card-title explink"
-                     href="{% url 'tardis_portal.view_experiment' exp.id %}">{{ exp.title }}</a>
+                  <span class="card-title">{{ exp.title }}</span>
                 </div>
                 <div class="col">
                   <div class="badges" id="badge-{{exp.id}}"></div>
@@ -238,7 +239,7 @@ <h3>
                 </div>
               </div>
             </div>
-            <div id="collapsepub-{{exp.id}}" class="card-body py-2 collapse" data-parent="#public-experiments">
+            <div id="collapsepub-{{exp.id}}" class="card-body py-2 collapse" data-bs-parent="#public-experiments">
               <div class="row">
                 <div class="col-md-9 px-1">
                   <div class="accordion-inner">
@@ -247,6 +248,7 @@ <h3>
                   </div> {% comment %}class="accordion-inner"{% endcomment %}
                 </div>
               </div>
+              <a class="btn btn-light mt-3 w-100" href="{% url 'tardis_portal.view_experiment' exp.id %}">View Experiment</a>
             </div>
           </div> {% comment %}class="card"{% endcomment %}
           {% empty %}
@@ -256,7 +258,7 @@ <h3>
 
     </div> {% comment %}class="col-md-12"{% endcomment %}
   </div> {% comment %}class="row"{% endcomment %}
-</div> {% comment %}id="content"{% endcomment %}
+</main> {% comment %}id="content"{% endcomment %}
 <input type="hidden" id="exps-expand-accordion" value="{{ exps_expand_accordion }}">
 <input type="hidden" id="proj-expand-accordion" value="{{ proj_expand_accordion }}">
 
diff --git a/tardis/tardis_portal/templates/tardis_portal/my_data.html b/tardis/tardis_portal/templates/tardis_portal/my_data.html
index ddd83560dc..a6a9d3ba6e 100644
--- a/tardis/tardis_portal/templates/tardis_portal/my_data.html
+++ b/tardis/tardis_portal/templates/tardis_portal/my_data.html
@@ -9,10 +9,10 @@
 
 {% block content %}
 
-<div id="content" class="container-fluid">
+<main id="content" class="container">
   <div class="row">
-    <div class="col-md-12">
-      <h3 class="d-block d-sm-none">Experiments</h3>
+    <div class="col-md-12 page-header">
+      <!-- <h1 class="d-block d-sm-none">Experiments</h1> -->
       {% if not disable_creation_forms %}
         <div class="pull-right pb-1">
           {% if perms.tardis_portal.add_experiment %}
@@ -26,7 +26,7 @@ <h3 class="d-block d-sm-none">Experiments</h3>
         </div>  <!-- class="pull-right" -->
       {% endif %}
       <div class="pull-left">
-        <h3 class="d-none d-sm-block" style="text-align: center">Experiments</h3>
+        <h1 class="mb-1">Experiments</h1>
       </div>
     </div>  <!-- class="col-md-12" -->
   </div>  <!-- class="row" -->
@@ -59,7 +59,7 @@ <h4><strong>{{ owned_experiments.count }}</strong>
       {% endif %}
     </div>  <!-- class="col-md-12" -->
   </div>  <!-- class="row" -->
-</div>  <!-- id="content" -->
+</main>  <!-- id="content" -->
 
 <input type="hidden" id="exps-expand-accordion" value="{{ exps_expand_accordion }}">
 {% render_bundle 'tardis_portal_my_data' %}
diff --git a/tardis/tardis_portal/templates/tardis_portal/public_data.html b/tardis/tardis_portal/templates/tardis_portal/public_data.html
index 1689c69e0a..5369a8146a 100644
--- a/tardis/tardis_portal/templates/tardis_portal/public_data.html
+++ b/tardis/tardis_portal/templates/tardis_portal/public_data.html
@@ -7,14 +7,9 @@
 
 {% block content %}
 
-<div id="content" class="container-fluid">
-  <div class="row">
-    <div class="col-md-12">
-      <h3 class="d-block d-sm-none">Experiments</h3>
-      <div class="pull-left">
-          <h3 class="d-none d-sm-block" style="text-align: center">Experiments</h3>
-      </div>
-    </div>
+<main id="content" class="container">
+  <div class="page-header">
+      <h1 class="mb-1">Experiments</h1>
   </div>
   <div class="row">
     <div class="col-md-12">
@@ -40,13 +35,11 @@ <h4><strong>{{ public_experiments.count }}</strong>
       <div id="public-experiments" class="panel-group experiments">
         {% for exp in public_experiments %}
           <div class="card mb-2">
-              <div class="card-header accordion-toggle" data-parent="#public-experiments"
+              <div class="card-header accordion-toggle" data-bs-parent="#public-experiments"
                    data-bs-toggle="collapse" onclick="$('#collapse{{exp.id}}').collapse('toggle');">
                 <div class="row">
                   <div class="col-md-8 px-1 pb-1">
-                    <a class="card-title explink"
-                       href="{% url 'tardis_portal.view_experiment' exp.id %}">{{ exp.title }}
-                    </a>
+                    <span class="card-title">{{ exp.title }}</span>
                   </div>
                   <div class="col">
                     <div class="badges" id="badge-{{exp.id}}"></div>
@@ -77,7 +70,7 @@ <h4><strong>{{ public_experiments.count }}</strong>
                   </div>
                 </div>
               </div>
-              <div id="collapse{{exp.id}}" class="card-body collapse in py-2" data-parent="#public-experiments">
+              <div id="collapse{{exp.id}}" class="card-body collapse in py-2" data-bs-parent="#public-experiments">
                 <div class="row">
                   <div class="col-md-9 px-1">
                   <div class="accordion-inner">
@@ -126,6 +119,7 @@ <h4><strong>{{ public_experiments.count }}</strong>
                     {% endfor %}
                 </div>
               </div>
+              <a class="btn btn-light mt-3 w-100" href="{% url 'tardis_portal.view_experiment' exp.id %}">View Experiment</a>
             </div>
           </div>
         </div>
@@ -134,7 +128,7 @@ <h4><strong>{{ public_experiments.count }}</strong>
     {% endif %}
     </div>
   </div>
-</div>
+</main>
 <script type="text/javascript">
 $(function() {
     $("#experiments .accordion-body").collapse({parent:"#experiments", toggle: true});
diff --git a/tardis/tardis_portal/templates/tardis_portal/shared.html b/tardis/tardis_portal/templates/tardis_portal/shared.html
index 3e729dbdcb..91cdbb261e 100644
--- a/tardis/tardis_portal/templates/tardis_portal/shared.html
+++ b/tardis/tardis_portal/templates/tardis_portal/shared.html
@@ -8,10 +8,9 @@
 {% load capture %}
 
 {% block content %}
-<div id="content" class="container-fluid">
+<main id="content" class="container">
   <div class="row">
-    <div class="col-md-12">
-      <h3 class="d-block d-sm-none">Experiments</h3>
+    <div class="page-header col-md-12">
       {% if not disable_creation_forms %}
         <div class="pull-right pb-1">
           {% if perms.tardis_portal.add_experiment %}
@@ -24,9 +23,9 @@ <h3 class="d-block d-sm-none">Experiments</h3>
         </div>  <!-- class="pull-right" -->
       {% endif %}
       <div class="pull-left">
-        <h3 class="d-none d-sm-block" style="text-align: center">Experiments</h3>
+        <h1 class="mb-1">Experiments</h3>
       </div>
-    </div>  <!-- class="col-md-12" -->
+    </div> <!-- class="col-md-12" -->
   </div>  <!-- class="row" -->
 
   <div class="row">
@@ -55,7 +54,7 @@ <h4><strong>{{ shared_experiments.count }}</strong>
       {% endif %}
     </div>  <!-- class="col-md-12" -->
   </div>  <!-- class="row" -->
-</div>  <!-- id="content" -->
+</main>  <!-- id="content" -->
 
 <input type="hidden" id="exps-expand-accordion" value="{{ exps_expand_accordion }}">
 {% render_bundle 'tardis_portal_shared' %}