diff --git a/core/themes/bartik/bartik.libraries.yml b/core/themes/bartik/bartik.libraries.yml
index 734f3fa..2574119 100644
--- a/core/themes/bartik/bartik.libraries.yml
+++ b/core/themes/bartik/bartik.libraries.yml
@@ -4,7 +4,6 @@ global-styling:
     theme:
       css/base/elements.css: {}
       css/base/typography.css: {}
-      css/layout.css: {}
       css/components/admin.css: {}
       css/components/book.css: {}
       css/components/breadcrumb.css: {}
@@ -23,6 +22,7 @@ global-styling:
       css/components/list.css: {}
       css/components/messages.css: {}
       css/components/node-preview.css: {}
+      css/components/page.css: {}
       css/components/pager.css: {}
       css/components/primary-menu.css: {}
       css/components/search.css: {}
diff --git a/core/themes/bartik/css/components/featured.css b/core/themes/bartik/css/components/featured.css
index 3c56852..8dcc2cd 100644
--- a/core/themes/bartik/css/components/featured.css
+++ b/core/themes/bartik/css/components/featured.css
@@ -12,6 +12,12 @@
   border-bottom: 1px solid #e7e7e7;
   text-shadow: 1px 1px #fff;
 }
+#featured aside.section {
+  width: 100%;
+  max-width: 860px;
+  margin-left: auto;
+  margin-right: auto;
+}
 #featured h2 {
   font-size: 1.2em;
   line-height: 1;
@@ -20,3 +26,11 @@
   margin: 0;
   padding: 0;
 }
+
+@media all and (min-width: 851px) {
+
+  #featured aside.section {
+    max-width: 1290px;
+  }
+
+}
\ No newline at end of file
diff --git a/core/themes/bartik/css/components/footer.css b/core/themes/bartik/css/components/footer.css
index 094181a..eb39e6f 100644
--- a/core/themes/bartik/css/components/footer.css
+++ b/core/themes/bartik/css/components/footer.css
@@ -1,5 +1,12 @@
 /* ------------------ Footer ------------------ */
 
+#footer-wrapper {
+  padding: 35px 0 30px;
+}
+#footer-wrapper .section {
+  box-sizing: border-box;
+  padding: 0 15px;
+}
 #footer-wrapper .block .content {
   color: #c0c0c0;
   color: rgba(255, 255, 255, 0.65);
@@ -20,6 +27,13 @@
   border-color: rgba(255, 255, 255, 0.1);
   padding: 10px;
 }
+#footer-columns,
+#footer {
+  width: 100%;
+  max-width: 860px;
+  margin-left: auto;
+  margin-right: auto;
+}
 #footer-columns .block-menu,
 #footer .block {
   margin: 0;
@@ -140,3 +154,74 @@
   background-color: #2c2c2c;
   background-color: rgba(0, 0, 0, 0.15);
 }
+
+/* -------------- Footer columns -------------- */
+
+.region-footer-firstcolumn,
+.region-footer-secondcolumn,
+.region-footer-thirdcolumn,
+.region-footer-fourthcolumn {
+  box-sizing: border-box;
+  padding: 0 10px;
+}
+
+@media all and (min-width: 560px) and (max-width: 850px) {
+
+  .region-footer-firstcolumn,
+  .region-footer-secondcolumn,
+  .region-footer-thirdcolumn,
+  .region-footer-fourthcolumn {
+    display: inline;
+    float: left; /* LTR */
+    position: relative;
+  }
+  [dir="rtl"] .region-footer-firstcolumn,
+  [dir="rtl"] .region-footer-secondcolumn,
+  [dir="rtl"] .region-footer-thirdcolumn,
+  [dir="rtl"] .region-footer-fourthcolumn {
+    float: right;
+  }
+  .region-footer-firstcolumn,
+  .region-footer-secondcolumn,
+  .region-footer-thirdcolumn,
+  .region-footer-fourthcolumn {
+    box-sizing: border-box;
+    padding: 0 10px;
+    width: 50%;
+  }
+  .region-footer-thirdcolumn {
+    clear: both;
+  }
+
+}
+
+@media all and (min-width: 851px) {
+
+  #footer-columns,
+  #footer {
+    max-width: 1290px;
+  }
+  .region-footer-firstcolumn,
+  .region-footer-secondcolumn,
+  .region-footer-thirdcolumn,
+  .region-footer-fourthcolumn {
+    display: inline;
+    float: left; /* LTR */
+    position: relative;
+  }
+  [dir="rtl"] .region-footer-firstcolumn,
+  [dir="rtl"] .region-footer-secondcolumn,
+  [dir="rtl"] .region-footer-thirdcolumn,
+  [dir="rtl"] .region-footer-fourthcolumn {
+    float: right;
+  }
+  .region-footer-firstcolumn,
+  .region-footer-secondcolumn,
+  .region-footer-thirdcolumn,
+  .region-footer-fourthcolumn {
+    box-sizing: border-box;
+    padding: 0 10px;
+    width: 25%;
+  }
+
+}
diff --git a/core/themes/bartik/css/components/header.css b/core/themes/bartik/css/components/header.css
index 9db0b1d..f324ae7 100644
--- a/core/themes/bartik/css/components/header.css
+++ b/core/themes/bartik/css/components/header.css
@@ -1,4 +1,11 @@
 /* ------------------ Header ------------------ */
