diff --git a/core/modules/node/css/node.module.css b/core/modules/node/css/node.module.css
index 397adb5..3300052 100644
--- a/core/modules/node/css/node.module.css
+++ b/core/modules/node/css/node.module.css
@@ -1,47 +1,25 @@
 /**
  * @file
- * Styles for administration pages.
+ * Node add/edit form layout.
  */
 
-/**
- * Node add/edit form layout
- */
-
-/* Narrow screens */
-.layout-region {
-  box-sizing:         border-box;
-}
-
 /* Wide screens */
-@media
-  screen and (min-width: 780px),
-  (orientation: landscape) and (min-device-height: 780px) {
+@media screen and (min-width: 38em) {
 
-  .layout-region-node-main,
-  .layout-region-node-footer {
-    float: left; /* LTR */
-    width: 65%;
-    padding-right: 2em; /* LTR */
-    box-sizing: border-box;
-  }
-
-  [dir="rtl"] .layout-region-node-main,
-  [dir="rtl"] .layout-region-node-footer {
+  /* This is a temporary fix to fix the column layout till we fix the layout-container implementation. */
+  [dir="ltr"] .layout-region-node-secondary {
     float: right;
-    padding-left: 2em;
-    padding-right: 0;
   }
-
-  .layout-region-node-secondary {
-    float: right; /* LTR */
-    width: 35%;
-  }
-
   [dir="rtl"] .layout-region-node-secondary {
-    float: left;
+    float: left!important;
+  }
+  .layout-region-node-footer {
+    clear: left; /* LTR */
+  }
+  [dir="rtl"] .layout-region-node-footer {
+    clear: right;
   }
 
-  /* @todo File an issue to add a standard class to all text-like inputs */
   .layout-region-node-secondary .form-autocomplete,
   .layout-region-node-secondary .form-text,
   .layout-region-node-secondary .form-tel,
@@ -51,7 +29,7 @@
   .layout-region-node-secondary .form-number,
   .layout-region-node-secondary .form-color,
   .layout-region-node-secondary textarea {
-    box-sizing:         border-box;
+    box-sizing: border-box;
     width: 100%;
     max-width: 100%;
   }
@@ -61,16 +39,15 @@
  * The vertical toolbar mode gets triggered for narrow screens, which throws off
  * the intent of media queries written for the viewport width. When the vertical
  * toolbar is on, we need to suppress layout for the original media width + the
- * toolbar width (240px). In this case, 240px + 780px.
+ * toolbar width (240px or 15rem). In this case, 15em + 38em.
  */
-@media
-  screen and (max-width: 1020px) {
-
-  .toolbar-vertical.toolbar-tray-open .layout-region-node-main,
-  .toolbar-vertical.toolbar-tray-open .layout-region-node-footer,
-  .toolbar-vertical.toolbar-tray-open .layout-region-node-secondary {
+@media screen and (max-width: 53em) {
+  .toolbar-vertical.toolbar-tray-open .layout-column {
     float: none;
     width: auto;
+  }
+  .toolbar-vertical.toolbar-tray-open .layout-column.layout-region-node-secondary {
+    padding-left: 0;
     padding-right: 0;
   }
 }
diff --git a/core/modules/system/css/system.admin.css b/core/modules/system/css/system.admin.css
index 1dd5da9..1777203 100644
--- a/core/modules/system/css/system.admin.css
+++ b/core/modules/system/css/system.admin.css
@@ -33,6 +33,13 @@
     padding-right: 10px;
     padding-left: 0;
   }
+  .layout-column + .layout-column.layout-column--bigger-gutter {
+    padding-left: 2em; /* LTR */
+  }
+  [dir="rtl"] .layout-column + .layout-column.layout-column--bigger-gutter {
+    padding-right: 2em;
+    padding-left: 0;
+  }
   .layout-column.half {
     width: 50%;
   }
@@ -42,6 +49,12 @@
   .layout-column.three-quarter {
     width: 75%;
   }
+  .layout-column.third {
+    width: 35%;
+  }
+  .layout-column.two-thirds {
+    width: 65%;
+  }
 }
 
 /**
diff --git a/core/themes/classy/templates/content-edit/node-edit-form.html.twig b/core/themes/classy/templates/content-edit/node-edit-form.html.twig
index 18097f3..8389b06 100644
--- a/core/themes/classy/templates/content-edit/node-edit-form.html.twig
+++ b/core/themes/classy/templates/content-edit/node-edit-form.html.twig
@@ -15,14 +15,14 @@
  * @see seven_form_node_form_alter()
  */
 #}
-<div class="layout-node-form clearfix">
-  <div class="layout-region layout-region-node-main">
+<div class="clearfix">
+  <div class="layout-region-node-main layout-column two-thirds">
     {{ form|without('advanced', 'actions') }}
   </div>
-  <div class="layout-region layout-region-node-secondary">
+  <div class="layout-region-node-secondary layout-column third layout-column--bigger-gutter">
     {{ form.advanced }}
   </div>
-  <div class="layout-region layout-region-node-footer">
+  <div class="layout-region-node-footer">
     {{ form.actions }}
   </div>
 </div>
