diff --git a/layouts/docs/baseof.html b/layouts/docs/baseof.html
index 0e28baf..71423b7 100644
--- a/layouts/docs/baseof.html
+++ b/layouts/docs/baseof.html
@@ -25,20 +25,20 @@
           <div class="col-12 col-lg-4 col-xl-3 td-sidebar d-print-none">
             {{ partial "sidebar.html" . }}
           </div>
-          <div class="d-none d-xl-block col-xl-2 td-toc d-print-none">
-            {{ partial "toc.html" . }}
-          </div>
-          <main class="col-12 col-lg-8 col-xl-7 pl-lg-5 ps-lg-5" role="main" id="main-content" aria-label="Article content">
-            {{ partial "version-banner.html" . }}
-            {{ if not .Site.Params.ui.breadcrumb_disable }}{{ partial "breadcrumb.html" . }}{{ end }}
-            {{ if .Draft }}
-            <div class="alert alert-warning" role="alert">
-                <h1>DRAFT</h1>
-                <p>This document is a draft and will not be published.</p>
+            <main class="col-12 col-lg-8 col-xl-7 pl-lg-5 ps-lg-5" role="main" id="main-content" aria-label="Article content">
+              {{ partial "version-banner.html" . }}
+              {{ if not .Site.Params.ui.breadcrumb_disable }}{{ partial "breadcrumb.html" . }}{{ end }}
+              {{ if .Draft }}
+              <div class="alert alert-warning" role="alert">
+                  <h1>DRAFT</h1>
+                  <p>This document is a draft and will not be published.</p>
+              </div>
+              {{ end }}
+              {{ block "main" . }}{{ end }}
+            </main>
+            <div class="d-none d-xl-block col-xl-2 td-toc d-print-none">
+              {{ partial "toc.html" . }}
             </div>
-            {{ end }}
-            {{ block "main" . }}{{ end }}
-          </main>
         </div>
       </div>
       {{ partialCached "footer.html" . }}
diff --git a/layouts/swagger/baseof.html b/layouts/swagger/baseof.html
index 2f96812..87a29db 100644
--- a/layouts/swagger/baseof.html
+++ b/layouts/swagger/baseof.html
@@ -19,15 +19,15 @@
           <div class="col-12 col-md-3 col-xl-3 td-sidebar d-print-none">
             {{ partial "sidebar.html" . }}
           </div>
-          <div class="d-none d-xl-block col-xl-2 td-toc d-print-none">
-            {{ partial "toc.html" . }}
-          </div>
           <main class="col-12 col-md-9 col-xl-7 pl-lg-5 ps-lg-5" role="main" id="main-content" aria-label="Article content">
             {{ if not .Site.Params.ui.breadcrumb_disable }}{{ partial "breadcrumb.html" . }}{{ end }}
             <script src="/js/swagger-ui-bundle.js"></script>
             <script src="/js/swagger-ui-standalone-preset.js"></script>
             {{ block "main" . }}{{ end }}
           </main>
+          <div class="d-none d-xl-block col-xl-2 td-toc d-print-none">
+            {{ partial "toc.html" . }}
+          </div>
         </div>
       </div>
       {{ partialCached "footer.html" . }}