+#header div.section {
+  width: 100%;
+  max-width: 860px;
+  margin-left: auto;
+  margin-right: auto;
+  position: relative;
+}
 #logo,
 .site-logo {
   float: left; /* LTR */
@@ -42,6 +49,13 @@ h1.site-name {
   font-style: italic;
 }
 /* Region header blocks. */
+.region-header {
+  float: right; /* LTR */
+  margin: .5em 5px .75em;
+}
+[dir="rtl"] .region-header {
+  float: left;
+}
 .region-header .block {
   font-size: 0.857em;
   float: left; /* LTR */
@@ -193,3 +207,11 @@ h1.site-name {
 [dir="rtl"] .region-header #block-user-login .item-list li {
   float: right;
 }
+
+@media all and (min-width: 851px) {
+
+  #header div.section {
+    max-width: 1290px;
+  }
+
+}
diff --git a/core/themes/bartik/css/components/messages.css b/core/themes/bartik/css/components/messages.css
index 880efa1..edb684e 100644
--- a/core/themes/bartik/css/components/messages.css
+++ b/core/themes/bartik/css/components/messages.css
@@ -4,6 +4,12 @@
   padding: 20px 0 5px;
   margin: 0 auto;
 }
+#messages div.section {
+  width: 100%;
+  max-width: 860px;
+  margin-left: auto;
+  margin-right: auto;
+}
 .featured #messages {
   background: #f0f0f0;
   background: rgba(30, 50, 10, 0.08);
@@ -15,3 +21,11 @@ div.messages {
   margin-right: 23px;
   margin-left: 15px;
 }
+
+@media all and (min-width: 851px) {
+
+  #messages div.section {
+    max-width: 1290px;
+  }
+
+}
\ No newline at end of file
diff --git a/core/themes/bartik/css/components/page.css b/core/themes/bartik/css/components/page.css
new file mode 100644
index 0000000..6264a98
--- /dev/null
+++ b/core/themes/bartik/css/components/page.css
@@ -0,0 +1,50 @@
+/* ------------------- Page ------------------- */
+
+html,
+body,
+#page {
+  height: 100%;
+}
+#page-wrapper {
+  min-height: 100%;
+}
+.region-secondary-menu .block-menu {
+  width: 100%;
+  margin: 0 auto;
+}
+
+/* ------------------- Main ------------------- */
+
+#main-wrapper {
+  min-height: 300px;
+}
+#main {
+  margin-bottom: 40px;
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 20px;
+  max-width: 860px;
+  width: 100%;
+}
+
+/* ----------------- Content ------------------ */
+
+#content .section {
+  padding: 0 15px;
+}
+
+@media all and (min-width: 851px) {
+
+  #main {
+    max-width: 1290px;
+  }
+  #content {
+    display: inline;
+    float: left; /* LTR */
+    position: relative;
+  }
+  [dir="rtl"] #content {
+    float: right;
+  }
+  
+}
diff --git a/core/themes/bartik/css/components/sidebar.css b/core/themes/bartik/css/components/sidebar.css
index 7f1d5d8..fa9a3b2 100644
--- a/core/themes/bartik/css/components/sidebar.css
+++ b/core/themes/bartik/css/components/sidebar.css
@@ -1,7 +1,7 @@
 /* ------------------ Sidebar ----------------- */
 
 .sidebar .section {
-  padding-top: 10px;
+  padding: 10px 15px 0 15px;
 }
 .sidebar .block {
   border-style: solid;
@@ -29,3 +29,93 @@
   background: none;
   border-bottom: 1px solid #d6d6d6;
 }
