diff --git a/website/client/src/components/header/userDropdown.vue b/website/client/src/components/header/userDropdown.vue
index c3a697ce81..20629daf95 100644
--- a/website/client/src/components/header/userDropdown.vue
+++ b/website/client/src/components/header/userDropdown.vue
@@ -56,7 +56,7 @@
       >{{ $t('achievements') }}</a>
       <router-link
         class="topbar-dropdown-item dropdown-item"
-        :to="{name: 'site'}"
+        :to="{name: 'general'}"
       >
         {{ $t('settings') }}
       </router-link>
diff --git a/website/client/src/components/settings/index.vue b/website/client/src/components/settings/index.vue
index b37be458e0..efe73ebb8b 100644
--- a/website/client/src/components/settings/index.vue
+++ b/website/client/src/components/settings/index.vue
@@ -3,11 +3,11 @@
     <secondary-menu class="col-12">
       <router-link
         class="nav-link"
-        :to="{name: 'site'}"
+        :to="{name: 'siteData'}"
         exact="exact"
-        :class="{'active': $route.name === 'site'}"
+        :class="{'active': $route.name === 'siteData'}"
       >
-        {{ $t('site') }}
+        {{ $t('siteData') }}
       </router-link>
       <router-link
         class="nav-link"
diff --git a/website/client/src/pages/settings/generalSettings.vue b/website/client/src/pages/settings/generalSettings.vue
index b80b56c622..f667834b04 100644
--- a/website/client/src/pages/settings/generalSettings.vue
+++ b/website/client/src/pages/settings/generalSettings.vue
@@ -118,21 +118,21 @@
 
 <script>
 import notificationsMixin from '../../mixins/notifications';
-import UserNameSetting from './inlineSettings/userNameSetting';
-import UserEmailSetting from './inlineSettings/userEmailSetting';
-import DisplayNameSetting from './inlineSettings/displayNameSetting';
-import PasswordSetting from './inlineSettings/passwordSetting';
-import ResetAccount from './inlineSettings/resetAccount';
-import DeleteAccount from './inlineSettings/deleteAccount';
+import UserNameSetting from './settingRows/userNameSetting';
+import UserEmailSetting from './settingRows/userEmailSetting';
+import DisplayNameSetting from './settingRows/displayNameSetting';
+import PasswordSetting from './settingRows/passwordSetting';
+import ResetAccount from './settingRows/resetAccount';
+import DeleteAccount from './settingRows/deleteAccount';
 import { sharedInlineSettingStore } from './components/inlineSettingMixin';
-import LanguageSetting from './inlineSettings/languageSetting';
-import DateFormatSetting from './inlineSettings/dateFormatSetting';
-import DayStartAdjustmentSetting from './inlineSettings/dayStartAdjustmentSetting.vue';
-import AudioThemeSetting from '@/pages/settings/inlineSettings/audioThemeSetting.vue';
-import ClassSetting from '@/pages/settings/inlineSettings/classSetting.vue';
-import FixValuesSetting from '@/pages/settings/inlineSettings/fixValuesSetting.vue';
-import LoginMethods from '@/pages/settings/inlineSettings/loginMethods.vue';
-import TaskSettings from '@/pages/settings/inlineSettings/taskSettings.vue';
+import LanguageSetting from './settingRows/languageSetting';
+import DateFormatSetting from './settingRows/dateFormatSetting';
+import DayStartAdjustmentSetting from './settingRows/dayStartAdjustmentSetting.vue';
+import AudioThemeSetting from '@/pages/settings/settingRows/audioThemeSetting.vue';
+import ClassSetting from '@/pages/settings/settingRows/classSetting.vue';
+import FixValuesSetting from '@/pages/settings/settingRows/fixValuesSetting.vue';
+import LoginMethods from '@/pages/settings/settingRows/loginMethods.vue';
+import TaskSettings from '@/pages/settings/settingRows/taskSettings.vue';
 import { GenericUserPreferencesMixin } from '@/pages/settings/components/genericUserPreferencesMixin';
 import { mapState } from '@/libs/store';
 
