diff --git a/templates/cassiopeia/scss/blocks/_css-grid.scss b/templates/cassiopeia/scss/blocks/_css-grid.scss
index 8f09dca895..cab5c8e080 100644
--- a/templates/cassiopeia/scss/blocks/_css-grid.scss
+++ b/templates/cassiopeia/scss/blocks/_css-grid.scss
@@ -135,24 +135,3 @@
 .system-debug {
   grid-area: debug;
 }
-
-.container-top-a,
-.container-top-b,
-.container-bottom-a,
-.container-bottom-b {
-  display: grid;
-  grid-gap: $cassiopeia-grid-gutter;
-  grid-template-columns: 1fr;
-
-  > * {
-    margin: 0;
-  }
-
-  @include media-breakpoint-up(sm) {
-    grid-template-columns: 1fr 1fr;
-  }
-
-  @include media-breakpoint-up(md) {
-    grid-template-columns: repeat(auto-fit, minmax(24%, 1fr));
-  }
-}
diff --git a/templates/cassiopeia/scss/blocks/_footer.scss b/templates/cassiopeia/scss/blocks/_footer.scss
index 1259e8bd24..5e071cfd5b 100644
--- a/templates/cassiopeia/scss/blocks/_footer.scss
+++ b/templates/cassiopeia/scss/blocks/_footer.scss
@@ -23,4 +23,13 @@
     background: $white;
     border-radius: $border-radius;
   }
+
+  [dir=rtl] & {
+    background-image: $cassiopeia-header-grad-rtl;
+
+    .back-top {
+      margin-right: auto;
+      margin-left: 0;
+    }
+  }
 }
diff --git a/templates/cassiopeia/scss/blocks/_form.scss b/templates/cassiopeia/scss/blocks/_form.scss
index 9a77b1e533..18df393e02 100644
--- a/templates/cassiopeia/scss/blocks/_form.scss
+++ b/templates/cassiopeia/scss/blocks/_form.scss
@@ -108,7 +108,29 @@ td .form-control {
   bottom: 100%;
 }
 
+fieldset {
+  margin-bottom: $cassiopeia-grid-gutter*2;
+  + fieldset {
+    margin-top: $cassiopeia-grid-gutter*2;
+  }
+
+  > * {
+    margin-bottom: 0
+  }
+
+  > * + * {
+    margin-top: $cassiopeia-grid-gutter*2;
+  }
+}
+
+.control-group {
+  margin: $cassiopeia-grid-gutter 0;
+}
 .container-popup [id="filter[search]-desc"] {
   top: 100%;
   bottom: auto;
 }
+
+.com-users-login__options {
+  margin-top: $cassiopeia-grid-gutter*2;
+}
diff --git a/templates/cassiopeia/scss/blocks/_global.scss b/templates/cassiopeia/scss/blocks/_global.scss
index dd928d87a0..662343d257 100644
--- a/templates/cassiopeia/scss/blocks/_global.scss
+++ b/templates/cassiopeia/scss/blocks/_global.scss
@@ -26,6 +26,10 @@ h6 {
 a {
   color: var(--cassiopeia-color-primary);
 
+  &:not([class]) {
+    text-decoration: underline;
+  }
+
   &:hover,
   &:focus {
     color: var(--cassiopeia-color-hover);
diff --git a/templates/cassiopeia/scss/blocks/_modifiers.scss b/templates/cassiopeia/scss/blocks/_modifiers.scss
index d85dc22825..531fb4104f 100644
--- a/templates/cassiopeia/scss/blocks/_modifiers.scss
+++ b/templates/cassiopeia/scss/blocks/_modifiers.scss
@@ -275,3 +275,30 @@
     }
   }
 }
+
+.mod-list {
+  padding-left: 0;
+  list-style-position: inside;
+
+  [dir=rtl] & {
+    padding-right: 0;
+  }
+}
+
+.mod-menu.nav {
+  li {
+    padding: ($cassiopeia-grid-gutter/2) 0;
+
+    a {
+      text-decoration: none;
+    }
+
+    &.active > a {
+      text-decoration: underline;
+    }
+
+    .mod-menu__sub {
+      padding-left: $cassiopeia-grid-gutter;
+    }
+  }
+}
diff --git a/templates/cassiopeia/scss/template-rtl.scss b/templates/cassiopeia/scss/template-rtl.scss
index 400ac4f697..614c80c8e8 100644
--- a/templates/cassiopeia/scss/template-rtl.scss
+++ b/templates/cassiopeia/scss/template-rtl.scss
@@ -116,11 +116,3 @@ dd {
 .btn-group > .btn-group:not(:first-child) {
   @include border-right-radius(0);
 }
-
-.footer {
-  background-image: $cassiopeia-header-grad-rtl;
-  .back-top {
-    margin-right: auto;
-    margin-left: 0;
-  }
-}
diff --git a/templates/cassiopeia/scss/vendor/metismenu/_metismenu.scss b/templates/cassiopeia/scss/vendor/metismenu/_metismenu.scss
index 0df8159902..5f84000808 100644
--- a/templates/cassiopeia/scss/vendor/metismenu/_metismenu.scss
+++ b/templates/cassiopeia/scss/vendor/metismenu/_metismenu.scss
@@ -23,7 +23,12 @@
           @include media-breakpoint-down(md) {
             width: 100%;
           }
-          .active a {
+          .active > a {
+            text-decoration: underline;
+          }
+
+          span:hover,
+          a:hover {
             text-decoration: underline;
           }
         }
@@ -31,6 +36,7 @@
         > a {
           flex: 1 0 0%;
           overflow: hidden;
+          text-decoration: none;
           text-overflow: ellipsis;
           white-space: nowrap;
         }