diff --git a/src/components/settings_modal/helpers/rate_setting.vue b/src/components/settings_modal/helpers/rate_setting.vue
index 146b22d84..6849ee2c1 100644
--- a/src/components/settings_modal/helpers/rate_setting.vue
+++ b/src/components/settings_modal/helpers/rate_setting.vue
@@ -7,6 +7,12 @@
       class="setting-label"
       :class="{ 'faint': shouldBeDisabled }"
     >
+      <ModifiedIndicator
+        :changed="isChanged"
+        :onclick="reset"
+      />
+      <ProfileSettingIndicator :is-profile="isProfileSetting" />
+      {{ ' ' }}
       <template v-if="backendDescriptionLabel">
         {{ backendDescriptionLabel + ' ' }}
       </template>
@@ -22,82 +28,98 @@
     >
       {{ backendDescriptionDescription + ' ' }}
     </p>
-    <table>
-      <tr>
-        <th>&nbsp;</th>
-        <th>
-          {{ $t('admin_dash.rate_limit.period') }}
-        </th>
-        <th>
-          {{ $t('admin_dash.rate_limit.amount') }}
-        </th>
-      </tr>
-      <tr>
-        <td v-if="isSeparate">
-          {{ $t('admin_dash.rate_limit.unauthenticated') }}
-        </td>
-        <td v-else>
-          {{ $t('admin_dash.rate_limit.rate_limit') }}
-        </td>
-        <td>
-          <input
-            class="input string-input"
-            type="number"
-            :value="normalizedState[0][0]"
-            @change="e => update({ event: e, index: 0, side: 0, eventType: 'edit' })"
-          >
-        </td>
-        <td>
-          <input
-            class="input string-input"
-            type="number"
-            :value="normalizedState[0][1]"
-            @change="e => update({ event: e, index: 1, side: 0, eventType: 'edit' })"
-          >
-        </td>
-      </tr>
-      <tr v-if="isSeparate">
-        <td>
-          {{ $t('admin_dash.rate_limit.authenticated') }}
-        </td>
-        <td>
-          <input
-            class="input string-input"
-            type="number"
-            :value="normalizedState[1][0]"
-            @change="e => update({ event: e, index: 0, side: 1, eventType: 'edit' })"
-          >
-        </td>
-        <td>
-          <input
-            class="input string-input"
-            type="number"
-            :value="normalizedState[1][1]"
-            @change="e => update({ event: e, index: 1, side: 1, eventType: 'edit' })"
-          >
-        </td>
-      </tr>
-    </table>
-    <Checkbox
-      :model-value="isSeparate"
-      @update:model-value="event => update({ event: event ? 'join' : 'split',  eventType: 'toggleMode' })"
-    >
-      {{ $t('admin_dash.rate_limit.separate') }}
-    </Checkbox>
-    <div>
-    <ModifiedIndicator
-      :changed="isChanged"
-      :onclick="reset"
-    />
-    <ProfileSettingIndicator :is-profile="isProfileSetting" />
-    <DraftButtons />
+    <div class="setting-control">
+      <table>
+        <tr>
+          <th>&nbsp;</th>
+          <th>
+            {{ $t('admin_dash.rate_limit.period') }}
+          </th>
+          <th>
+            {{ $t('admin_dash.rate_limit.amount') }}
+          </th>
+        </tr>
+        <tr>
+          <td v-if="isSeparate">
+            {{ $t('admin_dash.rate_limit.unauthenticated') }}
+          </td>
+          <td v-else>
+            {{ $t('admin_dash.rate_limit.rate_limit') }}
+          </td>
+          <td>
+            <input
+              class="input string-input"
+              type="number"
+              :value="normalizedState[0][0]"
+              @change="e => update({ event: e, index: 0, side: 0, eventType: 'edit' })"
+            >
+          </td>
+          <td>
+            <input
+              class="input string-input"
+              type="number"
+              :value="normalizedState[0][1]"
+              @change="e => update({ event: e, index: 1, side: 0, eventType: 'edit' })"
+            >
+          </td>
+        </tr>
+        <tr v-if="isSeparate">
+          <td>
+            {{ $t('admin_dash.rate_limit.authenticated') }}
+          </td>
+          <td>
+            <input
+              class="input string-input"
+              type="number"
+              :value="normalizedState[1][0]"
+              @change="e => update({ event: e, index: 0, side: 1, eventType: 'edit' })"
+            >
+          </td>
+          <td>
+            <input
+              class="input string-input"
+              type="number"
+              :value="normalizedState[1][1]"
+              @change="e => update({ event: e, index: 1, side: 1, eventType: 'edit' })"
+            >
+          </td>
+        </tr>
+      </table>
+      <Checkbox
+        :model-value="isSeparate"
+        @update:model-value="event => update({ event: event ? 'join' : 'split',  eventType: 'toggleMode' })"
+      >
+        {{ $t('admin_dash.rate_limit.separate') }}
+      </Checkbox>
     </div>
-  </div>
+  <DraftButtons />
+</div>
 </template>
 
 <script src="./rate_setting.js"></script>
 <style lang="scss">
 .RateSetting {
+  &.setting-item {
+    display: grid;
+    grid-template-areas:
+      "label control"
+      "desc control"
+      ". draft";
+
+    .setting-label {
+      text-align: right;
+      align-self: center;
+    }
+
+    .setting-description {
+      text-align: right;
+    }
+
+    .setting-control {
+      align-self: end;
+    }
+  }
+
   table {
     margin-top: 0.5em;
   }
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 1e81e1437..934d5c53f 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -1413,6 +1413,14 @@
           ":oauth_app_creation": {
             "label": "OAuth app creation",
             "description": "For registering new OAuth App ID"
+          },
+          ":ap_routes": {
+            "label": "ActivityPub",
+            "description": "Federation endpoints"
+          },
+          ":account_confirmation_resend": {
+            "label": "Account confirmation resend",
+            "description": "How often user can resend confirmation mail"
           }
         },
         "Pleroma_DOT_Formatter": {