diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index 7741dfba..a98431a5 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -151,13 +151,7 @@
             {{ $t('settings.play_videos_in_modal') }}
           </BooleanSetting>
         </li>
-        <h3>{{ $t('settings.fun') }}</h3>
-        <li>
-          <BooleanSetting path="greentext">
-            {{ $t('settings.greentext') }}
-          </BooleanSetting>
-        </li>
-        <h3>{{ $t('settings.fork_changes') }}</h3>
+        <h3>{{ $t('settings.conversation_view') }}</h3>
         <li>
           <ChoiceSetting
             id="conversationDisplay"
@@ -194,11 +188,7 @@
             </ChoiceSetting>
           </li>
         </ul>
-        <li>
-          <BooleanSetting path="mentionLinkShowYous">
-            {{ $t('settings.show_yous') }}
-          </BooleanSetting>
-        </li>
+        <h3>{{ $t('settings.mentions') }}</h3>
         <li>
           <ChoiceSetting
             id="mentionLinkDisplay"
@@ -239,6 +229,17 @@
             </BooleanSetting>
           </li>
         </ul>
+        <h3>{{ $t('settings.fun') }}</h3>
+        <li>
+          <BooleanSetting path="greentext">
+            {{ $t('settings.greentext') }}
+          </BooleanSetting>
+        </li>
+        <li>
+          <BooleanSetting path="mentionLinkShowYous">
+            {{ $t('settings.show_yous') }}
+          </BooleanSetting>
+        </li>
       </ul>
     </div>
 
diff --git a/src/i18n/en.json b/src/i18n/en.json
index d79f108d..a33bdb51 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -506,7 +506,8 @@
     "mention_link_bolden_you": "Highlight mention of you when you are mentioned",
     "fun": "Fun",
     "greentext": "Meme arrows",
-    "fork_changes": "Fork changes",
+    "conversation_view": "Conversation View",
+    "mentions": "Mentions",
     "show_yous": "Show (You)s",
     "notifications": "Notifications",
     "notification_setting_filters": "Filters",