diff --git a/core/modules/system/templates/page.html.twig b/core/modules/system/templates/page.html.twig
index ff7c010..ab732dc 100644
--- a/core/modules/system/templates/page.html.twig
+++ b/core/modules/system/templates/page.html.twig
@@ -26,9 +26,6 @@
  *   slogan has been disabled in theme settings.
  *
  * Navigation:
- * - main_menu: The Main menu links for the site, if they have been configured.
- * - secondary_menu: The Secondary menu links for the site, if they have been
- *   configured.
  * - breadcrumb: The breadcrumb trail for the current page.
  *
  * Page content (in order of occurrence in the default page.html.twig):
@@ -50,6 +47,9 @@
  *
  * Regions:
  * - page.header: Items for the header region.
+ * - page.main_menu: The Main menu links for the site, if they have been configured.
+ * - page.secondary_menu: The Secondary menu links for the site, if they have been
+ *   configured.
  * - page.highlighted: Items for the highlighted content region.
  * - page.help: Dynamic help text, mostly for admin pages.
  * - page.content: The main content of the current page.
@@ -97,14 +97,19 @@
       </div><!-- /#name-and-slogan -->
     {% endif %}
 
+    {% if page.secondary_menu %}
+      <nav role="navigation">
+        {{ page.secondary_menu }}
+      </nav>
+    {% endif %}
+
     {{ page.header }}
 
   </header>
 
-  {% if main_menu or secondary_menu %}
+  {% if page.main_menu %}
     <nav role="navigation">
-      {{ main_menu }}
-      {{ secondary_menu }}
+      {{ page.main_menu }}
     </nav>
   {% endif %}
 
diff --git a/core/themes/bartik/templates/page.html.twig b/core/themes/bartik/templates/page.html.twig
index 1af8907..c0cd40a 100644
--- a/core/themes/bartik/templates/page.html.twig
+++ b/core/themes/bartik/templates/page.html.twig
@@ -33,9 +33,6 @@
  *   added to make the site slogan visually hidden, but still accessible.
  *
  * Navigation:
- * - main_menu: The Main menu links for the site, if they have been configured.
- * - secondary_menu: The Secondary menu links for the site, if they have been
- *   configured.
  * - breadcrumb: The breadcrumb trail for the current page.
  *
  * Page content (in order of occurrence in the default page.html.twig):
@@ -57,6 +54,9 @@
  *
  * Regions:
  * - page.header: Items for the header region.
+ * - page.main_menu: The Main menu links for the site, if they have been configured.
+ * - page.secondary_menu: The Secondary menu links for the site, if they have been
+ *   configured.
  * - page.featured: Items for the featured region.
  * - page.highlighted: Items for the highlighted content region.
  * - page.help: Dynamic help text, mostly for admin pages.
@@ -85,11 +85,9 @@
 #}
 <div id="page-wrapper"><div id="page">
 
-  <header id="header" class="{{ secondary_menu ? 'with-secondary-menu' : 'without-secondary-menu' }}" role="banner"><div class="section clearfix">
-   {% if secondary_menu %}
-      <nav id="secondary-menu" class="navigation" role="navigation">
-        {{ secondary_menu }}
-      </nav> <!-- /#secondary-menu -->
+  <header id="header" class="{{ page.secondary_menu ? 'with-secondary-menu' : 'without-secondary-menu' }}" role="banner"><div class="section clearfix">
+    {% if page.secondary_menu %}
+      {{ page.secondary_menu }}
     {% endif %}
 
     {% if logo %}
@@ -125,9 +123,9 @@
 
     {{ page.header }}
 
-    {% if main_menu %}
+    {% if page.main_menu %}
       <nav id ="main-menu" class="navigation" role="navigation">
-        {{ main_menu }}
+        {{ page.main_menu }}
       </nav> <!-- /#main-menu -->
     {% endif %}
   </div></header> <!-- /.section, /#header-->