diff --git a/resources/css/bem/account-edit.less b/resources/css/bem/account-edit.less
index 3ece81b9ddd..22ab0f97000 100644
--- a/resources/css/bem/account-edit.less
+++ b/resources/css/bem/account-edit.less
@@ -15,13 +15,14 @@
 
   display: flex;
   flex-direction: column;
-  margin-bottom: 5px;
 
   @media @desktop {
     flex-direction: row;
   }
 
   &--first {
+    position: relative;
+
     &::after {
       .inner-shadow-top();
       .full-size();
diff --git a/resources/css/bem/artist-album.less b/resources/css/bem/artist-album.less
index ce9225546bb..a0d880141f4 100644
--- a/resources/css/bem/artist-album.less
+++ b/resources/css/bem/artist-album.less
@@ -7,9 +7,6 @@
   align-items: center;
   .default-box-shadow();
   overflow: hidden;
-  @media @desktop {
-    margin-bottom: 10px;
-  }
 
   &__badge {
     position: relative;
diff --git a/resources/css/bem/beatmap-discussions.less b/resources/css/bem/beatmap-discussions.less
index cca81578559..d096cf0e16a 100644
--- a/resources/css/bem/beatmap-discussions.less
+++ b/resources/css/bem/beatmap-discussions.less
@@ -9,7 +9,6 @@
   @_timeline-colour: @osu-colour-b6;
 
   .default-box-shadow();
-  margin-bottom: 10px;
   background-color: @osu-colour-b4;
   display: flex;
   flex-direction: column;
diff --git a/resources/css/bem/comments.less b/resources/css/bem/comments.less
index 67083f49022..1478ad00739 100644
--- a/resources/css/bem/comments.less
+++ b/resources/css/bem/comments.less
@@ -15,10 +15,6 @@
   background-color: hsl(var(--comments-bg-hsl));
   color: var(--comments-fg);
 
-  @media @desktop {
-    margin-bottom: 10px;
-  }
-
   &--page-extra {
     --comments-bg-hsl: var(--hsl-b4);
     --comments-pinned-bg-hsl: var(--hsl-b3);
diff --git a/resources/css/bem/contest.less b/resources/css/bem/contest.less
index 0b96acd00f3..b1548b9c321 100644
--- a/resources/css/bem/contest.less
+++ b/resources/css/bem/contest.less
@@ -6,10 +6,6 @@
   background-color: @osu-colour-b5;
   color: @osu-colour-c1;
 
-  @media @desktop {
-    margin-bottom: 10px;
-  }
-
   &__description {
     .default-gutter-v2();
     .content-font();
diff --git a/resources/css/bem/header-v4.less b/resources/css/bem/header-v4.less
index 7a656a9b261..74e16614501 100644
--- a/resources/css/bem/header-v4.less
+++ b/resources/css/bem/header-v4.less
@@ -135,7 +135,7 @@
 
       @media @desktop {
         padding-top: @nav2-height + 15px;
-        min-height: (@nav2-height + 70px);
+        min-height: @header-container-min-height;
       }
 
       .@{_top}--supporter & {
diff --git a/resources/css/bem/landing-sitemap.less b/resources/css/bem/landing-sitemap.less
index 9cc4259e4ac..e417d124df6 100644
--- a/resources/css/bem/landing-sitemap.less
+++ b/resources/css/bem/landing-sitemap.less
@@ -2,10 +2,15 @@
 // See the LICENCE file in the repository root for full licence text.
 
 .landing-sitemap {
-  text-align: center;
+  display: grid;
+  grid-gap: 10px;
 
   @media @desktop {
-    text-align: left;
+    grid-template-columns: repeat(3, 1fr);
+  }
+
+  @media @mobile {
+    text-align: center;
   }
 
   &__header {
diff --git a/resources/css/bem/osu-layout.less b/resources/css/bem/osu-layout.less
index 2722ab8cf11..226b8c79bb7 100644
--- a/resources/css/bem/osu-layout.less
+++ b/resources/css/bem/osu-layout.less
@@ -77,10 +77,6 @@
     &--with-gutter {
       margin: -5px;
     }
-
-    &--landing-sitemap {
-      width: 100%;
-    }
   }
 
   &__no-scroll {
@@ -116,14 +112,12 @@
     }
 
     &--page {
-      ._page;
+      ._page();
       padding: 20px;
-      margin-bottom: 10px;
     }
 
     &--page-compact {
-      ._page;
-      margin-bottom: 10px;
+      ._page();
     }
 
     &--landing-sitemap {
@@ -136,6 +130,7 @@
   &__section {
     display: flex;
     flex-direction: column;
+    margin-bottom: 10px;
 
     &--full {
       flex: 1 0 auto;
@@ -143,6 +138,7 @@
 
     &--landing-footer {
       margin-top: auto;
+      margin-bottom: 0;
       flex: none;
       .at2x("~@images/backgrounds/page-000.png", 500px, 500px);
     }
diff --git a/resources/css/bem/osu-page.less b/resources/css/bem/osu-page.less
index bcf9500bcad..b8eec4cd564 100644
--- a/resources/css/bem/osu-page.less
+++ b/resources/css/bem/osu-page.less
@@ -15,7 +15,6 @@
     background-color: @_default-bg;
     color: @_default-fg;
     .default-box-shadow();
-    margin-bottom: 10px;
   }
 
   .page-width();
@@ -23,6 +22,12 @@
     .page-width-desktop();
   }
 
+  &--account-edit {
+    display: flex;
+    flex-direction: column;
+    gap: 5px;
+  }
+
   &--account-edit-header {
     .default-box-shadow();
   }
@@ -32,7 +37,6 @@
     .default-gutter-v2();
     padding-top: 20px;
     padding-bottom: 20px;
-    margin-bottom: 10px;
     color: @osu-colour-c1;
 
     h1, h3, h4 {
@@ -87,21 +91,15 @@
     padding-bottom: $padding-top;
   }
 
-  &--artists {
-    margin-bottom: 10px;
-  }
-
   &--beatmapsets-search-header {
     .default-box-shadow();
-    margin-bottom: 10px;
   }
 
   &--changelog {
-    .default;
+    .default();
     background-color: @osu-colour-b4;
     display: flex;
     flex-direction: column;
-    margin-bottom: 0;
   }
 
   &--comment {
@@ -111,7 +109,6 @@
     background-color: hsl(var(--comments-bg-hsl));
     color: var(--comments-fg);
     padding: 10px 0 0;
-    margin-bottom: 0;
   }
 
   &--comments {
@@ -124,7 +121,7 @@
   }
 
   &--contests {
-    .default;
+    .default();
   }
 
   &--description {
@@ -139,7 +136,6 @@
   &--forum {
     background-color: @osu-colour-b5;
     color: @osu-colour-c1;
-    margin-bottom: 10px;
   }
 
   &--forum-topic {
@@ -189,7 +185,7 @@
   }
 
   &--generic-compact {
-    .default;
+    .default();
   }
 
   &--info-bar {
@@ -229,14 +225,10 @@
     .default-box-shadow();
     background-color: @osu-colour-b5;
     color: @osu-colour-c1;
-
-    @media @desktop {
-      margin-bottom: 10px;
-    }
   }
 
   &--supporter {
-    .default;
+    .default();
     display: flex;
     flex-direction: column;
   }
@@ -253,15 +245,14 @@
   }
 
   &--chat {
-    .default;
+    .default();
 
     flex: 1 0 auto;
     display: flex;
-    height: calc((var(--vh, 1vh) * 100) - (@nav2-height + 70px + 50px)); // viewport height - compact header+footer
-    margin-bottom: 0;
+    height: calc((var(--vh, 1vh) * 100) - (@header-container-min-height + 60px)); // viewport height - (header + footer + margins)
 
     @media @mobile {
-      height: calc((var(--vh, 1vh) * 100) - 90px);
+      height: calc((var(--vh, 1vh) * 100) - var(--navbar-height));
     }
   }
 }
diff --git a/resources/css/bem/search.less b/resources/css/bem/search.less
index c23a1f183ff..1eeab8581de 100644
--- a/resources/css/bem/search.less
+++ b/resources/css/bem/search.less
@@ -5,7 +5,6 @@
   .default-box-shadow();
   background-color: @osu-colour-b5;
   padding: 10px 0;
-  margin-bottom: 10px;
   display: flex;
   flex-direction: column;
 }
diff --git a/resources/css/bem/store-products.less b/resources/css/bem/store-products.less
index def7cb6ad8e..054b4384318 100644
--- a/resources/css/bem/store-products.less
+++ b/resources/css/bem/store-products.less
@@ -4,7 +4,7 @@
 .store-products {
   display: grid;
   grid-gap: 10px;
-  padding: 10px;
+  padding: 10px 10px 0 10px; // remove bottom-margin from osu-layout__section
 
   @media @desktop {
     grid-template-columns: 1fr 1fr;
diff --git a/resources/css/bem/tournament-list.less b/resources/css/bem/tournament-list.less
index 04b3f62ebc7..104cedd7f82 100644
--- a/resources/css/bem/tournament-list.less
+++ b/resources/css/bem/tournament-list.less
@@ -8,10 +8,6 @@
   padding-top: 20px;
   padding-bottom: 20px;
 
-  @media @desktop {
-    margin-bottom: 10px;
-  }
-
   &__heading {
     color: white;
     padding: 10px 0 10px;
diff --git a/resources/css/bem/tournament.less b/resources/css/bem/tournament.less
index b295f576f1a..c45a1dec73b 100644
--- a/resources/css/bem/tournament.less
+++ b/resources/css/bem/tournament.less
@@ -5,10 +5,6 @@
   @_top: tournament;
   background-color: @osu-colour-b5;
 
-  @media @desktop {
-    margin-bottom: 10px;
-  }
-
   &__banner {
     .at2x-simple-var(--tournament-header-banner);
   }
diff --git a/resources/css/bem/user-home.less b/resources/css/bem/user-home.less
index 93720b7beee..0d8cc13be36 100644
--- a/resources/css/bem/user-home.less
+++ b/resources/css/bem/user-home.less
@@ -9,7 +9,6 @@
 
   @media @desktop {
     padding: 0 @gutter-v2-desktop;
-    margin-bottom: 10px;
     flex-direction: row;
     align-items: flex-start;
   }
diff --git a/resources/css/variables.less b/resources/css/variables.less
index 31d0f5ce3d1..f7eccff4ff3 100644
--- a/resources/css/variables.less
+++ b/resources/css/variables.less
@@ -133,6 +133,7 @@
 
 @beatmapset-float-box-width: 275px;
 
+@header-container-min-height: @nav2-height + 70px;
 @header-title-height: 55px;
 
 // top padding + menu + page title
diff --git a/resources/views/accounts/_edit_legacy_api.blade.php b/resources/views/accounts/_edit_legacy_api.blade.php
index e7cfd8436ba..fc78d88aaf2 100644
--- a/resources/views/accounts/_edit_legacy_api.blade.php
+++ b/resources/views/accounts/_edit_legacy_api.blade.php
@@ -2,7 +2,7 @@
     Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
     See the LICENCE file in the repository root for full licence text.
 --}}
-<div class="account-edit">
+<div class="account-edit" id="legacy-api">
     <div class="account-edit__section">
         <h2 class="account-edit__section-title">
             {{ osu_trans('accounts.edit.legacy_api.title') }}
diff --git a/resources/views/accounts/_edit_notifications.blade.php b/resources/views/accounts/_edit_notifications.blade.php
index 5e53c7a5112..5b3d4e966a9 100644
--- a/resources/views/accounts/_edit_notifications.blade.php
+++ b/resources/views/accounts/_edit_notifications.blade.php
@@ -6,7 +6,7 @@
     use App\Jobs\Notifications\BroadcastNotificationBase;
     use App\Models\UserNotificationOption;
 @endphp
-<div class="account-edit">
+<div class="account-edit" id="notifications">
     <div class="account-edit__section">
         <h2 class="account-edit__section-title">
             {{ osu_trans('accounts.notifications.title') }}
diff --git a/resources/views/accounts/_edit_oauth.blade.php b/resources/views/accounts/_edit_oauth.blade.php
index 830eba4f7df..dde40ec7a14 100644
--- a/resources/views/accounts/_edit_oauth.blade.php
+++ b/resources/views/accounts/_edit_oauth.blade.php
@@ -2,7 +2,7 @@
     Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
     See the LICENCE file in the repository root for full licence text.
 --}}
-<div class="account-edit">
+<div class="account-edit" id="oauth">
     <div class="account-edit__section">
         <h2 class="account-edit__section-title">
             {{ osu_trans('accounts.oauth.title') }}
diff --git a/resources/views/accounts/edit.blade.php b/resources/views/accounts/edit.blade.php
index dedea55b475..74c2ced25aa 100644
--- a/resources/views/accounts/edit.blade.php
+++ b/resources/views/accounts/edit.blade.php
@@ -20,7 +20,7 @@
 
     @include('home._user_header_default', ['themeOverride' => 'settings'])
 
-    <div class="osu-page">
+    <div class="osu-page osu-page--account-edit">
         <div class="account-edit account-edit--first">
             <div class="account-edit__section">
                 <h2 class="account-edit__section-title">
@@ -66,10 +66,8 @@
                 </div>
             </div>
         </div>
-    </div>
 
-    <div class="osu-page" id="avatar">
-        <div class="account-edit">
+        <div class="account-edit" id="avatar">
             <div class="account-edit__section">
                 <h2 class="account-edit__section-title">
                     {{ osu_trans('accounts.edit.avatar.title') }}
@@ -132,45 +130,25 @@ class="js-account-edit-avatar__button fileupload"
                 </div>
             </div>
         </div>
-    </div>
 
-    <div class="osu-page">
         @include('accounts._edit_signature')
-    </div>
 
-    <div class="osu-page">
         @include('accounts._edit_playstyles')
-    </div>
 
-    <div class="osu-page">
         @include('accounts._edit_privacy')
-    </div>
 
-    <div class="osu-page" id="notifications">
         @include('accounts._edit_notifications')
-    </div>
 
-    <div class="osu-page">
         @include('accounts._edit_options')
-    </div>
 
-    <div class="osu-page">
         @include('accounts._edit_password')
-    </div>
 
-    <div class="osu-page">
         @include('accounts._edit_email')
-    </div>
 
-    <div class="osu-page">
         @include('accounts._edit_sessions')
-    </div>
 
-    <div class="osu-page" id="oauth">
         @include('accounts._edit_oauth')
-    </div>
 
-    <div class="osu-page" id="legacy-api">
         @include('accounts._edit_legacy_api')
     </div>
 @endsection
diff --git a/resources/views/artists/index.blade.php b/resources/views/artists/index.blade.php
index 823dc52aac6..ed6480bad58 100644
--- a/resources/views/artists/index.blade.php
+++ b/resources/views/artists/index.blade.php
@@ -21,7 +21,7 @@
         ],
         'theme' => 'artists',
     ]])
-    <div class="osu-page osu-page--artists">
+    <div class="osu-page">
         <div class="page-contents page-contents--artist">
             <div class="page-contents__artist-left">
                 <div class="artist__description artist__description--index">{!! osu_trans('artist.index.description') !!}</div>
diff --git a/resources/views/home/landing.blade.php b/resources/views/home/landing.blade.php
index 1b25808a244..561301a868f 100644
--- a/resources/views/home/landing.blade.php
+++ b/resources/views/home/landing.blade.php
@@ -126,19 +126,17 @@ class="landing-hero__bg"
     </div>
 
     <footer class="osu-layout__section osu-layout__section--landing-footer">
-        <div class="osu-layout__row osu-layout__row--landing-sitemap landing-sitemap">
-            <div class="osu-layout__col-container osu-layout__col-container--landing-sitemap">
+        <div class="osu-layout__row osu-layout__row--landing-sitemap">
+            <div class="landing-sitemap">
                 @foreach (footer_landing_links() as $section => $links)
-                    <div class="osu-layout__col osu-layout__col--sm-4">
-                        <ul class="landing-sitemap__list">
-                            <li class="landing-sitemap__item">
-                                <div class="landing-sitemap__header">{{ osu_trans("layout.footer.$section._") }}</div>
-                            </li>
-                            @foreach ($links as $action => $link)
-                                <li class="landing-sitemap__item"><a href="{{ $link }}" class="landing-sitemap__link">{{ osu_trans("layout.footer.$section.$action") }}</a></li>
-                            @endforeach
-                        </ul>
-                    </div>
+                    <ul class="landing-sitemap__list">
+                        <li class="landing-sitemap__item">
+                            <div class="landing-sitemap__header">{{ osu_trans("layout.footer.$section._") }}</div>
+                        </li>
+                        @foreach ($links as $action => $link)
+                            <li class="landing-sitemap__item"><a href="{{ $link }}" class="landing-sitemap__link">{{ osu_trans("layout.footer.$section.$action") }}</a></li>
+                        @endforeach
+                    </ul>
                 @endforeach
             </div>
         </div>
diff --git a/resources/views/master.blade.php b/resources/views/master.blade.php
index 74f861ef10d..b7f4df18910 100644
--- a/resources/views/master.blade.php
+++ b/resources/views/master.blade.php
@@ -53,7 +53,6 @@ class="
             osu-layout
             osu-layout--body
             t-section
-            action-{{ $currentAction }}
             {{ $bodyAdditionalClasses ?? '' }}
         "
     >
@@ -90,7 +89,7 @@ class="osu-page osu-page--notification-banners js-notification-banners js-sync-h
                 @stack('notification_banners')
             </div>
         @endif
-        <div class="osu-layout__section osu-layout__section--full js-content {{ $currentSection }}_{{ $currentAction }}">
+        <div class="osu-layout__section osu-layout__section--full">
             @yield('content')
         </div>
         @if (!isset($blank))