diff --git a/src/pages/_includes/cards/forgot-password.html b/src/pages/_includes/cards/forgot-password.html
index 68818c330..5479df84d 100644
--- a/src/pages/_includes/cards/forgot-password.html
+++ b/src/pages/_includes/cards/forgot-password.html
@@ -13,6 +13,6 @@
 		</div>
 	</div>
 </form>
-<div class="text-center text-muted">
+<div class="text-center text-muted mt">
 	Forget it, <a href="{{ site.base }}/sign-in.html">send me back</a> to the sign in screen.
 </div>
diff --git a/src/pages/_includes/cards/sign-in.html b/src/pages/_includes/cards/sign-in.html
index 18f4a4234..b15fce2fc 100644
--- a/src/pages/_includes/cards/sign-in.html
+++ b/src/pages/_includes/cards/sign-in.html
@@ -37,6 +37,6 @@
 	</div>
 </form>
 
-<div class="text-center text-muted">
+<div class="text-center text-muted mt">
 	Don't have account yet? <a href="{{ site.base }}/sign-up.html" tabindex="-1">Sign up</a>
 </div>
diff --git a/src/pages/_includes/cards/sign-up.html b/src/pages/_includes/cards/sign-up.html
index 6db6a9f27..fc7318062 100644
--- a/src/pages/_includes/cards/sign-up.html
+++ b/src/pages/_includes/cards/sign-up.html
@@ -27,6 +27,6 @@
 	</div>
 </form>
 
-<div class="text-center text-muted">
+<div class="text-center text-muted mt">
 	Already have account? <a href="{{ site.base }}/sign-in.html" tabindex="-1">Sign in</a>
 </div>
diff --git a/src/scss/layout/_core.scss b/src/scss/layout/_core.scss
index da724c052..7ea8573de 100644
--- a/src/scss/layout/_core.scss
+++ b/src/scss/layout/_core.scss
@@ -2,6 +2,7 @@
 html {
   font-size: 16px;
   scroll-behavior: smooth;
+  height: 100%;
 }
 
 body {
@@ -11,6 +12,7 @@ body {
   text-rendering: optimizeLegibility;
   font-feature-settings: "liga" 0;
   position: relative;
+  min-height: 100%;
 
   .content * {
     @include scrollbar;
diff --git a/src/scss/ui/_buttons.scss b/src/scss/ui/_buttons.scss
index 1a667ce71..7816345ee 100644
--- a/src/scss/ui/_buttons.scss
+++ b/src/scss/ui/_buttons.scss
@@ -133,7 +133,7 @@
   margin-right: -.5rem;
 
   > * {
-    margin: 0 .5rem .5rem 0;
+    margin: 0 .5rem .5rem 0 !important;
   }
 
   > .btn-block {
diff --git a/src/scss/ui/_grid.scss b/src/scss/ui/_grid.scss
index 31bce245a..9fcb6e958 100644
--- a/src/scss/ui/_grid.scss
+++ b/src/scss/ui/_grid.scss
@@ -4,7 +4,7 @@
 
 %container-common {
   @include media-breakpoint-down($cards-grid-breakpoint) {
-    --bs-gutter-x: #{$grid-gutter-width};
+    --#{$variable-prefix}gutter-x: #{$grid-gutter-width};
   }
 }
 
@@ -16,6 +16,7 @@
 .container {
   @each $variation, $size in $container-variations {
     &-#{$variation} {
+      @include make-container();
       max-width: $size;
     }
   }