diff --git a/templates/archives.html b/templates/archives.html
index 07db5da..8c1b04a 100644
--- a/templates/archives.html
+++ b/templates/archives.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <html
   xmlns:th="https://www.thymeleaf.org"
-  th:replace="~{modules/layout :: html(title = '归档 - ' + ${site.title}, hero = null, content = ~{::content}, head = null, footer = null, sidebar = ~{::sidebar}, contentClass = '')}"
+  th:replace="~{modules/layout :: html(title = '归档 - ' + ${site.title}, hero = null, content = ~{::content}, head = null, footer = null, sidebar = null, contentClass = '')}"
 >
   <th:block th:fragment="content">
     <div class="rounded-xl bg-white p-4 dark:bg-slate-800">
diff --git a/templates/links.html b/templates/links.html
index 480f99f..84619e6 100644
--- a/templates/links.html
+++ b/templates/links.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <html
   xmlns:th="https://www.thymeleaf.org"
-  th:replace="~{modules/layout :: html(title = '链接 - ' + ${site.title}, hero = null, content = ~{::content}, head = null, footer = null, sidebar = ~{::sidebar}, contentClass = '')}"
+  th:replace="~{modules/layout :: html(title = '链接 - ' + ${site.title}, hero = null, content = ~{::content}, head = null, footer = null, sidebar = null, contentClass = '')}"
 >
   <th:block th:fragment="content">
     <div class="rounded-xl bg-white p-4 dark:bg-slate-800">
diff --git a/templates/modules/layout.html b/templates/modules/layout.html
index 34b0cbb..24621a1 100644
--- a/templates/modules/layout.html
+++ b/templates/modules/layout.html
@@ -23,8 +23,11 @@
     <th:block th:unless="${hero != null}">
       <th:block th:replace="~{modules/hero :: hero(isHome = true, cover = null, title = null)}" />
     </th:block>
-    <section class="mx-auto mt-6 flex max-w-7xl gap-6 px-4 lg:px-6" th:classappend="${contentClass}">
-      <div class="z-0 min-w-0 flex-1 shrink">
+    <section
+      class="mx-auto mt-6 grid max-w-7xl grid-cols-1 gap-6 px-4 md:grid-cols-[1fr_18rem] lg:px-6"
+      th:classappend="${contentClass}"
+    >
+      <div class="z-0 min-w-0">
         <th:block th:replace="${content}" />
       </div>
       <th:block th:if="${sidebar != null}">
diff --git a/templates/modules/sidebar.html b/templates/modules/sidebar.html
index 04f86d4..9ce2c6f 100644
--- a/templates/modules/sidebar.html
+++ b/templates/modules/sidebar.html
@@ -1,4 +1,4 @@
-<aside th:fragment="sidebar (prepend)" class="z-0 hidden w-72 flex-none flex-col gap-6 md:flex">
+<aside th:fragment="sidebar (prepend)" class="z-0 hidden w-72 flex-col gap-6 md:flex">
   <th:block th:with="widgets = ${theme.config.sidebar.widgets} ">
     <th:block th:if="${prepend != null}">
       <th:block th:replace="${prepend}" />
diff --git a/templates/moments.html b/templates/moments.html
index c7b1e8c..76ddec2 100644
--- a/templates/moments.html
+++ b/templates/moments.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <html
   xmlns:th="https://www.thymeleaf.org"
-  th:replace="~{modules/layout :: html(title = '瞬间 - ' + ${site.title}, hero = null, content = ~{::content}, head = null, footer = null, sidebar = ~{::sidebar}, contentClass = '')}"
+  th:replace="~{modules/layout :: html(title = '瞬间 - ' + ${site.title}, hero = null, content = ~{::content}, head = null, footer = null, sidebar = null, contentClass = '')}"
 >
   <th:block th:fragment="content">
     <div class="rounded-xl bg-white p-4 dark:bg-slate-800">
diff --git a/templates/photos.html b/templates/photos.html
index c22acb2..f4c1c97 100644
--- a/templates/photos.html
+++ b/templates/photos.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <html
   xmlns:th="https://www.thymeleaf.org"
-  th:replace="~{modules/layout :: html(title = '图库 - ' + ${site.title}, hero = null, content = ~{::content}, head = null, footer = null, sidebar = ~{::sidebar}, contentClass = '')}"
+  th:replace="~{modules/layout :: html(title = '图库 - ' + ${site.title}, hero = null, content = ~{::content}, head = null, footer = null, sidebar = null, contentClass = '')}"
 >
   <th:block th:fragment="content">
     <div class="rounded-xl bg-white p-4 dark:bg-slate-800">
