diff --git a/site/components/Layout.js b/site/components/Layout.js
index 3e3a77e..4b60c0e 100644
--- a/site/components/Layout.js
+++ b/site/components/Layout.js
@@ -17,9 +17,13 @@ export default function Layout({ children }) {
         <link rel="preconnect" href="https://fonts.gstatic.com" crossOrigin="" />
       </Head>
       <Nav />
-      <main className="max-w-7xl mx-auto px-2 sm:px-6 lg:px-8">
-        <Sidebar />
-        {children}
+      <main className="max-w-7xl mx-auto px-2 sm:px-6 lg:px-8 border-2 border-green-500">
+        <div className="hidden lg:block w-[16rem] fixed top-16 left-[max(0px,calc(50%-40rem))] bottom-0 right-auto px-8 overflow-y-auto border-2 border-red-500">
+          <Sidebar />
+        </div>
+        <div className="lg:pl-[16rem]">
+          {children}
+        </div>
       </main>
       <footer className="w-full h-24 mt-16">
         <div className="max-w-7xl mx-auto py-12 px-4 overflow-hidden sm:px-6 lg:px-8">
diff --git a/site/components/MDX.js b/site/components/MDX.js
index 43b3af2..dddd147 100644
--- a/site/components/MDX.js
+++ b/site/components/MDX.js
@@ -84,7 +84,7 @@ export default function MdxPage({ children }) {
           { name: "keywords", content: keywords ? keywords : "" }
         ]}
       />
-      <article className="prose dark:prose-invert prose-a:break-all mx-auto p-6">
+      <article className="prose max-w-none dark:prose-invert prose-a:break-all mx-auto p-6 xl:mr-50 xl:pr-10 border-2 border-yellow-500">
         <header>
           <div className="mb-6">
             {title && <h1 className="mb-0">{title}</h1>}
@@ -117,6 +117,7 @@ export default function MdxPage({ children }) {
         </header>
         <main>
           <div className="my-6">
+<<<<<<< HEAD
           <Component components={components} />
         </div>
         {editUrl && (
@@ -130,7 +131,33 @@ export default function MdxPage({ children }) {
               </span>
             </a>
           </div>)}
+=======
+            <Component components={components} />
+          </div>
+          {editUrl && (
+            <div className='mt-12 mb-6'>
+              <a className="flex no-underline font-semibold text-yellow-li" href={editUrl} target="_blank">
+                Edit this page
+                <span className="mx-1">
+                  <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth="2">
+                    <path strokeLinecap="round" strokeLinejoin="round" d="M10 6H6a2 2 0 00-2 2v10a2 2 0 002 2h10a2 2 0 002-2v-4M14 4h6m0 0v6m0-6L10 14" />
+                  </svg>
+                </span>
+              </a>
+            </div>)}
+>>>>>>> 34c9b77 ([components/sidebar][f]: layout ajd for sidebar)
         </main>
+        {/* <div className="hidden xl:block w-50 fixed inset-0 right-auto overflow-y-auto"> */}
+        {/*   <nav> */}
+        {/*     <ul> */}
+        {/*       <li>Heading 1</li> */}
+        {/*       <li>Heading 2</li> */}
+        {/*       <li>Heading 3</li> */}
+        {/*       <li>Heading 4</li> */}
+        {/*       <li>Heading 5</li> */}
+        {/*     </ul> */}
+        {/*   </nav> */}
+        {/* </div> */}
       </article>
     </>
   );
diff --git a/site/components/Sidebar.js b/site/components/Sidebar.js
index 8d6fd3e..eb01a6b 100644
--- a/site/components/Sidebar.js
+++ b/site/components/Sidebar.js
@@ -1,17 +1,17 @@
 export default function Sidebar (props) {
   // max-w-7xl = max-w-80rem
   // w-60 = 15rem
+  // prose max-width = 65ch
   return (
-      <div className="hidden lg:block w-[16rem] fixed top-16 left-[max(0px,calc(50%-40rem))] bottom-0 right-auto px-2 sm:px-6 lg:px-8 overflow-y-auto">
-        {/* TODO LHS TOC */}
-        <nav>
-          <ul>
-            <li>Heading 1</li>
-            <li>Heading 2</li>
-            <li>Heading 3</li>
-            <li>Heading 4</li>
-            <li>Heading 5</li>
-          </ul>
-        </nav>
-      </div>)
+    <div>
+      <nav>
+        <ul>
+          <li>Heading 1</li>
+          <li>Heading 2</li>
+          <li>Heading 3</li>
+          <li>Heading 4</li>
+          <li>Heading 5</li>
+        </ul>
+      </nav>
+    </div>)
 }