+
+@media all and (min-width: 560px) and (max-width: 850px) {
+  
+  #sidebar-first {
+    display: inline;
+    float: left; /* LTR */
+    position: relative;
+  }
+  [dir="rtl"] #sidebar-first {
+    float: right;
+  }
+  #sidebar-first,
+  #sidebar-second {
+    width: 50%;
+  }
+  #sidebar-second {
+    margin-left: 50%; /* LTR */
+  }
+  [dir="rtl"] #sidebar-second {
+    margin-right: 50%;
+  }
+  .layout-one-sidebar #sidebar-first,
+  .layout-one-sidebar #sidebar-second {
+    width: 100%;
+  }
+  .layout-one-sidebar #sidebar-second {
+    margin-left: 0; /* LTR */
+  }
+  [dir="rtl"] .layout-one-sidebar #sidebar-second {
+    margin-right: 0;
+  }
+
+}
+
+@media all and (min-width: 851px) {
+
+  #sidebar-first,
+  #sidebar-second {
+    display: inline;
+    float: left; /* LTR */
+    position: relative;
+  }
+  [dir="rtl"] #sidebar-first,
+  [dir="rtl"] #sidebar-second {
+    float: right;
+  }
+  .layout-two-sidebars #content {
+    margin-left: 25%;
+    margin-right: 25%;
+    width: 50%;
+  }
+  .layout-one-sidebar #content {
+    width: 75%;
+  }
+  .layout-no-sidebars #content {
+    width: 100%;
+  }
+  .layout-sidebar-first #content {
+    margin-left: 25%; /* LTR */
+    margin-right: 0; /* LTR */
+  }
+  [dir="rtl"] .layout-sidebar-first #content {
+    margin-left: 0;
+    margin-right: 25%;
+  }
+  .layout-sidebar-second #content {
+    margin-right: 25%; /* LTR */
+    margin-left: 0; /* LTR */
+  }
+  [dir="rtl"] .layout-sidebar-second #content {
+    margin-right: 0;
+    margin-left: 25%;
+  }
+  #sidebar-first {
+    width: 25%;
+    margin-left: -100%; /* LTR */
+  }
+  [dir="rtl"] #sidebar-first {
+    margin-right: -100%;
+  }
+  #sidebar-second {
+    width: 25%;
+    margin-left: -25%; /* LTR */
+    clear: none;
+  }
+  [dir="rtl"] #sidebar-second {
+    margin-right: -25%;
+  }
+
+}
diff --git a/core/themes/bartik/css/components/triptych.css b/core/themes/bartik/css/components/triptych.css
index 148f3b86..4a89a61 100644
--- a/core/themes/bartik/css/components/triptych.css
+++ b/core/themes/bartik/css/components/triptych.css
@@ -5,6 +5,12 @@
   background: rgba(30, 50, 10, 0.08);
   border-top: 1px solid #e7e7e7;
 }
+#triptych {
+  width: 100%;
+  max-width: 860px;
+  margin-left: auto;
+  margin-right: auto;
+}
 #triptych h2 {
   color: #000;
   font-size: 1.4em;
@@ -53,3 +59,61 @@
 #triptych-last #block-system-powered-by {
   text-align: right;
 }
