diff --git a/website/src/components/LeftSidebar/LeftSidebar.astro b/website/src/components/LeftSidebar/LeftSidebar.astro
index 47f93ee9..715fd606 100644
--- a/website/src/components/LeftSidebar/LeftSidebar.astro
+++ b/website/src/components/LeftSidebar/LeftSidebar.astro
@@ -13,7 +13,7 @@ const sidebar = SIDEBAR[langCode];
 ---
 
 <nav aria-labelledby="grid-left">
-  <ul class="nav-groups">
+  <ul>
     {
       Object.entries(sidebar).map(([header, children]) => (
         <li>
diff --git a/website/src/components/RightSidebar/RightSidebar.astro b/website/src/components/RightSidebar/RightSidebar.astro
index 89ce6f25..7334b1eb 100644
--- a/website/src/components/RightSidebar/RightSidebar.astro
+++ b/website/src/components/RightSidebar/RightSidebar.astro
@@ -11,7 +11,7 @@ type Props = {
 const { headings, githubEditUrl } = Astro.props as Props;
 ---
 
-<nav aria-labelledby="grid-right" class="min-w-[300px]">
+<nav aria-labelledby="grid-right">
   <TableOfContents client:media="(min-width: 50em)" headings={headings} />
   <MoreMenu editHref={githubEditUrl} />
 </nav>
diff --git a/website/src/layouts/MainLayout.astro b/website/src/layouts/MainLayout.astro
index 06af218d..c2672a40 100644
--- a/website/src/layouts/MainLayout.astro
+++ b/website/src/layouts/MainLayout.astro
@@ -31,21 +31,21 @@ const githubEditUrl = `${CONFIG.GITHUB_EDIT_URL}/${currentFile}`;
   </head>
 
   <body class="h-screen text-gray-50 bg-gray-800">
-    <div class="max-w-full m-auto h-full space-y-4 flex flex-col">
+    <div class="w-full h-full space-y-4 flex flex-col">
       <header class="max-w-full px-4 fixed h-16 top-0 w-full z-[100]">
         <Header currentPage={currentPage} />
       </header>
       <main class="relative pt-16">
-        <aside title="Site Navigation" class="fixed w-[300px] px-4">
-          <LeftSidebar currentPage={currentPage} />
-        </aside>
-        <aside class="w-2xl fixed right-0 h-full overflow-auto pr-8 pl-0 pb-16" title="Table of Contents">
-          <RightSidebar headings={headings} githubEditUrl={githubEditUrl} />
-        </aside>
-        <div class="h-full w-full top-0 pl-[320px] grow overflow-auto px-2">
+        <div class="h-full top-0 overflow-auto px-2 min-w-[300px] flex xl:justify-center pl-[300px] xl:pl-0">
+          <aside title="Site Navigation" class="fixed w-[300px] px-6 left-0">
+            <LeftSidebar currentPage={currentPage} />
+          </aside>
           <PageContent frontmatter={frontmatter} headings={headings} githubEditUrl={githubEditUrl}>
             <slot />
           </PageContent>
+          <aside class="fixed right-0 h-full overflow-auto pr-4 pl-0 pb-16 hidden xl:block" title="Table of Contents">
+            <RightSidebar headings={headings} githubEditUrl={githubEditUrl} />
+          </aside>
         </div>
       </main>
       <!--     <Footer path={currentFile} /> -->
