diff --git a/src/components/ArticleContainer.astro b/src/components/ArticleContainer.astro
index 7af296c..41fa49d 100644
--- a/src/components/ArticleContainer.astro
+++ b/src/components/ArticleContainer.astro
@@ -8,7 +8,7 @@ export interface Props {
 const { className = "", dataPagefindBody = true } = Astro.props;
 ---
 
-<article class={`${className}`} data-pagefind-body={dataPagefindBody}>
+<article class={`${className} w-full`} data-pagefind-body={dataPagefindBody}>
 	<slot />
 
 	<div id="myModal" class="modal">
diff --git a/src/components/blog/Masthead.astro b/src/components/blog/Masthead.astro
index a757f29..de6757b 100644
--- a/src/components/blog/Masthead.astro
+++ b/src/components/blog/Masthead.astro
@@ -26,7 +26,7 @@ const socialImageURL = new URL(ogImage ? ogImage : "/social-card.png", Astro.url
 
 {
 	socialImageURL && (
-		<div class="mb-6 aspect-video p-4">
+		<div class="mb-6 aspect-video">
 			<img
 				alt={socialImageURL}
 				class="rounded-lg object-cover"
diff --git a/src/layouts/Base.astro b/src/layouts/Base.astro
index 8144275..abbb722 100644
--- a/src/layouts/Base.astro
+++ b/src/layouts/Base.astro
@@ -27,7 +27,7 @@ const {
 		/>
 	</head>
 	<body
-		class="bg-global-bg text-global-text mx-auto flex min-h-screen max-w-5xl flex-col px-4 pt-16 font-mono text-sm font-normal antialiased sm:px-8"
+		class="bg-global-bg text-global-text mx-auto flex min-h-screen max-w-4xl flex-col px-4 pt-16 font-mono text-sm font-normal antialiased sm:px-8"
 	>
 		<ThemeProvider />
 		<SkipLink />
diff --git a/src/layouts/BlogPost.astro b/src/layouts/BlogPost.astro
index a4081df..8418fe3 100644
--- a/src/layouts/BlogPost.astro
+++ b/src/layouts/BlogPost.astro
@@ -39,7 +39,7 @@ const readingTime: string = remarkPluginFrontmatter.readingTime;
 		tags: [category, ...tags].join(", "),
 	}}
 >
-	<div class="hidden flex-col gap-10 lg:flex lg:flex-row lg:items-start">
+	<div class="hidden w-full flex-col gap-10 lg:flex lg:flex-row lg:items-start">
 		{!!headings.length && <TOC headings={headings} classname="lg:w-64 lg:flex-shrink-0" />}
 
 		<ArticleContainer className="grow break-words" dataPagefindBody={true}>
@@ -48,7 +48,7 @@ const readingTime: string = remarkPluginFrontmatter.readingTime;
 			</div>
 			<div class="flex flex-col gap-10 lg:flex-row lg:items-start">
 				<div
-					class="prose prose-base prose-headings:font-semibold prose-headings:text-accent-2 prose-headings:before:absolute prose-headings:before:-ms-4 prose-headings:before:text-gray-600 prose-headings:hover:before:text-accent sm:prose-headings:before:content-['#'] sm:prose-th:before:content-none lg:!max-w-none"
+					class="prose prose-base prose-headings:font-semibold prose-headings:text-accent-2 prose-headings:before:absolute prose-headings:before:-ms-4 prose-headings:before:text-gray-600 prose-headings:hover:before:text-accent sm:prose-headings:before:content-['#'] sm:prose-th:before:content-none w-full lg:!max-w-none"
 				>
 					<slot />
 					<WebMentions />
@@ -69,7 +69,7 @@ const readingTime: string = remarkPluginFrontmatter.readingTime;
 		<div class="flex flex-col gap-10 lg:flex-row lg:items-start">
 			{!!headings.length && <TOC headings={headings} classname="lg:w-64 lg:flex-shrink-0" />}
 			<div
-				class="prose prose-base prose-headings:font-semibold prose-headings:text-accent-2 prose-headings:before:absolute prose-headings:before:-ms-4 prose-headings:before:text-gray-600 prose-headings:hover:before:text-accent sm:prose-headings:before:content-['#'] sm:prose-th:before:content-none lg:!max-w-none"
+				class="prose prose-base prose-headings:font-semibold prose-headings:text-accent-2 prose-headings:before:absolute prose-headings:before:-ms-4 prose-headings:before:text-gray-600 prose-headings:hover:before:text-accent sm:prose-headings:before:content-['#'] sm:prose-th:before:content-none w-full lg:!max-w-none"
 			>
 				<slot />
 				<WebMentions />
diff --git a/src/pages/categories/[category]/[...page].astro b/src/pages/categories/[category]/[...page].astro
index 46b4458..e8990b7 100644
--- a/src/pages/categories/[category]/[...page].astro
+++ b/src/pages/categories/[category]/[...page].astro
@@ -15,7 +15,7 @@ export const getStaticPaths: GetStaticPaths = async ({ paginate }) => {
 	return uniqueCategories.flatMap((category) => {
 		const filterPosts = sortedPosts.filter((post) => post.data.category === category);
 		return paginate(filterPosts, {
-			pageSize: 10,
+			pageSize: 20,
 			params: { category },
 		});
 	});
diff --git a/src/pages/category/[category]/[...page].astro b/src/pages/category/[category]/[...page].astro
index be4c8d6..b2b42ff 100644
--- a/src/pages/category/[category]/[...page].astro
+++ b/src/pages/category/[category]/[...page].astro
@@ -12,7 +12,7 @@ export const getStaticPaths: GetStaticPaths = async ({ paginate }) => {
 	return uniqueCategories.flatMap((category) => {
 		const filterPosts = sortedPosts.filter((post) => post.data.category === category);
 		return paginate(filterPosts, {
-			pageSize: 10,
+			pageSize: 20,
 			params: { category },
 		});
 	});
diff --git a/src/pages/posts/[...page].astro b/src/pages/posts/[...page].astro
index 1f40e43..5c3c4d2 100644
--- a/src/pages/posts/[...page].astro
+++ b/src/pages/posts/[...page].astro
@@ -85,12 +85,14 @@ const descYearKeys = Object.keys(groupedByYear).sort((a, b) => +b - +a);
 			<Pagination {...paginationProps} />
 		</div>
 
-		<aside class="flex flex-col gap-2">
+		<aside class="flex flex-col gap-8">
 			{
 				!!uniqueTags.length && (
 					<div>
 						<h2 class="title mb-4 flex items-center gap-2 text-lg">
-							Tags
+							<a href="/tags/" class="hover:text-link cactus-link">
+								Tags
+							</a>
 							<svg
 								aria-hidden="true"
 								class="h-6 w-6"
@@ -119,12 +121,6 @@ const descYearKeys = Object.keys(groupedByYear).sort((a, b) => +b - +a);
 								</li>
 							))}
 						</ul>
-						<span class="mt-4 block sm:text-end">
-							<a class="hover:text-link" href="/tags/">
-								View all <span aria-hidden="true">→</span>
-								<span class="sr-only">blog tags</span>
-							</a>
-						</span>
 					</div>
 				)
 			}
@@ -133,7 +129,9 @@ const descYearKeys = Object.keys(groupedByYear).sort((a, b) => +b - +a);
 				!!uniqueCategories.length && (
 					<div>
 						<h2 class="title mb-4 flex items-center gap-2 text-lg">
-							Categories
+							<a href="/categories/" class="hover:text-link cactus-link">
+								Categories
+							</a>
 							<svg
 								aria-hidden="true"
 								class="h-6 w-6"
@@ -165,12 +163,6 @@ const descYearKeys = Object.keys(groupedByYear).sort((a, b) => +b - +a);
 								</li>
 							))}
 						</ul>
