diff --git a/layouts/partials/coveo-atomic-search.html b/layouts/partials/coveo-atomic-search.html
new file mode 100644
index 00000000..a8987f5a
--- /dev/null
+++ b/layouts/partials/coveo-atomic-search.html
@@ -0,0 +1,4 @@
+<atomic-search-interface id="search-standalone-header" data-mf="true" style="display:none;">
+    <atomic-search-box redirection-url="/search.html">
+    </atomic-search-box>
+</atomic-search-interface>
\ No newline at end of file
diff --git a/layouts/partials/coveo-atomic.html b/layouts/partials/coveo-atomic.html
new file mode 100644
index 00000000..891b36ce
--- /dev/null
+++ b/layouts/partials/coveo-atomic.html
@@ -0,0 +1,62 @@
+<atomic-search-interface id="search-v2">
+    <atomic-search-layout>
+      <!-- Search/Metadata Section -->
+      <atomic-layout-section section="search">
+        <div class="atomic-full-summary-and-sort">
+          <atomic-query-summary></atomic-query-summary>
+          <atomic-sort-dropdown>
+            <atomic-sort-expression label="relevance" expression="relevancy"></atomic-sort-expression>
+            <atomic-sort-expression label="most-recent" expression="date descending"></atomic-sort-expression>
+          </atomic-sort-dropdown>
+        </div>
+      </atomic-layout-section>
+
+      <!-- Facet Section -->
+      <atomic-layout-section section="facets">
+        <atomic-facet field="f5_product" label="Show by product"></atomic-facet>
+        <atomic-refine-toggle></atomic-refine-toggle>
+      </atomic-layout-section>
+
+      <!-- Main Section -->
+      <atomic-layout-section section="main">
+        <!-- Results -->
+        <atomic-layout-section section="results">
+          <atomic-no-results></atomic-no-results>
+          <atomic-result-list>
+            <atomic-result-template>
+              <template>
+                <!-- Title -->
+                <atomic-result-section-title>
+                  <div style="display: flex; align-items: center; justify-content: space-between;">
+                    <atomic-result-link></atomic-result-link>
+                    <atomic-quickview></atomic-quickview>
+                  </div>
+                </atomic-result-section-title>
+
+                <!-- URL -->
+                <atomic-result-section-title-metadata>
+                  <atomic-result-printable-uri></atomic-result-printable-uri>
+                </atomic-result-section-title-metadata>
+                
+                <!-- Excerpt -->
+                <atomic-result-section-excerpt>
+                  <atomic-result-text field="excerpt"></atomic-result-text>
+                </atomic-result-section-excerpt>
+
+                <!-- Date -->
+                <atomic-result-section-bottom-metadata>
+                  Modification Date: <atomic-result-date format="MMM D, YYYY"></atomic-result-date>
+                </atomic-result-section-bottom-metadata>
+              </template>
+            </atomic-result-template>
+          </atomic-result-list> 
+        </atomic-layout-section>
+
+        <!-- Pagination -->
+        <atomic-layout-section section="pagination" style="margin-top: 2rem;">
+          <atomic-pager></atomic-pager>
+          <atomic-results-per-page></atomic-results-per-page>
+        </atomic-layout-section>
+      </atomic-layout-section>
+    </atomic-search-layout>
+  </atomic-search-interface>
\ No newline at end of file
diff --git a/layouts/partials/coveo-legacy-search.html b/layouts/partials/coveo-legacy-search.html
new file mode 100644
index 00000000..958a0635
--- /dev/null
+++ b/layouts/partials/coveo-legacy-search.html
@@ -0,0 +1,4 @@
+<div id="searchbox">
+    <!--div class="CoveoAnalytics" data-search-hub="HUB_ES_Nginx_Docs_And_Org"></div-->
+    <div class="CoveoSearchbox" data-placeholder='Search NGINX Docs...'></div>
+</div>
\ No newline at end of file
diff --git a/layouts/partials/coveo-legacy.html b/layouts/partials/coveo-legacy.html
new file mode 100644
index 00000000..7fdec89a
--- /dev/null
+++ b/layouts/partials/coveo-legacy.html
@@ -0,0 +1,98 @@
+<div id="search" class="CoveoSearchInterface" data-enable-history="true" >
+    <div class="CoveoFolding"></div>
+    <div class="CoveoAnalytics" data-search-hub="HUB_ES_Nginx_Docs_And_Org"></div>
+    <div class="coveo-search-section" style="display: none;">
+      <div class="CoveoSearchbox" data-enable-omnibox="true"></div>
+    </div>
+    <div class="coveo-main-section">
+      <div class="coveo-facet-column">
+        <div class="CoveoFacet" data-title="Show by product" data-field="@f5_product" data-tab="All"
+          data-number-of-values="15"></div>
+        <div class="CoveoFacet" id="f5_product_module" data-title="Module" data-field="@f5_product_module" data-enable-settings="true" data-is-multi-value-field="true" data-number-of-values="10"></div>
+        <button id="reset_btn"><img src="{{ "/images/svg/refresh.svg" | absURL }}">Reset</button>
+      </div>
+      <div class="coveo-results-column">
+        <div class="CoveoShareQuery"></div>
+        <div class="CoveoPreferencesPanel">
+          <div class="CoveoResultsPreferences"></div>
+          <div class="CoveoResultsFiltersPreferences"></div>
+        </div>
+        <div class="CoveoTriggers"></div>
+        <div class="CoveoBreadcrumb"></div>
+        <div class="CoveoDidYouMean"></div>
+        <div class="coveo-results-header">
+          <div class="coveo-summary-section">
+            <span class="CoveoQuerySummary">
+              <div class="coveo-show-if-no-results"></div>
+            </span>
+            <span class="CoveoQueryDuration"></span>
+          </div>
+          <div class="coveo-result-layout-section">
+            <span class="CoveoResultLayout"></span>
+          </div>
+          <div class="coveo-sort-section">
+            <span>Sort By: </span>
+            <span class="CoveoSort" data-sort-criteria="relevancy" data-caption="Relevance"></span>
+            <span class="CoveoSort"
+              data-sort-criteria="@f5_updated_published_date descending,@f5_updated_published_date ascending"
+              data-caption="Date"></span>
+          </div>
+        </div>
+        <div class="CoveoHiddenQuery"></div>
+        <div class="CoveoErrorReport" data-pop-up="false"></div>
+        <div class="CoveoResultList" data-layout="list" data-wait-animation="fade"
+          data-auto-select-fields-to-include="true">
+          <script id="Default" class="result-template" type="text/html" data-layout="list">
+                <div class="coveo-result-frame">
+                  <div class="coveo-result-cell" style="vertical-align:top;text-align:center;width:32px;">
+                    <img src="{{ "/images/article-icon.svg" | absURL }}" alt="Article" height="32" width="32" title="Article" />
+                  </div>
+                  <div class="coveo-result-cell" style="vertical-align: top;padding-left: 16px;">
+                    <div class="coveo-result-row" style="margin:0;">
+                      <div class="coveo-result-cell" style="vertical-align:top;font-size:16px;" role="heading" aria-level="2">
+                        <a class="CoveoResultLink" target="_blank"></a>
+                      </div>
+                      <div class="coveo-result-cell" style="width:120px;text-align:right;font-size:12px">
+                        <span class="CoveoQuickview" data-enable-loading-animation="false">
+                        Quick View
+                        </span>
+                        <div class="coveo-result-row">
+                        </div>
+                      </div>
+                    </div>
+                    <div class="coveo-result-row" style="margin: 0;">
+                      <div class="coveo-result-cell" id="uri_link">
+                        <span class="CoveoFieldValue" data-field="@Uri"></span>
+                      </div>
+                    </div>
+                    <div class="coveo-result-row" style="margin-top:10px;">
+                      <div class="coveo-result-cell">
+                        <span class="CoveoExcerpt"></span>
+                      </div>
+                    </div>
+                    <div class="coveo-result-row modified_date" style="margin-top:10px;">
+                      <div class="coveo-result-cell">
+                        <span class="CoveoFieldValue" data-field="@f5_updated_published_date" data-text-caption=' Modification Date:' data-helper="date" data-helper-options-predefined-format="MMM DD, yyyy">
+                        </span>
+                      </div>
+                    </div>
+                    <div class="coveo-result-row" style="margin-top:10px;">
+                      <div class="coveo-result-cell">
+                      </div>
+                    </div>
+                    <div class="coveo-result-row">
+                      <div class="coveo-result-cell">
+                        <div class="CoveoMissingTerms"></div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </script>
+        </div>
+        <div class="pagination-bar">
+          <div class="CoveoPager"></div>
+          <div class="CoveoResultsPerPage"></div>
+        </div>
+      </div>
+    </div>
+  </div>
\ No newline at end of file
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 240c834f..794bcd29 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -7,14 +7,8 @@
     {{ if ( not ( in .Site.Params.buildtype "package" ) ) }}
       <div class="navbar navbar-nav">
         <!-- Standalone search box. -->