+.region-triptych-first,
+.region-triptych-middle,
+.region-triptych-last {
+  box-sizing: border-box;
+  padding: 0 20px 0;
+}
+
+@media all and (min-width: 560px) and (max-width: 850px) {
+
+  .region-triptych-first,
+  .region-triptych-middle,
+  .region-triptych-last {
+    display: inline;
+    float: left; /* LTR */
+    position: relative;
+  }
+  [dir="rtl"] .region-triptych-first,
+  [dir="rtl"] .region-triptych-middle,
+  [dir="rtl"] .region-triptych-last {
+    float: right;
+  }
+  .region-triptych-first,
+  .region-triptych-middle,
+  .region-triptych-last {
+    box-sizing: border-box;
+    padding: 20px 15px 30px;
+    width: 33%;
+  }
+  .region-triptych-middle {
+    padding: 20px 5px 30px;
+  }
+
+}
+
+@media all and (min-width: 851px) {
+
+  #triptych {
+    max-width: 1290px;
+  }
+  .region-triptych-first,
+  .region-triptych-middle,
+  .region-triptych-last {
+    display: inline;
+    float: left; /* LTR */
+    position: relative;
+  }
+  [dir="rtl"] .region-triptych-first,
+  [dir="rtl"] .region-triptych-middle,
+  [dir="rtl"] .region-triptych-last {
+    float: right;
+  }
+  .region-triptych-first,
+  .region-triptych-middle,
+  .region-triptych-last {
+    width: 33%;
+  }
+
+}
\ No newline at end of file
diff --git a/core/themes/bartik/css/layout.css b/core/themes/bartik/css/layout.css
deleted file mode 100644
index 8a603b6..0000000
--- a/core/themes/bartik/css/layout.css
+++ /dev/null
@@ -1,236 +0,0 @@
-
-/* ---------- Basic Layout Styles ----------- */
-
-html,
-body,
-#page  {
-  height: 100%;
-}
-#page-wrapper {
-  min-height: 100%;
-}
-#header div.section,
-#featured aside.section,
-#messages div.section,
-#main,
-#triptych,
-#footer-columns,
-#footer {
-  width: 100%;
-  max-width: 860px;
-  margin-left: auto;
-  margin-right: auto;
-}
-#header div.section {
-  position: relative;
-}
-.region-header {
-  float: right; /* LTR */
-  margin: .5em 5px .75em;
-}
-[dir="rtl"] .region-header {
-  float: left;
-}
-.region-secondary-menu .block-menu {
-  width: 100%;
-  margin: 0 auto;
-}
-#main-wrapper {
-  min-height: 300px;
-}
-#content .section,
-.sidebar .section {
-  padding: 0 15px;
-}
-#footer-wrapper {
-  padding: 35px 0 30px;
-}
-#footer-wrapper .section {
-  box-sizing: border-box;
-  padding: 0 15px;
-}
-.region-triptych-first,
-.region-triptych-middle,
-.region-triptych-last {
-  box-sizing: border-box;
-  padding: 0 20px 0;
-}
-.region-footer-firstcolumn,
-.region-footer-secondcolumn,
-.region-footer-thirdcolumn,
-.region-footer-fourthcolumn {
-  box-sizing: border-box;
-  padding: 0 10px;
-}
-
-@media all and (min-width: 560px) and (max-width: 850px) {
-
-  #sidebar-first,
-  .region-triptych-first,
-  .region-triptych-middle,
-  .region-triptych-last,
-  .region-footer-firstcolumn,
-  .region-footer-secondcolumn,
-  .region-footer-thirdcolumn,
-  .region-footer-fourthcolumn {
-    display: inline;
-    float: left; /* LTR */
-    position: relative;
-  }
-  [dir="rtl"] #sidebar-first,
-  [dir="rtl"] .region-triptych-first,
-  [dir="rtl"] .region-triptych-middle,
-  [dir="rtl"] .region-triptych-last,
-  [dir="rtl"] .region-footer-firstcolumn,
-  [dir="rtl"] .region-footer-secondcolumn,
-  [dir="rtl"] .region-footer-thirdcolumn,
-  [dir="rtl"] .region-footer-fourthcolumn {
-    float: right;
-  }
-  #sidebar-first,
-  #sidebar-second {
-    width: 50%;
-  }
-  #sidebar-second {
-    margin-left: 50%; /* LTR */
-  }
-  [dir="rtl"] #sidebar-second {
-    margin-right: 50%;
-  }
-  .layout-one-sidebar #sidebar-first,
-  .layout-one-sidebar #sidebar-second {
-    width: 100%;
-  }
-  .layout-one-sidebar #sidebar-second {
-    margin-left: 0; /* LTR */
-  }
-  [dir="rtl"] .layout-one-sidebar #sidebar-second {
-    margin-right: 0;
-  }
-  .region-triptych-first,
-  .region-triptych-middle,
-  .region-triptych-last {
-    box-sizing: border-box;
-    padding: 20px 15px 30px;
-    width: 33%;
-  }
-  .region-triptych-middle {
-    padding: 20px 5px 30px;
-  }
-  .region-footer-firstcolumn,
-  .region-footer-secondcolumn {
-    box-sizing: border-box;
-    padding: 0 10px;
-    width: 50%;
-  }
-  .region-footer-thirdcolumn,
-  .region-footer-fourthcolumn {
-    box-sizing: border-box;
-    padding: 0 10px;
-    width: 50%;
-  }
-  .region-footer-thirdcolumn {
-    clear: both;
-  }
-}
-
-@media all and (min-width: 851px) {
-
-  #header div.section,
-  #featured aside.section,
-  #messages div.section,
-  #main,
-  #triptych,
-  #footer-columns,
-  #footer {
-    max-width: 1290px;
-  }
-  #content,
-  #sidebar-first,
-  #sidebar-second,
-  .region-triptych-first,
-  .region-triptych-middle,
-  .region-triptych-last,
-  .region-footer-firstcolumn,
-  .region-footer-secondcolumn,
-  .region-footer-thirdcolumn,
-  .region-footer-fourthcolumn {
-    display: inline;
-    float: left; /* LTR */
-    position: relative;
-  }
-  [dir="rtl"] #content,
-  [dir="rtl"] #sidebar-first,
-  [dir="rtl"] #sidebar-second,
-  [dir="rtl"] .region-triptych-first,
-  [dir="rtl"] .region-triptych-middle,
-  [dir="rtl"] .region-triptych-last,
-  [dir="rtl"] .region-footer-firstcolumn,
-  [dir="rtl"] .region-footer-secondcolumn,
-  [dir="rtl"] .region-footer-thirdcolumn,
-  [dir="rtl"] .region-footer-fourthcolumn {
-    float: right;
-  }
-  .layout-two-sidebars #content {
-    margin-left: 25%;
-    margin-right: 25%;
-    width: 50%;
-  }
-  .layout-one-sidebar #content {
-    width: 75%;
-  }
-  .layout-no-sidebars #content {
-    width: 100%;
-  }
-  .layout-sidebar-first #content {
-    margin-left: 25%; /* LTR */
-    margin-right: 0; /* LTR */
-  }
-  [dir="rtl"] .layout-sidebar-first #content {
-    margin-left: 0;
-    margin-right: 25%;
-  }
-  .layout-sidebar-second #content {
-    margin-right: 25%; /* LTR */
-    margin-left: 0; /* LTR */
-  }
-  [dir="rtl"] .layout-sidebar-second #content {
-    margin-right: 0;
-    margin-left: 25%;
-  }
-  #sidebar-first {
-    width: 25%;
-    margin-left: -100%; /* LTR */
-  }
-  [dir="rtl"] #sidebar-first {
-    margin-right: -100%;
-  }
-  #sidebar-second {
-    width: 25%;
-    margin-left: -25%; /* LTR */
-    clear: none;
-  }
-  [dir="rtl"] #sidebar-second {
-    margin-right: -25%;
-  }
-  .region-triptych-first,
-  .region-triptych-middle,
-  .region-triptych-last {
-    width: 33%;
-  }
-  .region-footer-firstcolumn,
-  .region-footer-secondcolumn,
-  .region-footer-thirdcolumn,
-  .region-footer-fourthcolumn {
-    box-sizing: border-box;
-    padding: 0 10px;
-    width: 25%;
-  }
-}
-/* ------------------- Main ------------------- */
-
-#main {
-  margin-top: 20px;
-  margin-bottom: 40px;
-}
-