diff --git a/src/lib/components/Blog/Article.svelte b/src/lib/components/Blog/Article.svelte
index 9ea3c30..debe5cb 100644
--- a/src/lib/components/Blog/Article.svelte
+++ b/src/lib/components/Blog/Article.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
 	import { ChevronRight } from 'svelte-radix';
 	import PostMetadata from './PostMetadata.svelte';
+	import Separator from '../ui/separator/separator.svelte';
 
 	export let doc: BlogDocument;
 </script>
@@ -31,5 +32,6 @@
 
 	<div class="markdown-body mt-8 font-serif">
 		{@html doc.content}
+		<div role="note" id="end-marker" aria-label="End of article" class="invisible h-0 w-0">End</div>
 	</div>
 </article>
diff --git a/src/lib/components/StickyToc.svelte b/src/lib/components/StickyToc.svelte
deleted file mode 100644
index 93da107..0000000
--- a/src/lib/components/StickyToc.svelte
+++ /dev/null
@@ -1,72 +0,0 @@
-<script lang="ts">
-	import { toclink, type TocStore } from '@svelte-put/toc';
-	import * as Card from '$lib/components/ui/card';
-	import { onMount } from 'svelte';
-
-	export let tocStore: TocStore;
-	export let distanceFromRight: number;
-
-	let el: HTMLElement;
-
-	let hide = false;
-
-	const readjust = () => {
-		el && (el.style.right = `calc(${distanceFromRight - el.clientWidth}px - 20px)`);
-	};
-
-	onMount(() => {
-		readjust();
-	});
-
-	$: readjust();
-
-	$: if (distanceFromRight < 220 && !hide) {
-		hide = true;
-	}
-
-	$: if (distanceFromRight >= 220 && hide) {
-		hide = false;
-	}
-
-	const calcIndent = (el: HTMLElement) => {
-		readjust();
-		if (el.tagName === 'H1' || el.tagName === 'H2') return '0px';
-		if (el.tagName === 'H3') return '1rem';
-		if (el.tagName === 'H4') return '2rem';
-		if (el.tagName === 'H5') return '3rem';
-		if (el.tagName === 'H6') return '4rem';
-		return '0px';
-	};
-
-	const calcTextClasses = (el: HTMLElement) => {
-		if (el.tagName === 'H1') return 'text-lg mb-2';
-		if (el.tagName === 'H2') return 'text-lg my-2';
-		return 'text-sm my-2 text-muted-foreground';
-	};
-</script>
-
-<aside class="fixed top-36 x-4 mx-4" bind:this={el}>
-	<Card.Root>
-		<Card.Header>
-			<Card.Title><h2 class="text-xl">On this page</h2></Card.Title>
-		</Card.Header>
-		<Card.Content>
-			{#if $tocStore.items.size}
-				<ol>
-					{#each $tocStore.items.values() as tocItem}
-						<li
-							style="margin-left: {calcIndent(tocItem.element)}"
-							class={calcTextClasses(tocItem.element)}
-						>
-							<!-- svelte-ignore a11y-missing-attribute a11y-missing-content -->
-							<a
-								use:toclink={{ store: tocStore, tocItem, observe: true }}
-								class="hover:underline"
-							/>
-						</li>
-					{/each}
-				</ol>
-			{/if}
-		</Card.Content>
-	</Card.Root>
-</aside>
diff --git a/src/lib/components/Toc/StickyToc.svelte b/src/lib/components/Toc/StickyToc.svelte
new file mode 100644
index 0000000..0819fef
--- /dev/null
+++ b/src/lib/components/Toc/StickyToc.svelte
@@ -0,0 +1,34 @@
+<script lang="ts">
+	import { toclink, type TocStore } from '@svelte-put/toc';
+	import * as Card from '$lib/components/ui/card';
+
+	export let tocStore: TocStore;
+
+	const calcTextClasses = (el: HTMLElement) => {
+		if (el.tagName === 'H1') return 'text-md xl:text-lg';
+		if (el.tagName === 'H2') return 'text-md xl:text-lg';
+		if (el.id === 'end-marker') return 'text-md xl:text-lg';
+		return 'text-sm text-muted-foreground';
+	};
+</script>
+
+<Card.Root>
+	<Card.Header>
+		<Card.Title><h2 class="text-lg xl:text-xl">On this page</h2></Card.Title>
+	</Card.Header>
+	<Card.Content>
+		{#if $tocStore.items.size}
+			<ol>
+				{#each $tocStore.items.values() as tocItem}
+					<li>
+						<!-- svelte-ignore a11y-missing-attribute a11y-missing-content -->
+						<a
+							use:toclink={{ store: tocStore, tocItem, observe: true }}
+							class={`hover:bg-muted px-2 py-1 rounded-r-sm transition-all border-l-secondary border-l-4 ${calcTextClasses(tocItem.element)}`}
+						/>
+					</li>
+				{/each}
+			</ol>
+		{/if}
+	</Card.Content>
+</Card.Root>
diff --git a/src/routes/blog/[year]/[slug]/+page.svelte b/src/routes/blog/[year]/[slug]/+page.svelte
index ecec4dd..6bcc36b 100644
--- a/src/routes/blog/[year]/[slug]/+page.svelte
+++ b/src/routes/blog/[year]/[slug]/+page.svelte
@@ -6,24 +6,9 @@
 	import { cn } from '$lib/utils.js';
 	import Article from '$lib/components/Blog/Article.svelte';
 	import { toc, createTocStore } from '@svelte-put/toc';
-	import StickyToc from '$lib/components/StickyToc.svelte';
+	import StickyToc from '$lib/components/Toc/StickyToc.svelte';
 	import { onMount } from 'svelte';
 
-	let distanceFromRight = 0;
-
-	let mainElement: HTMLElement;
-
-	const handleResize = () => {
-		const screenWidth = window.innerWidth;
-		const mainWidth = mainElement.offsetWidth;
-		distanceFromRight = screenWidth - mainWidth - mainElement.offsetLeft;
-		console.log(distanceFromRight);
-	};
-
-	onMount(() => {
-		handleResize();
-	});
-
 	const tocStore = createTocStore();
 
 	export let data: PageData;
@@ -48,21 +33,26 @@
 	<meta name="author" content="Youwen Wu" />
 </svelte:head>
 
-<svelte:window on:resize={handleResize} />
+<div class="md:flex max-w-6xl mx-auto mt-14 px-4">
+	<main
+		class="flex-grow basis-3/4"
+		use:toc={{
+			store: tocStore,
+			observe: true,
+			anchor: {
+				properties: { 'aria-hidden': 'true', class: 'hidden' },
+				position: 'before'
+			},
+			scrollMarginTop: 120,
+			selector: 'h1, h2, h3, h4, h5, h6, #end-marker'
+		}}
+	>
+		<Article {doc} />
+	</main>
 
-<main
-	bind:this={mainElement}
-	class="max-w-4xl mx-auto lg:mx-0 xl:mx-auto px-4 mt-8 mb-14"
-	use:toc={{
-		store: tocStore,
-		observe: true,
-		anchor: {
-			properties: { 'aria-hidden': 'true', 'tab-index': '-1', class: 'hidden' },
-			position: 'before'
-		}
-	}}
->
-	<Article {doc} />
-</main>
-
-<StickyToc {tocStore} {distanceFromRight} />
+	<aside class="basis-1/4 relative hidden md:block">
+		<div class="fixed mx-8">
+			<StickyToc {tocStore} />
+		</div>
+	</aside>
+</div>