-        <div id="searchbox">
-          <!--div class="CoveoAnalytics" data-search-hub="HUB_ES_Nginx_Docs_And_Org"></div-->
-          <div class="CoveoSearchbox" data-placeholder='Search NGINX Docs...'></div>
-        </div>
-        <atomic-search-interface id="search-standalone-header" data-mf="true" style="display:none;">
-          <atomic-search-box redirection-url="/search.html">
-          </atomic-search-box>
-        </atomic-search-interface>
+        {{ partial "coveo-legacy-search.html" . }}
+        {{ partial "coveo-atomic-search.html" . }}
       </div>
     {{ end }}
     {{ if ( in .Site.Params.buildtype "package" ) }}
diff --git a/layouts/search/single.html b/layouts/search/single.html
index bbbfc2db..005ed486 100644
--- a/layouts/search/single.html
+++ b/layouts/search/single.html
@@ -4,169 +4,11 @@
   <main class="col-md-10 content" role="main">
     <div class="container"><h1>{{ .Title}}</h1></div>
 
-    <div id="search" class="CoveoSearchInterface" data-enable-history="true" >
-      <div class="CoveoFolding"></div>
-      <div class="CoveoAnalytics" data-search-hub="HUB_ES_Nginx_Docs_And_Org"></div>
-      <div class="coveo-search-section" style="display: none;">
-        <div class="CoveoSearchbox" data-enable-omnibox="true"></div>
-      </div>
-      <div class="coveo-main-section">
-        <div class="coveo-facet-column">
-          <div class="CoveoFacet" data-title="Show by product" data-field="@f5_product" data-tab="All"
-            data-number-of-values="15"></div>
-          <div class="CoveoFacet" id="f5_product_module" data-title="Module" data-field="@f5_product_module" data-enable-settings="true" data-is-multi-value-field="true" data-number-of-values="10"></div>
-          <button id="reset_btn"><img src="{{ "/images/svg/refresh.svg" | absURL }}">Reset</button>
-        </div>
-        <div class="coveo-results-column">
-          <div class="CoveoShareQuery"></div>
-          <div class="CoveoPreferencesPanel">
-            <div class="CoveoResultsPreferences"></div>
-            <div class="CoveoResultsFiltersPreferences"></div>
-          </div>
-          <div class="CoveoTriggers"></div>
-          <div class="CoveoBreadcrumb"></div>
-          <div class="CoveoDidYouMean"></div>
-          <div class="coveo-results-header">
-            <div class="coveo-summary-section">
-              <span class="CoveoQuerySummary">
-                <div class="coveo-show-if-no-results"></div>
-              </span>
-              <span class="CoveoQueryDuration"></span>
-            </div>
-            <div class="coveo-result-layout-section">
-              <span class="CoveoResultLayout"></span>
-            </div>
-            <div class="coveo-sort-section">
-              <span>Sort By: </span>
-              <span class="CoveoSort" data-sort-criteria="relevancy" data-caption="Relevance"></span>
-              <span class="CoveoSort"
-                data-sort-criteria="@f5_updated_published_date descending,@f5_updated_published_date ascending"
-                data-caption="Date"></span>
-            </div>
-          </div>
-          <div class="CoveoHiddenQuery"></div>
-          <div class="CoveoErrorReport" data-pop-up="false"></div>
-          <div class="CoveoResultList" data-layout="list" data-wait-animation="fade"
-            data-auto-select-fields-to-include="true">
-            <script id="Default" class="result-template" type="text/html" data-layout="list">
-                  <div class="coveo-result-frame">
-                    <div class="coveo-result-cell" style="vertical-align:top;text-align:center;width:32px;">
-                      <img src="{{ "/images/article-icon.svg" | absURL }}" alt="Article" height="32" width="32" title="Article" />
-                    </div>
-                    <div class="coveo-result-cell" style="vertical-align: top;padding-left: 16px;">
-                      <div class="coveo-result-row" style="margin:0;">
-                        <div class="coveo-result-cell" style="vertical-align:top;font-size:16px;" role="heading" aria-level="2">
-                          <a class="CoveoResultLink" target="_blank"></a>
-                        </div>
-                        <div class="coveo-result-cell" style="width:120px;text-align:right;font-size:12px">
-                          <span class="CoveoQuickview" data-enable-loading-animation="false">
-                          Quick View
-                          </span>
-                          <div class="coveo-result-row">
-                          </div>
-                        </div>
-                      </div>
-                      <div class="coveo-result-row" style="margin: 0;">
-                        <div class="coveo-result-cell" id="uri_link">
-                          <span class="CoveoFieldValue" data-field="@Uri"></span>
-                        </div>
-                      </div>
-                      <div class="coveo-result-row" style="margin-top:10px;">
-                        <div class="coveo-result-cell">
-                          <span class="CoveoExcerpt"></span>
-                        </div>
-                      </div>
-                      <div class="coveo-result-row modified_date" style="margin-top:10px;">
-                        <div class="coveo-result-cell">
-                          <span class="CoveoFieldValue" data-field="@f5_updated_published_date" data-text-caption=' Modification Date:' data-helper="date" data-helper-options-predefined-format="MMM DD, yyyy">
-                          </span>
-                        </div>
-                      </div>
-                      <div class="coveo-result-row" style="margin-top:10px;">
-                        <div class="coveo-result-cell">
-                        </div>
-                      </div>
-                      <div class="coveo-result-row">
-                        <div class="coveo-result-cell">
-                          <div class="CoveoMissingTerms"></div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </script>
-          </div>
-          <div class="pagination-bar">
-            <div class="CoveoPager"></div>
-            <div class="CoveoResultsPerPage"></div>
-          </div>
-        </div>
-      </div>
-    </div>
+    {{ partial "coveo-legacy.html" .}}
   </main>
 </div>
 
 <section class="main-layout" data-mf="true" style="display: none; margin-left: 2rem;" >
