diff --git a/docs/Interactive_Computing/OnDemand/.pages.yml b/docs/Interactive_Computing/OnDemand/.pages.yml
index 0139a1695..2118e8aeb 100644
--- a/docs/Interactive_Computing/OnDemand/.pages.yml
+++ b/docs/Interactive_Computing/OnDemand/.pages.yml
@@ -4,4 +4,4 @@ nav:
   - Apps
   - "*"
   - Troubleshooting: ood_troubleshooting.md
-  - Release Notes: Release_Notes
+  - OnDemand Release Notes: Release_Notes
diff --git a/docs/assets/stylesheets/theme.css b/docs/assets/stylesheets/theme.css
index 78e792702..a854856c9 100644
--- a/docs/assets/stylesheets/theme.css
+++ b/docs/assets/stylesheets/theme.css
@@ -439,3 +439,24 @@ img.center {
   margin-left: auto;
   margin-right: auto;
 }
+
+/* overrides/partials/search.html swapped this icon's <label for="__search">
+   for a <div data-md-toggle-checkbox="__search"> to fix an a11y "multiple
+   labels" warning. The theme's own CSS positions the icon off the [for]
+   attribute, so it needs the same rules re-targeted at the new attribute. */
+[dir=ltr] .md-search__icon[data-md-toggle-checkbox=__search] { left: .5rem; }
+[dir=rtl] .md-search__icon[data-md-toggle-checkbox=__search] { right: .5rem; }
+.md-search__icon[data-md-toggle-checkbox=__search] { position: absolute; top: .3rem; z-index: 2; }
+[dir=rtl] .md-search__icon[data-md-toggle-checkbox=__search] svg { transform: scaleX(-1); }
+
+@media screen and (max-width: 59.984375em) {
+  [dir=ltr] .md-search__icon[data-md-toggle-checkbox=__search] { left: .8rem; }
+  [dir=rtl] .md-search__icon[data-md-toggle-checkbox=__search] { right: .8rem; }
+  .md-search__icon[data-md-toggle-checkbox=__search] { top: .6rem; }
+  .md-search__icon[data-md-toggle-checkbox=__search] svg:first-child { display: none; }
+}
+
+@media screen and (min-width: 60em) {
+  .md-search__icon[data-md-toggle-checkbox=__search] { pointer-events: none; }
+  .md-search__icon[data-md-toggle-checkbox=__search] svg:last-child { display: none; }
+}
diff --git a/overrides/main.html b/overrides/main.html
index b5b25618a..3467abd1a 100644
--- a/overrides/main.html
+++ b/overrides/main.html
@@ -30,21 +30,31 @@
         </div>
     {% endif %}
 {% endblock %}
-{% block content %}
-{% if page.meta and page.meta.status %}
-    {% if page.meta.status == "deprecated" %}
-        {% include "partials/status_deprecated_header.html" %}
-    {% elif page.meta.status == "tutorial" %}
-        {% include "partials/status_tutorial_header.html" %}
+{% block container %}
+<div class="md-content" data-md-component="content">
+    {% if "navigation.path" in features %}
+        {% include "partials/path.html" %}
     {% endif %}
-{% endif %}
-{{ super() }}
+    <article class="md-content__inner md-typeset">
+        {% block content %}
+        {% if page.meta and page.meta.status %}
+            {% if page.meta.status == "deprecated" %}
+                {% include "partials/status_deprecated_header.html" %}
+            {% elif page.meta.status == "tutorial" %}
+                {% include "partials/status_tutorial_header.html" %}
+            {% endif %}
+        {% endif %}
+        {{ super() }}
 
-{% if git_page_authors %}
-<div class="md-source-date">
-    <small>
-        Authors: {{ git_page_authors | default('enable mkdocs-git-authors-plugin') }}
-    </small>
+        {% if git_page_authors %}
+        <div class="md-source-date">
+            <small>
+                Authors: {{ git_page_authors | default('enable mkdocs-git-authors-plugin') }}
+            </small>
+        </div>
+        {% endif %}
+        {% endblock %}
+    </article>
+    {% include "partials/source-file.html" %}
 </div>
-{% endif %}
 {% endblock %}
