diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 6f225d0..929c2d7 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -18,13 +18,10 @@
     </header>
     <div class="container-fluid td-outer">
       <div class="td-main">
-        {{ partial "navbar-breadcrumb.html" . }}
         <div class="row flex-xl-nowrap">
           <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" . }}
@@ -43,6 +40,8 @@ <h1>DRAFT</h1>
     </div>
     {{ partial "custom-scripts.html" . }}
     {{ partial "scripts.html" . }}
-    {{ partial "search.html" . }}
+    {{ if ne .Page.Params.type "search-results" }}
+      {{ partial "search.html" . }}
+    {{ end }}
   </body>
 </html>
diff --git a/layouts/partials/sidebar-tree.html b/layouts/partials/sidebar-tree.html
index f99a518..97b5146 100644
--- a/layouts/partials/sidebar-tree.html
+++ b/layouts/partials/sidebar-tree.html
@@ -13,8 +13,10 @@
 {{ else }}
   {{ $root = .FirstSection }}
 {{ end }}
+{{ if $root }}
 {{ template "root-link" (dict "currentPage" . "root" $root "site" .Site) }}
 {{ template "section-tree-nav-sections" (dict "root" $root.CurrentSection.Pages "currentPage" . "site" .Site) }}
+{{ end }}
 {{ if $additionalNavRoot }}
 {{ template "section-tree-nav-sections" (dict "root" $additionalNavRoot.CurrentSection.Pages "currentPage" . "site" .Site) }}
 {{ end }}