diff --git a/templates/cassiopeia/scss/blocks/_css-grid.scss b/templates/cassiopeia/scss/blocks/_css-grid.scss
index 861d40dc39..062acf2ff1 100644
--- a/templates/cassiopeia/scss/blocks/_css-grid.scss
+++ b/templates/cassiopeia/scss/blocks/_css-grid.scss
@@ -23,17 +23,6 @@
       max-width: none;
     }
 
-    .container-component,
-    .container-sidebar-left,
-    .container-sidebar-right {
-      display: flex;
-      flex-direction: column;
-
-      > * + * {
-        margin-top: $cassiopeia-grid-gutter;
-      }
-    }
-
     &:not(.has-sidebar-left) .container-component {
       grid-column-start: main-start;
     }
@@ -89,26 +78,16 @@
   grid-area: top-b;
 }
 
-.container-main {
-  grid-area: main;
-}
-
 .container-component {
   grid-area: comp;
 }
 
 .container-sidebar-left {
   grid-area: side-l;
-  .sidebar-left:first-child {
-    margin-top: $cassiopeia-grid-gutter;
-  }
 }
 
 .container-sidebar-right {
   grid-area: side-r;
-  .sidebar-right:first-child {
-    margin-top: $cassiopeia-grid-gutter;
-  }
 }
 
 .container-main-top {
diff --git a/templates/cassiopeia/scss/blocks/_layout.scss b/templates/cassiopeia/scss/blocks/_layout.scss
index a9bcb9fb43..3881008300 100644
--- a/templates/cassiopeia/scss/blocks/_layout.scss
+++ b/templates/cassiopeia/scss/blocks/_layout.scss
@@ -32,6 +32,7 @@
 .container-bottom-a,
 .container-bottom-b {
   padding: 4rem 0;
+
   > * {
     flex: 1;
     margin: ($cassiopeia-grid-gutter / 2);
@@ -46,29 +47,23 @@
   }
 }
 
-.container-main {
-  > * {
-    margin: ($cassiopeia-grid-gutter / 2);
-  }
+.container-component,
+.container-sidebar-left,
+.container-sidebar-right {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
 
-  @include media-breakpoint-down(sm) {
-    flex-direction: column;
+  > * {
+    margin-bottom: 0;
 
-    > * {
-      flex: 0 1 auto;
+    &:first-child {
+      margin-top: $cassiopeia-grid-gutter;
     }
   }
-}
 
-.container-component {
-  flex: 1;
-
-  > *:not(#system-message-container) {
-    margin-bottom: $cassiopeia-grid-gutter;
-
-    &:last-of-type {
-      margin-bottom: 0;
-    }
+  > * + * {
+    margin-top: $cassiopeia-grid-gutter;
   }
 }
 
diff --git a/templates/cassiopeia/scss/vendor/joomla-custom-elements/joomla-alert.scss b/templates/cassiopeia/scss/vendor/joomla-custom-elements/joomla-alert.scss
index 63ec37dbae..64a71d6ce1 100644
--- a/templates/cassiopeia/scss/vendor/joomla-custom-elements/joomla-alert.scss
+++ b/templates/cassiopeia/scss/vendor/joomla-custom-elements/joomla-alert.scss
@@ -9,13 +9,17 @@
   width: 100%;
   min-width: 16rem;
   padding: 0;
-  margin-bottom: 1rem;
+  margin-bottom: 0;
   color: var(--gray-dark);
   background-color: $white;
   border: 1px solid var(--alert-accent-color, transparent);
   border-radius: .25rem;
   transition: opacity .15s linear;
 
+  + * {
+    margin-top: 1rem;
+  }
+
   .alert-heading {
     display: flex;
     flex-direction: column;