diff --git a/core/modules/block/src/BlockListBuilder.php b/core/modules/block/src/BlockListBuilder.php
index 196713a..aa669fa 100644
--- a/core/modules/block/src/BlockListBuilder.php
+++ b/core/modules/block/src/BlockListBuilder.php
@@ -311,7 +311,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       '#markup' => '<h3>' . t('Place blocks') . '</h3>',
       '#attributes' => array(
         'class' => array(
-          'entity-meta-header',
+          'entity-meta__header',
         ),
       ),
     );
diff --git a/core/modules/node/css/node.module.css b/core/modules/node/css/node.module.css
index 397adb5..b10e9fe 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;
   }
+  .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/node/node.libraries.yml b/core/modules/node/node.libraries.yml
index 22c93ac..c1a6948 100644
--- a/core/modules/node/node.libraries.yml
+++ b/core/modules/node/node.libraries.yml
@@ -1,7 +1,7 @@
 drupal.node:
   version: VERSION
   css:
-    layout:
+    component:
       css/node.module.css: {}
   js:
     node.js: {}
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/modules/system/system.libraries.yml b/core/modules/system/system.libraries.yml
index b440e15..3eb3d41 100644
--- a/core/modules/system/system.libraries.yml
+++ b/core/modules/system/system.libraries.yml
@@ -12,7 +12,7 @@ base:
 admin:
   version: VERSION
   css:
-    theme:
+    component:
       css/system.admin.css: { weight: -10 }
   dependencies:
     - system/base
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>
diff --git a/core/themes/seven/css/components/entity-meta.css b/core/themes/seven/css/components/entity-meta.css
index 9a4515f..9877ec3 100644
--- a/core/themes/seven/css/components/entity-meta.css
+++ b/core/themes/seven/css/components/entity-meta.css
@@ -3,48 +3,46 @@
  */
 .entity-meta {
   background-color: #ececec;
-  border-bottom: 0;
   border-left: 1px solid #bfbfbf;
   border-right: 1px solid #bfbfbf;
-  border-top: 0;
-  box-shadow: inset 0 0 5px rgba(0, 0, 0, .15);
-  margin-top: 0;
-  padding-top: 0;
+  box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.15);
 }
-.entity-meta-header,
+.entity-meta__header,
 .entity-meta details {
   background-color: #f7f7f7;
   border-top: 1px solid #bfbfbf;
   border-bottom: 1px solid #bfbfbf;
 }
-.entity-meta-header {
+.entity-meta__header {
   padding: 1em 1.5em;
 }
-.entity-meta-header .form-item {
-  margin: .25em 0;
-}
-.entity-meta-header .published {
-  font-size: 1.231em;
-  font-weight: bold;
+.entity-meta__title {
   text-shadow: 0 1px 0 #fff;
+  margin: 0.25em 0;
 }
-.entity-meta-header .changed {
+.entity-meta__header .form-item {
+  margin: 0.25em 0;
+}
+.entity-meta__last-saved {
   font-style: italic; /* As-designed, but really: why is this italic? */
 }
 .entity-meta details {
   border-left: 0;
   border-right: 0;
-  border-top: 1px solid #ffffff;
+  border-top: 1px solid #fff;
   margin: 0;
 }
+.entity-meta details:first-child {
+  border-top-color: #bfbfbf;
+}
 .entity-meta details[open] {
   background-color: transparent;
-  background-image: -webkit-linear-gradient(top, rgba(0, 0, 0, .125), transparent 4px);
-  background-image:         linear-gradient(to bottom, rgba(0, 0, 0, .125), transparent 4px);
+  background-image: -webkit-linear-gradient(top, rgba(0, 0, 0, 0.125), transparent 4px);
+  background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.125), transparent 4px);
   border-top-width: 0;
   padding-top: 1px;
 }
-.entity-meta details[open] + [open] {
+.entity-meta details[open] + details[open] {
   background-image: none;
   border-top-width: 1px;
   padding-top: 0;
diff --git a/core/themes/seven/seven.theme b/core/themes/seven/seven.theme
index fb522e8..b71e22c 100644
--- a/core/themes/seven/seven.theme
+++ b/core/themes/seven/seven.theme
@@ -173,19 +173,22 @@ function seven_form_node_form_alter(&$form, FormStateInterface $form_state) {
   $form['advanced']['#type'] = 'container';
   $is_new = !$node->isNew() ? format_date($node->getChangedTime(), 'short') : t('Not saved yet');
   $form['meta'] = array(
-    '#attributes' => array('class' => array('entity-meta-header')),
+    '#attributes' => array('class' => array('entity-meta__header')),
     '#type' => 'container',
     '#group' => 'advanced',
     '#weight' => -100,
     'published' => array(
-      '#type' => 'item',
-      '#wrapper_attributes' => array('class' => array('published')),
-      '#markup' => $node->isPublished() ? t('Published') : t('Not published'),
+      '#type' => 'html_tag',
+      '#tag' => 'h3',
+      '#value' => $node->isPublished() ? t('Published') : t('Not published'),
       '#access' => !$node->isNew(),
+      '#attributes' => array(
+        'class' => 'entity-meta__title',
+      ),
     ),
     'changed' => array(
       '#type' => 'item',
-      '#wrapper_attributes' => array('class' => array('changed', 'container-inline')),
+      '#wrapper_attributes' => array('class' => array('entity-meta__last-saved', 'container-inline')),
       '#markup' => '<h4 class="label inline">' . t('Last saved') . '</h4> ' . $is_new,
     ),
     'author' => array(