diff --git a/overrides/partials/content.html b/overrides/partials/content.html
new file mode 100644
index 000000000..09f6836a8
--- /dev/null
+++ b/overrides/partials/content.html
@@ -0,0 +1,8 @@
+{% include "partials/tags.html" %}
+{% include "partials/actions.html" %}
+{% if "<h1" not in page.content %}
+  <h1>{{ page.title | d(config.site_name, true)}}</h1>
+{% endif %}
+{{ page.content }}
+{% include "partials/feedback.html" %}
+{% include "partials/comments.html" %}
diff --git a/overrides/partials/nav-item.html b/overrides/partials/nav-item.html
index d09017239..6bb02c9d0 100644
--- a/overrides/partials/nav-item.html
+++ b/overrides/partials/nav-item.html
@@ -120,10 +120,21 @@
           </div>
         {% endif %}
         <nav class="md-nav" data-md-level="{{ level }}" aria-labelledby="{{ path }}_label">
-          <label class="md-nav__title" for="{{ path }}" {% if index and nav_item.children | length <= 1 %}id="{{ path }}_label"{% endif %}>
-            <span class="md-nav__icon md-icon"></span>
-            {{ render_title(nav_item) }}
-          </label>
+          {% if index and nav_item.children | length <= 1 %}
+            <label class="md-nav__title" for="{{ path }}" id="{{ path }}_label">
+              <span class="md-nav__icon md-icon"></span>
+              {{ render_title(nav_item) }}
+            </label>
+          {% else %}
+            {# The opener above (id="{{ path }}_label") already labels this checkbox;
+               a second <label for> here would give the field two labels. This title
+               bar still needs to collapse the section on tap/click, so it's a button
+               wired up in general.js instead of a real label. #}
+            <div class="md-nav__title" role="button" tabindex="0" data-md-toggle-checkbox="{{ path }}">
+              <span class="md-nav__icon md-icon"></span>
+              {{ render_title(nav_item) }}
+            </div>
+          {% endif %}
           <ul class="md-nav__list" data-md-scrollfix>
             {% for item in nav_item.children %}
               {% if not index or item != index %}
diff --git a/overrides/partials/search.html b/overrides/partials/search.html
new file mode 100644
index 000000000..9e71f4974
--- /dev/null
+++ b/overrides/partials/search.html
@@ -0,0 +1,42 @@
+<div class="md-search" data-md-component="search" role="dialog">
+  {# __search's header button (partials/header.html) is already a <label for="__search">;
+     the overlay and in-box icon below are click/keyboard toggles for the same checkbox,
+     not additional field labels, so they're wired up in general.js instead. #}
+  <div class="md-search__overlay" data-md-toggle-checkbox="__search"></div>
+  <div class="md-search__inner" role="search">
+    <form class="md-search__form" name="search">
+      <input type="text" class="md-search__input" name="query" aria-label="{{ lang.t('search.placeholder') }}" placeholder="{{ lang.t('search.placeholder') }}" autocapitalize="off" autocorrect="off" autocomplete="off" spellcheck="false" data-md-component="search-query" required>
+      <div class="md-search__icon md-icon" data-md-toggle-checkbox="__search">
+        {% set icon = config.theme.icon.search or "material/magnify" %}
+        {% include ".icons/" ~ icon ~ ".svg" %}
+        {% set icon = config.theme.icon.previous or "material/arrow-left" %}
+        {% include ".icons/" ~ icon ~ ".svg" %}
+      </div>
+      <nav class="md-search__options" aria-label="{{ lang.t('search') }}">
+        {% if "search.share" in features %}
+          <a href="javascript:void(0)" class="md-search__icon md-icon" title="{{ lang.t('search.share') }}" aria-label="{{ lang.t('search.share') }}" data-clipboard data-clipboard-text="" data-md-component="search-share" tabindex="-1">
+            {% set icon = config.theme.icon.share or "material/share-variant" %}
+            {% include ".icons/" ~ icon ~ ".svg" %}
+          </a>
+        {% endif %}
+        <button type="reset" class="md-search__icon md-icon" title="{{ lang.t('search.reset') }}" aria-label="{{ lang.t('search.reset') }}" tabindex="-1">
+          {% set icon = config.theme.icon.close or "material/close" %}
+          {% include ".icons/" ~ icon ~ ".svg" %}
+        </button>
+      </nav>
+      {% if "search.suggest" in features %}
+        <div class="md-search__suggest" data-md-component="search-suggest"></div>
+      {% endif %}
+    </form>
+    <div class="md-search__output">
+      <div class="md-search__scrollwrap" tabindex="0" data-md-scrollfix role="region" aria-label="{{ lang.t('search') }}">
+        <div class="md-search-result" data-md-component="search-result">
+          <div class="md-search-result__meta">
+            {{ lang.t("search.result.initializer") }}
+          </div>
+          <ol class="md-search-result__list" role="presentation"></ol>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>