-  <atomic-search-interface id="search-v2">
-    <atomic-search-layout>
-      <!-- Search/Metadata Section -->
-      <atomic-layout-section section="search">
-        <div class="atomic-full-summary-and-sort">
-          <atomic-query-summary></atomic-query-summary>
-          <atomic-sort-dropdown>
-            <atomic-sort-expression label="relevance" expression="relevancy"></atomic-sort-expression>
-            <atomic-sort-expression label="most-recent" expression="date descending"></atomic-sort-expression>
-          </atomic-sort-dropdown>
-        </div>
-      </atomic-layout-section>
-
-      <!-- Facet Section -->
-      <atomic-layout-section section="facets">
-        <atomic-facet field="f5_product" label="Show by product"></atomic-facet>
-        <atomic-refine-toggle></atomic-refine-toggle>
-      </atomic-layout-section>
-
-      <!-- Main Section -->
-      <atomic-layout-section section="main">
-        <!-- Results -->
-        <atomic-layout-section section="results">
-          <atomic-no-results></atomic-no-results>
-          <atomic-result-list>
-            <atomic-result-template>
-              <template>
-                <!-- Title -->
-                <atomic-result-section-title>
-                  <div style="display: flex; align-items: center; justify-content: space-between;">
-                    <atomic-result-link></atomic-result-link>
-                    <atomic-quickview></atomic-quickview>
-                  </div>
-                </atomic-result-section-title>
-
-                <!-- URL -->
-                <atomic-result-section-title-metadata>
-                  <atomic-result-printable-uri></atomic-result-printable-uri>
-                </atomic-result-section-title-metadata>
-                
-                <!-- Excerpt -->
-                <atomic-result-section-excerpt>
-                  <atomic-result-text field="excerpt"></atomic-result-text>
-                </atomic-result-section-excerpt>
-
-                <!-- Date -->
-                <atomic-result-section-bottom-metadata>
-                  Modification Date: <atomic-result-date format="MMM D, YYYY"></atomic-result-date>
-                </atomic-result-section-bottom-metadata>
-              </template>
-            </atomic-result-template>
-          </atomic-result-list> 
-        </atomic-layout-section>
-
-        <!-- Pagination -->
-        <atomic-layout-section section="pagination" style="margin-top: 2rem;">
-          <atomic-pager></atomic-pager>
-          <atomic-results-per-page></atomic-results-per-page>
-        </atomic-layout-section>
-      </atomic-layout-section>
-    </atomic-search-layout>
-  </atomic-search-interface>
+  {{ partial "coveo-atomic.html" .}}
 </section>
 {{ end }}