diff --git a/app/assets/icons/settings.svg b/app/assets/icons/settings.svg
index e5a29e46..53361438 100644
--- a/app/assets/icons/settings.svg
+++ b/app/assets/icons/settings.svg
@@ -1,4 +1,4 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
 <circle cx="12" cy="12" r="4.5" stroke="#1D9089" stroke-linecap="square" stroke-linejoin="round"/>
-<path d="M20.8829 15.122C21.0154 15.2796 21.0377 15.5023 20.9392 15.6831L19.5019 18.3193C19.3958 18.5139 19.1744 18.6154 18.9578 18.5688L17.6328 18.2838L17.6323 18.2837C16.9511 18.1365 16.2411 18.2581 15.6352 18.6295C15.0284 19.0016 14.5653 19.6007 14.3414 20.3188L14.3402 20.3227L14.3402 20.3227L13.9135 21.6527C13.8471 21.8597 13.6547 22 13.4374 22H10.5629C10.3419 22 10.147 21.8549 10.0838 21.6431L9.68048 20.2923C9.45632 19.5754 8.99359 18.9773 8.38756 18.6058C7.78166 18.2343 7.07165 18.1127 6.39048 18.26L6.38998 18.2601L5.06501 18.5451C4.84992 18.5913 4.62985 18.4916 4.52291 18.2993L3.0632 15.6749C2.96238 15.4936 2.98394 15.269 3.1174 15.1102L4.01568 14.0414L4.01666 14.0402C4.49071 13.4797 4.75622 12.7494 4.75622 11.9881C4.75622 11.2269 4.49071 10.4965 4.01667 9.936L4.01568 9.93483L3.1174 8.86608C2.98449 8.70795 2.9625 8.48436 3.06208 8.30337L4.49933 5.69087C4.60579 5.49735 4.82662 5.39661 5.04255 5.44306L6.36752 5.72806L6.36803 5.72816C7.04919 5.87542 7.7592 5.75381 8.3651 5.38234C8.9719 5.01032 9.43503 4.4112 9.65887 3.69309L9.65972 3.69036L9.65973 3.69036L10.0864 2.34849C10.1524 2.14095 10.3451 2 10.5629 2H13.4374C13.6556 2 13.8487 2.14155 13.9143 2.3497L14.341 3.70345L14.3414 3.70496C14.5653 4.42308 15.0284 5.0222 15.6352 5.39422C16.2411 5.76568 16.9511 5.8873 17.6323 5.74004L17.6328 5.73993L18.9578 5.45493C19.1744 5.40833 19.3958 5.50987 19.5019 5.70441L20.9392 8.34066C21.0377 8.52142 21.0154 8.74411 20.8829 8.90171L19.9851 9.96993L20.8829 15.122ZM20.8829 15.122L19.9851 14.0538M20.8829 15.122L19.9851 14.0538M19.9851 14.0538L19.9846 14.0533C19.5161 13.4941 19.2541 12.7681 19.2541 12.0119C19.2541 11.2557 19.5161 10.5297 19.9846 9.97046L19.9851 14.0538Z" stroke="#1D9089" stroke-linecap="square" stroke-linejoin="round"/>
-</svg>
+<path d="M20.8829 15.122C21.0154 15.2796 21.0377 15.5023 20.9392 15.6831L19.5019 18.3193C19.3958 18.5139 19.1744 18.6154 18.9578 18.5688L17.6328 18.2838L17.6323 18.2837C16.9511 18.1365 16.2411 18.2581 15.6352 18.6295C15.0284 19.0016 14.5653 19.6007 14.3414 20.3188L14.3402 20.3227L14.3402 20.3227L13.9135 21.6527C13.8471 21.8597 13.6547 22 13.4374 22H10.5629C10.3419 22 10.147 21.8549 10.0838 21.6431L9.68046 20.2923C9.4563 19.5754 8.99358 18.9773 8.38756 18.6058C7.78166 18.2343 7.07165 18.1127 6.39048 18.26L6.38998 18.2601L5.06501 18.5451C4.84992 18.5913 4.62985 18.4916 4.52291 18.2993L3.0632 15.6749C2.96238 15.4936 2.98394 15.269 3.1174 15.1102L4.01568 14.0414L4.01666 14.0402C4.49071 13.4797 4.75622 12.7494 4.75622 11.9881C4.75622 11.2269 4.49071 10.4965 4.01667 9.936L4.01568 9.93483L3.1174 8.86608C2.98449 8.70795 2.9625 8.48436 3.06208 8.30337L4.49933 5.69087C4.60579 5.49735 4.82662 5.39661 5.04255 5.44306L6.36752 5.72806L6.36803 5.72816C7.04919 5.87542 7.7592 5.75381 8.3651 5.38234C8.9719 5.01032 9.43503 4.4112 9.65887 3.69309L9.65972 3.69036L9.65973 3.69036L10.0864 2.34849C10.1524 2.14095 10.3451 2 10.5629 2H13.4374C13.6556 2 13.8487 2.14155 13.9143 2.3497L14.341 3.70345L14.3414 3.70496C14.5653 4.42308 15.0284 5.0222 15.6352 5.39422C16.2411 5.76568 16.9511 5.8873 17.6323 5.74004L17.6328 5.73993L18.9578 5.45493C19.1744 5.40833 19.3958 5.50987 19.5019 5.70441L20.9392 8.34066C21.0377 8.52142 21.0154 8.74411 20.8829 8.90171L19.9851 9.96993C19.985 9.97007 19.9849 9.9702 19.9847 9.97033C19.5162 10.5296 19.2541 11.2556 19.2541 12.0119C19.2541 12.7681 19.5161 13.4941 19.9846 14.0533L20.8829 15.122ZM20.8829 15.122L19.9851 14.0538L20.8829 15.122Z" stroke="#1D9089" stroke-linecap="square" stroke-linejoin="round"/>
+</svg>
\ No newline at end of file
diff --git a/app/components/Button/button.css b/app/components/Button/button.css
index 783d45da..14da2b39 100644
--- a/app/components/Button/button.css
+++ b/app/components/Button/button.css
@@ -9,6 +9,7 @@
   box-shadow: 0px var(--spacing-16) var(--spacing-40) 0px rgba(32, 44, 89, 0.05);
   border-radius: var(--border-radius);
   box-sizing: border-box;