-						<span class="mt-4 block sm:text-end">
-							<a class="hover:text-link" href="/categories/">
-								View all <span aria-hidden="true">→</span>
-								<span class="sr-only">blog categories</span>
-							</a>
-						</span>
 					</div>
 				)
 			}
diff --git a/src/pages/tag/[tag]/[...page].astro b/src/pages/tag/[tag]/[...page].astro
index 91081ad..f061fb5 100644
--- a/src/pages/tag/[tag]/[...page].astro
+++ b/src/pages/tag/[tag]/[...page].astro
@@ -12,7 +12,7 @@ export const getStaticPaths: GetStaticPaths = async ({ paginate }) => {
 	return uniqueTags.flatMap((tag) => {
 		const filterPosts = sortedPosts.filter((post) => post.data.tags.includes(tag));
 		return paginate(filterPosts, {
-			pageSize: 10,
+			pageSize: 20,
 			params: { tag },
 		});
 	});
diff --git a/src/pages/tags/[tag]/[...page].astro b/src/pages/tags/[tag]/[...page].astro
index 26dbde4..8006b60 100644
--- a/src/pages/tags/[tag]/[...page].astro
+++ b/src/pages/tags/[tag]/[...page].astro
@@ -15,7 +15,7 @@ export const getStaticPaths: GetStaticPaths = async ({ paginate }) => {
 	return uniqueTags.flatMap((tag) => {
 		const filterPosts = sortedPosts.filter((post) => post.data.tags.includes(tag));
 		return paginate(filterPosts, {
-			pageSize: 10,
+			pageSize: 20,
 			params: { tag },
 		});
 	});