diff --git a/website/client/src/pages/settings/inlineSettings/audioThemeSetting.vue b/website/client/src/pages/settings/settingRows/audioThemeSetting.vue
similarity index 100%
rename from website/client/src/pages/settings/inlineSettings/audioThemeSetting.vue
rename to website/client/src/pages/settings/settingRows/audioThemeSetting.vue
diff --git a/website/client/src/pages/settings/inlineSettings/classSetting.vue b/website/client/src/pages/settings/settingRows/classSetting.vue
similarity index 100%
rename from website/client/src/pages/settings/inlineSettings/classSetting.vue
rename to website/client/src/pages/settings/settingRows/classSetting.vue
diff --git a/website/client/src/pages/settings/inlineSettings/dateFormatSetting.vue b/website/client/src/pages/settings/settingRows/dateFormatSetting.vue
similarity index 100%
rename from website/client/src/pages/settings/inlineSettings/dateFormatSetting.vue
rename to website/client/src/pages/settings/settingRows/dateFormatSetting.vue
diff --git a/website/client/src/pages/settings/inlineSettings/dayStartAdjustmentSetting.vue b/website/client/src/pages/settings/settingRows/dayStartAdjustmentSetting.vue
similarity index 100%
rename from website/client/src/pages/settings/inlineSettings/dayStartAdjustmentSetting.vue
rename to website/client/src/pages/settings/settingRows/dayStartAdjustmentSetting.vue
diff --git a/website/client/src/pages/settings/inlineSettings/deleteAccount.vue b/website/client/src/pages/settings/settingRows/deleteAccount.vue
similarity index 100%
rename from website/client/src/pages/settings/inlineSettings/deleteAccount.vue
rename to website/client/src/pages/settings/settingRows/deleteAccount.vue
diff --git a/website/client/src/pages/settings/inlineSettings/displayNameSetting.vue b/website/client/src/pages/settings/settingRows/displayNameSetting.vue
similarity index 100%
rename from website/client/src/pages/settings/inlineSettings/displayNameSetting.vue
rename to website/client/src/pages/settings/settingRows/displayNameSetting.vue
diff --git a/website/client/src/pages/settings/inlineSettings/fixValuesSetting.vue b/website/client/src/pages/settings/settingRows/fixValuesSetting.vue
similarity index 100%
rename from website/client/src/pages/settings/inlineSettings/fixValuesSetting.vue
rename to website/client/src/pages/settings/settingRows/fixValuesSetting.vue
diff --git a/website/client/src/pages/settings/inlineSettings/headerSettings.vue b/website/client/src/pages/settings/settingRows/headerSettings.vue
similarity index 100%
rename from website/client/src/pages/settings/inlineSettings/headerSettings.vue
rename to website/client/src/pages/settings/settingRows/headerSettings.vue
diff --git a/website/client/src/pages/settings/inlineSettings/languageSetting.vue b/website/client/src/pages/settings/settingRows/languageSetting.vue
similarity index 100%
rename from website/client/src/pages/settings/inlineSettings/languageSetting.vue
rename to website/client/src/pages/settings/settingRows/languageSetting.vue
diff --git a/website/client/src/pages/settings/inlineSettings/loginMethods.vue b/website/client/src/pages/settings/settingRows/loginMethods.vue
similarity index 100%
rename from website/client/src/pages/settings/inlineSettings/loginMethods.vue
rename to website/client/src/pages/settings/settingRows/loginMethods.vue
diff --git a/website/client/src/pages/settings/inlineSettings/passwordSetting.vue b/website/client/src/pages/settings/settingRows/passwordSetting.vue
similarity index 100%
rename from website/client/src/pages/settings/inlineSettings/passwordSetting.vue
rename to website/client/src/pages/settings/settingRows/passwordSetting.vue
diff --git a/website/client/src/pages/settings/inlineSettings/resetAccount.vue b/website/client/src/pages/settings/settingRows/resetAccount.vue
similarity index 100%
rename from website/client/src/pages/settings/inlineSettings/resetAccount.vue
rename to website/client/src/pages/settings/settingRows/resetAccount.vue
diff --git a/website/client/src/pages/settings/inlineSettings/taskSettings.vue b/website/client/src/pages/settings/settingRows/taskSettings.vue
similarity index 100%
rename from website/client/src/pages/settings/inlineSettings/taskSettings.vue
rename to website/client/src/pages/settings/settingRows/taskSettings.vue
diff --git a/website/client/src/pages/settings/inlineSettings/userEmailSetting.vue b/website/client/src/pages/settings/settingRows/userEmailSetting.vue
similarity index 100%
rename from website/client/src/pages/settings/inlineSettings/userEmailSetting.vue
rename to website/client/src/pages/settings/settingRows/userEmailSetting.vue
diff --git a/website/client/src/pages/settings/inlineSettings/userNameSetting.vue b/website/client/src/pages/settings/settingRows/userNameSetting.vue
similarity index 100%
rename from website/client/src/pages/settings/inlineSettings/userNameSetting.vue
rename to website/client/src/pages/settings/settingRows/userNameSetting.vue