diff --git a/src/components/settings_modal/admin_tabs/emoji_tab.scss b/src/components/settings_modal/admin_tabs/emoji_tab.scss
index fd5b53caa..2f3b5aa40 100644
--- a/src/components/settings_modal/admin_tabs/emoji_tab.scss
+++ b/src/components/settings_modal/admin_tabs/emoji_tab.scss
@@ -3,11 +3,6 @@
     margin: 0.5em 2em;
   }
 
-  .setting-section {
-    margin-left: 0.5em;
-    margin-right: 0.5em;
-  }
-
   .toolbar {
     display: flex;
     flex-wrap: wrap;
diff --git a/src/components/settings_modal/admin_tabs/frontends_tab.scss b/src/components/settings_modal/admin_tabs/frontends_tab.scss
index e26a1b921..27c1fdc55 100644
--- a/src/components/settings_modal/admin_tabs/frontends_tab.scss
+++ b/src/components/settings_modal/admin_tabs/frontends_tab.scss
@@ -1,5 +1,4 @@
 .FrontendsTab {
-  padding: 0 1em;
   .cards-list {
     padding: 0;
   }
@@ -35,8 +34,7 @@
 
   h5 {
     margin: 0;
-    font-size: 1.15em;
-    text-transform: capitalize;
+    font-size: 1.15em
   }
 
   dl {
diff --git a/src/components/settings_modal/admin_tabs/users_tab.scss b/src/components/settings_modal/admin_tabs/users_tab.scss
index d5c9b3ab5..70237c189 100644
--- a/src/components/settings_modal/admin_tabs/users_tab.scss
+++ b/src/components/settings_modal/admin_tabs/users_tab.scss
@@ -2,26 +2,14 @@
   max-height: 100%;
   display: flex;
   flex-direction: column;
-  padding: 0;
-
-  h3 {
-    margin-left: 0.5em;
-    margin-right: 0.5em;
-  }
-
-  .splitter {
-    max-height: 100%;
-    display: flex;
-    overflow-y: hidden;
-  }
+  overflow-y: hidden;
 
   .filters-section {
-    display: flex;
-    flex-direction: column;
-    gap: 1em;
-    border-right: 1px solid var(--border);
-    padding: 0 1em;
-    margin-right: 1em;
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(15em, 1fr));
+    grid-auto-columns: 1fr;
+    grid-auto-flow: row;
+    gap: 0.5em 1em;
 
     > div {
       flex: 0 1 auto;
@@ -29,6 +17,7 @@
 
     .filter {
       display: block;
+      margin-bottom: 0.5em;
       min-width: 14em;
 
       .query-label {
@@ -40,8 +29,4 @@
       }
     }
   }
-
-  .users-list {
-    flex: 1 0 30em;
-  }
 }
diff --git a/src/components/settings_modal/admin_tabs/users_tab.vue b/src/components/settings_modal/admin_tabs/users_tab.vue
index 4ac4cdd08..fcc9e9df1 100644
--- a/src/components/settings_modal/admin_tabs/users_tab.vue
+++ b/src/components/settings_modal/admin_tabs/users_tab.vue
@@ -6,143 +6,140 @@
     <h3>
       {{ $t('admin_dash.users.title') }}
     </h3>
-    <div class="splitter">
-      <div class="filters-section">
-        <label class="filter">
-          <div class="query-label">
-            {{ $t('admin_dash.users.labels.nickname') }}
-          </div>
-          <input
-            v-model="filtersQuery"
-            class="input string-input filter-input"
-          >
-        </label>
-        <label class="filter">
-          <div class="query-label">
-            {{ $t('admin_dash.users.labels.name') }}
-          </div>
-          <input
-            v-model="filtersName"
-            class="input string-input filter-input"
-          >
-        </label>
-        <label class="filter">
-          <div class="query-label">
-            {{ $t('admin_dash.users.labels.email') }}
-          </div>
-          <input
-            v-model="filtersEmail"
-            class="input string-input filter-input"
-          >
-        </label>
-        <div class="filter">
-          <div class="query-label">
-            {{ $t('admin_dash.users.labels.origin') }}
-          </div>
-          <Select
-            v-model="filtersOrigin"
-          >
-            <option
-              value="all"
-            >
-              {{ $t('admin_dash.users.options.all') }}
-            </option>
-            <option
-              value="local"
-            >
-              {{ $t('admin_dash.users.options.only_local') }}
-            </option>
-            <option
-              value="external"
-            >
-              {{ $t('admin_dash.users.options.only_external') }}
-            </option>
-          </Select>
+    <div class="filters-section">
+      <label class="filter">
+        <div class="query-label">
+          {{ $t('admin_dash.users.labels.query') }}
         </div>
-        <div class="filter">
-          <div class="query-label">
-            {{ $t('admin_dash.users.labels.activity') }}
-          </div>
-          <Select
-            v-model="filtersActivity"
+        <input
+          v-model="filtersQuery"
+          class="input string-input filter-input"
+        >
+      </label>
+      <label class="filter">
+        <div class="query-label">
+          {{ $t('admin_dash.users.labels.name') }}
+        </div>
+        <input
+          v-model="filtersName"
+          class="input string-input filter-input"
+        >
+      </label>
+      <label class="filter">
+        <div class="query-label">
+          {{ $t('admin_dash.users.labels.email') }}
+        </div>
+        <input
+          v-model="filtersEmail"
+          class="input string-input filter-input"
+        >
+      </label>
+      <div class="filter">
+        <div class="query-label">
+          {{ $t('admin_dash.users.labels.origin') }}
+        </div>
+        <Select
+          v-model="filtersOrigin"
+        >
+          <option
+            value="all"
           >
-            <option
-              value="all"
-            >
-              {{ $t('admin_dash.users.options.all') }}
-            </option>
-            <option
-              value="active"
-            >
-              {{ $t('admin_dash.users.options.only_active') }}
-            </option>
-            <option
-              value="deactivated"
-            >
-              {{ $t('admin_dash.users.options.only_deactivated') }}
-            </option>
-          </Select>
-        </div>
-        <div class="filter">
-          <div class="query-label">
-            {{ $t('admin_dash.users.labels.privileges') }}
-          </div>
-          <Select v-model="filtersPrivileges">
-            <option
-              value="all"
-            >
-              {{ $t('admin_dash.users.options.all') }}
-            </option>
-            <option
-              value="admin"
-            >
-              {{ $t('admin_dash.users.options.only_admins') }}
-            </option>
-            <option
-              value="modsnadmins"
-            >
-              {{ $t('admin_dash.users.options.only_privileged') }}
-            </option>
-            <option
-              value="moderator"
-            >
-              {{ $t('admin_dash.users.options.only_moderators') }}
-            </option>
-          </Select>
-        </div>
-        <div class="filter">
-          <Checkbox v-model="filtersNeedApproval">
-            {{ $t('admin_dash.users.options.only_unapproved') }}
-          </Checkbox>
-        </div>
-        <div class="filter">
-          <Checkbox v-model="filtersUnconfirmed">
-            {{ $t('admin_dash.users.options.only_unconfirmed') }}
-          </Checkbox>
-        </div>
+            {{ $t('admin_dash.users.options.all') }}
+          </option>
+          <option
+            value="local"
+          >
+            {{ $t('admin_dash.users.options.only_local') }}
+          </option>
+          <option
+            value="external"
+          >
+            {{ $t('admin_dash.users.options.only_external') }}
+          </option>
+        </Select>
+      </div>
+      <div class="filter">
+        <div class="query-label">
+          {{ $t('admin_dash.users.labels.activity') }}
+        </div>
+        <Select
+          v-model="filtersActivity"
+        >
+          <option
+            value="all"
+          >
+            {{ $t('admin_dash.users.options.all') }}
+          </option>
+          <option
+            value="active"
+          >
+            {{ $t('admin_dash.users.options.only_active') }}
+          </option>
+          <option
+            value="deactivated"
+          >
+            {{ $t('admin_dash.users.options.only_deactivated') }}
+          </option>
+        </Select>
+      </div>
+      <div class="filter">
+        <div class="query-label">
+          {{ $t('admin_dash.users.labels.privileges') }}
+        </div>
+        <Select v-model="filtersPrivileges">
+          <option
+            value="all"
+          >
+            {{ $t('admin_dash.users.options.all') }}
+          </option>
+          <option
+            value="admin"
+          >
+            {{ $t('admin_dash.users.options.only_admins') }}
+          </option>
+          <option
+            value="modsnadmins"
+          >
+            {{ $t('admin_dash.users.options.only_privileged') }}
+          </option>
+          <option
+            value="moderator"
+          >
+            {{ $t('admin_dash.users.options.only_moderators') }}
+          </option>
+        </Select>
+      </div>
+      <div class="filter">
+        <Checkbox v-model="filtersNeedApproval">
+          {{ $t('admin_dash.users.options.only_unapproved') }}
+        </Checkbox>
+      </div>
+      <div class="filter">
+        <Checkbox v-model="filtersUnconfirmed">
+          {{ $t('admin_dash.users.options.only_unconfirmed') }}
+        </Checkbox>
       </div>
-      <List
-        ref="usersList"
-        class="users-list"
-        :fetch-function="fetchUsers"
-        selectable
-        scrollable
-        @select="onSelect"
-      >
-        <template #header="{selected}">
-          <ModerationTools :users="selected" />
-        </template>
-        <template #item="{item}">
-          <AdminUserCard :user-id="item.id" />
-        </template>
-        <template #load>
-          <span> loading </span>
-        </template>
-        <template #empty>
-          <span> no users </span>
-        </template>
-      </List>
     </div>
+    <List
+      ref="usersList"
+      :fetch-function="fetchUsers"
+      selectable
+      scrollable
+      @select="onSelect"
+    >
+      <template #header="{selected}">
+        <ModerationTools :users="selected" />
+      </template>
+      <template #item="{item}">
+        <AdminUserCard :user-id="item.id" />
+      </template>
+      <template #load>
+        <span> loading </span>
+      </template>
+      <template #empty>
+        <span> no users </span>
+      </template>
+    </List>
   </div>
 </template>
 <script src="./users_tab.js"></script>
diff --git a/src/components/settings_modal/helpers/vertical_tab_switcher.jsx b/src/components/settings_modal/helpers/vertical_tab_switcher.jsx
index cbe1be158..e407d29e5 100644
--- a/src/components/settings_modal/helpers/vertical_tab_switcher.jsx
+++ b/src/components/settings_modal/helpers/vertical_tab_switcher.jsx
@@ -160,25 +160,19 @@ export default {
         'tab-content-wrapper',
         active ? '-active' : '-hidden',
       ]
-      const slotWrapperClasses = [
-        'tab-slot-wrapper',
-        active ? '-active' : '-hidden',
-      ]
       const contentClasses = ['tab-content']
-      if (props['full-width'] || props['full-width'] != null) {
+      if (props['full-width'] || props['full-width'] === '') {
         contentClasses.push('-full-width')
         wrapperClasses.push('-full-width')
-        slotWrapperClasses.push('-full-width')
       }
-      if (props['full-height'] || props['full-width'] != null) {
+      if (props['full-height'] || props['full-width'] === '') {
         contentClasses.push('-full-height')
         wrapperClasses.push('-full-height')
-        slotWrapperClasses.push('-full-height')
       }
       return (
         <div class={wrapperClasses}>
           <div class="tab-mobile-header">{header}</div>
-          <div class={slotWrapperClasses}>
+          <div class="tab-slot-wrapper">
             <div class={contentClasses}>{renderSlot}</div>
           </div>
         </div>
diff --git a/src/components/settings_modal/helpers/vertical_tab_switcher.scss b/src/components/settings_modal/helpers/vertical_tab_switcher.scss
index 3fff96688..8db960914 100644
--- a/src/components/settings_modal/helpers/vertical_tab_switcher.scss
+++ b/src/components/settings_modal/helpers/vertical_tab_switcher.scss
@@ -49,16 +49,6 @@
       grid-template-areas: ". content .";
       flex-direction: column;
 
-      &.-full-width {
-        padding-left: 0;
-        padding-right: 0;
-      }
-
-      &.-full-height {
-        padding-top: 0;
-        padding-bottom: 0;
-      }
-
       .tab-content {
         grid-area: content;
 
@@ -67,8 +57,6 @@
         }
 
         &.-full-height {
-          display: flex;
-          flex-direction: column;
           height: 100%;
 
           > * {
diff --git a/src/i18n/en.json b/src/i18n/en.json
index a5d3aaa08..f54d6ace1 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -1297,8 +1297,7 @@
       "local_id": "Local ID",
       "labels": {
         "query": "Search",
-        "nickname": "@handle",
-        "name": "Display Name",
+        "name": "Name",
         "name_colon": "Name:",
         "email": "Email",
         "email_colon": "Email:",