+  position: relative;
 
   background: var(--colors-white, #ffffff);
   border: 1px solid var(--colors-cool-grey-200, #dfe3e9);
@@ -164,7 +165,10 @@
   border: 1px solid var(--colors-teal-200, #a6d9d7);
 }
 
-.button-secondary:hover .tool-tip-secondary {
+.button-secondary:hover .tool-tip {
+  opacity: 1;
+}
+.button:hover .tool-tip {
   opacity: 1;
 }
 
@@ -236,20 +240,7 @@
   height: min-content;
 }
 
-.tooltip::after {
-  content: attr(data-tooltip);
-  position: absolute;
-  transform: translateY(var(--spacing-56, 56px));
-  padding: var(--spacing-16);
-  color: var(--colors-white);
-  background: var(--colors-black);
-  border-radius: 5px;
-  display: none;
-  z-index: 1;
-  font-size: 16px; /* hard to set via classes, what with this being a pseudoclass */
-}
-
-.tool-tip-secondary {
+.tool-tip {
   opacity: 0;
   position: absolute;
   top: -42px;
@@ -273,3 +264,8 @@
   opacity: 0.6;
   cursor: inherit;
 }
+.button-secondary:disabled,
+.button-secondary[disabled] {
+  opacity: 0.8;
+  cursor: inherit;
+}
diff --git a/app/components/Button/index.tsx b/app/components/Button/index.tsx
index dbba0dbc..788708f6 100644
--- a/app/components/Button/index.tsx
+++ b/app/components/Button/index.tsx
@@ -28,7 +28,6 @@ const Button = ({
   const classes = [
     (secondary && 'button-secondary') || 'button',
     className,
-    tooltip && !secondary && 'tooltip',
     secondary && active && 'active',
     secondary && !active && !disabled && 'inactive',
   ]
@@ -39,7 +38,6 @@ const Button = ({
       <Link
         to={action}
         className={classes}
-        data-tooltip={tooltip}
         onClick={(e) => {
           if (disabled) {
             e.preventDefault()
@@ -48,24 +46,14 @@ const Button = ({
         {...props}
       >
         {children}
-        {secondary && tooltip && !disabled && !mobile && (
-          <p className="tool-tip-secondary xs">{tooltip}</p>
-        )}
+        {tooltip && !disabled && !mobile && <p className="tool-tip xs z-index-1">{tooltip}</p>}
       </Link>
     )
   }
   return (
-    <button
-      className={classes}
-      onClick={action}
-      data-tooltip={tooltip}
-      disabled={disabled}
-      {...props}
-    >
+    <button className={classes} onClick={action} disabled={disabled} {...props}>
       {children}
-      {secondary && tooltip && !disabled && !mobile && (
-        <p className="tool-tip-secondary xs">{tooltip}</p>
-      )}
+      {tooltip && !disabled && !mobile && <p className="tool-tip xs z-index-1">{tooltip}</p>}
     </button>
   )
 }
diff --git a/app/components/Chatbot/ChatEntry.tsx b/app/components/Chatbot/ChatEntry.tsx
index a716daaa..2293b192 100644
--- a/app/components/Chatbot/ChatEntry.tsx
+++ b/app/components/Chatbot/ChatEntry.tsx
@@ -123,7 +123,7 @@ const ReferencePopup = (
       className={`reference-popup background z-index-2 ${citation.className || ''}`}
       onClick={citation.onClose}
     >
-      <div className="reference-contents bordered">
+      <div onClick={(e) => e.stopPropagation()} className="reference-contents bordered">
         <ReferenceSummary {...citation} titleClass="large-bold" />
         <div className="grey padding-bottom-16 padding-top-32 xs">Referenced excerpt</div>
         <div
diff --git a/app/components/Chatbot/chat_entry.css b/app/components/Chatbot/chat_entry.css
index 14fb09d6..cba79647 100644
--- a/app/components/Chatbot/chat_entry.css
+++ b/app/components/Chatbot/chat_entry.css
@@ -177,12 +177,11 @@ article.stampy {
     transform: translate(-50%, 35px);
     min-width: 30vw;
   }
-}
-
-.reference-popup:hover,
-.reference-link:hover + .reference-popup {
-  visibility: visible;
-  transition-delay: 0s;
+  .reference-popup:hover,
+  .reference-link:hover + .reference-popup {
+    visibility: visible;
+    transition-delay: 0s;
+  }
 }
 
 .chat-entry article {
@@ -195,4 +194,13 @@ article.stampy {
     align-items: start;
     justify-content: flex-start;
   }
+  .reference-contents {
+    flex-shrink: 0;
+    width: 87.2vw;
+    margin-top: 48px;
+  }
+  .reference-popup {
+    display: flex;
+    flex-direction: column;
+  }
 }
diff --git a/app/components/Chatbot/index.tsx b/app/components/Chatbot/index.tsx
index 128e5d9f..491bdd22 100644
--- a/app/components/Chatbot/index.tsx
+++ b/app/components/Chatbot/index.tsx
@@ -157,7 +157,7 @@ const Followups = ({title, followups, onSelect, className}: FollowupsProps) => {
         ].slice(0, 3)
   return (
     <>
-      {title && <div className={'padding-bottom-24 grey' + (className || '')}>{title}</div>}
+      {title && <div className={'padding-bottom-24' + (className || '')}>{title}</div>}
 
       {items?.map(({text, pageid}, i) => (
         <div key={i} className="padding-bottom-16">
diff --git a/app/components/icons-generated/Settings.tsx b/app/components/icons-generated/Settings.tsx
index b0f93ef4..df61d616 100644
--- a/app/components/icons-generated/Settings.tsx
+++ b/app/components/icons-generated/Settings.tsx
@@ -13,7 +13,7 @@ const SvgSettings = (props: SVGProps<SVGSVGElement>) => (
       stroke="#1D9089"
       strokeLinecap="square"
       strokeLinejoin="round"
-      d="M20.883 15.122a.5.5 0 0 1 .056.561l-1.437 2.636a.5.5 0 0 1-.544.25l-1.325-.285h0a2.7 2.7 0 0 0-1.998.346 3.03 3.03 0 0 0-1.294 1.689v.004h0l-.427 1.33a.5.5 0 0 1-.477.347h-2.874a.5.5 0 0 1-.48-.357l-.403-1.35a3.03 3.03 0 0 0-1.292-1.687 2.7 2.7 0 0 0-1.998-.346h0l-1.325.285a.5.5 0 0 1-.542-.246l-1.46-2.624a.5.5 0 0 1 .054-.565l.899-1.069h0c.475-.561.74-1.292.74-2.053s-.265-1.492-.74-2.052v-.001l-.899-1.069a.5.5 0 0 1-.055-.563L4.5 5.691a.5.5 0 0 1 .544-.248l1.325.285h0a2.7 2.7 0 0 0 1.997-.346A3.03 3.03 0 0 0 9.66 3.693V3.69h0l.427-1.342A.5.5 0 0 1 10.563 2h2.874a.5.5 0 0 1 .477.35l.427 1.353v.002a3.03 3.03 0 0 0 1.294 1.69 2.7 2.7 0 0 0 1.997.345h0l1.326-.285a.5.5 0 0 1 .544.25l1.437 2.636a.5.5 0 0 1-.056.56l-.898 1.069zm0 0-.898-1.068m.898 1.068-.898-1.068m0 0h0a3.18 3.18 0 0 1-.73-2.042c0-.756.261-1.482.73-2.042z"
+      d="M20.883 15.122a.5.5 0 0 1 .056.561l-1.437 2.636a.5.5 0 0 1-.544.25l-1.325-.285h0a2.7 2.7 0 0 0-1.998.346 3.03 3.03 0 0 0-1.294 1.689v.004h0l-.427 1.33a.5.5 0 0 1-.477.347h-2.874a.5.5 0 0 1-.48-.357l-.403-1.35a3.03 3.03 0 0 0-1.292-1.687 2.7 2.7 0 0 0-1.998-.346h0l-1.325.285a.5.5 0 0 1-.542-.246l-1.46-2.624a.5.5 0 0 1 .054-.565l.899-1.069h0c.475-.561.74-1.292.74-2.053s-.265-1.492-.74-2.052v-.001l-.899-1.069a.5.5 0 0 1-.055-.563L4.5 5.691a.5.5 0 0 1 .544-.248l1.325.285h0a2.7 2.7 0 0 0 1.997-.346A3.03 3.03 0 0 0 9.66 3.693V3.69h0l.427-1.342A.5.5 0 0 1 10.563 2h2.874a.5.5 0 0 1 .477.35l.427 1.353v.002a3.03 3.03 0 0 0 1.294 1.69 2.7 2.7 0 0 0 1.997.345h0l1.326-.285a.5.5 0 0 1 .544.25l1.437 2.636a.5.5 0 0 1-.056.56l-.898 1.069q0 0 0 0a3.18 3.18 0 0 0-.73 2.042c0 .756.261 1.482.73 2.041zm0 0-.898-1.068z"
     />
   </svg>
 )
diff --git a/app/components/popups.ts b/app/components/popups.ts
index 3a8fdc52..d682ee4f 100644
--- a/app/components/popups.ts
+++ b/app/components/popups.ts
@@ -1,5 +1,5 @@
 export const scrollToElement = (e: HTMLElement, offset?: number) => {
-  const elementPosition = e.getBoundingClientRect().top + window.pageYOffset
+  const elementPosition = e.getBoundingClientRect().top + window.scrollY
   const offsetPosition = elementPosition - (offset || 0)
 
   window.scrollTo({top: offsetPosition, behavior: 'smooth'})
diff --git a/app/root.css b/app/root.css
index 14330e1f..688cf9ae 100644
--- a/app/root.css
+++ b/app/root.css
@@ -561,6 +561,9 @@ svg {
 /* mobile */
 
 @media (max-width: 780px) {
+  body {
+    overflow-x: hidden;
+  }
   .page-body {
     padding: 0px var(--spacing-48);
   }
diff --git a/app/routes/chat.tsx b/app/routes/chat.tsx
index db619cfe..b1203edd 100644
--- a/app/routes/chat.tsx
+++ b/app/routes/chat.tsx
@@ -28,7 +28,10 @@ export default function App() {
   const ModeButton = ({name, mode}: {name: string; mode: Mode}) => (
     <Button
       className={chatSettings.mode === mode ? 'secondary-selected' : 'secondary'}
-      action={() => setChatSettings({...chatSettings, mode})}
+      action={() => {
+        setShowSettings(false)
+        setChatSettings({...chatSettings, mode})
+      }}
     >
       {name}
     </Button>