diff --git a/frontend/packages/components/src/mdx/code.tsx b/frontend/packages/components/src/mdx/code.tsx
index c217846b4d..d7cdc84902 100644
--- a/frontend/packages/components/src/mdx/code.tsx
+++ b/frontend/packages/components/src/mdx/code.tsx
@@ -180,6 +180,7 @@ export const code = ({
 	}
 	return (
 		<code
+			className="whitespace-pre-wrap break-all"
 			// biome-ignore lint/security/noDangerouslySetInnerHtml: it's generated from markdown
 			dangerouslySetInnerHTML={{ __html: escapeHTML(children as string) }}
 		/>
diff --git a/site/src/app/not-found.tsx b/site/src/app/not-found.tsx
index bb8fd9322a..62ff5afb81 100644
--- a/site/src/app/not-found.tsx
+++ b/site/src/app/not-found.tsx
@@ -1,14 +1,14 @@
 import { Button } from "@/components/Button";
 import { Footer } from "@/components/Footer";
-import { Header } from "@/components/Header";
 import { Icon, faBlockQuestion } from "@rivet-gg/icons";
 import "@/styles/tailwind.css";
 import "@/styles/fonts.css";
+import { FancyHeader } from "@/components/v2/FancyHeader";
 
 function PageNotFound() {
 	return (
-		<div>
-			<Header />
+		<>
+			<FancyHeader />
 			<div className="relative pt-14">
 				<div className="relative flex min-h-[80vh] w-full items-center justify-center text-center">
 					<div className="transition-opacity">
@@ -26,7 +26,7 @@ function PageNotFound() {
 				</div>
 			</div>
 			<Footer />
-		</div>
+		</>
 	);
 }