diff --git a/packages/client/components/app/interface/settings/user/Feedback.tsx b/packages/client/components/app/interface/settings/user/Feedback.tsx
index bd79b445..5ab31801 100644
--- a/packages/client/components/app/interface/settings/user/Feedback.tsx
+++ b/packages/client/components/app/interface/settings/user/Feedback.tsx
@@ -1,13 +1,17 @@
+import { useTranslation } from "@revolt/i18n";
 import {
-  BiLogosGithub,
-  BiLogosTrello,
-} from "solid-icons/bi";
-import MdFormatListNumbered from "@material-design-icons/svg/outlined/format_list_numbered.svg?component-solid";
+  CategoryButton,
+  CategoryButtonGroup,
+  Column,
+  iconSize,
+  styled,
+} from "@revolt/ui";
+
 import MdBugReport from "@material-design-icons/svg/outlined/bug_report.svg?component-solid";
 import MdExitToApp from "@material-design-icons/svg/outlined/exit_to_app.svg?component-solid";
-
-import { useTranslation } from "@revolt/i18n";
-import { CategoryButton, CategoryButtonGroup, styled, iconSize, Column } from "@revolt/ui";
+import MdFormatListNumbered from "@material-design-icons/svg/outlined/format_list_numbered.svg?component-solid";
+import MdStar from "@material-design-icons/svg/outlined/star_outline.svg?component-solid";
+import MdViewKanban from "@material-design-icons/svg/outlined/view_kanban.svg?component-solid";
 
 /**
  * Feedback
@@ -18,10 +22,13 @@ export default function Feedback() {
   return (
     <Column gap="lg">
       <CategoryButtonGroup>
-        <Link href="https://trello.com/b/4e2O7tge/roadmap" target="_blank">
+        <Link
+          href="https://github.com/orgs/revoltchat/projects/6/views/4"
+          target="_blank"
+        >
           <CategoryButton
             action="external"
-            icon={<BiLogosTrello size={22} />}
+            icon={<MdViewKanban {...iconSize(22)} />}
             onClick={() => void 0}
             description="See what we're currently working on."
           >
@@ -34,7 +41,7 @@ export default function Feedback() {
         >
           <CategoryButton
             action="external"
-            icon={<BiLogosGithub size={22} />}
+            icon={<MdStar {...iconSize(22)} />}
             onClick={() => void 0}
             description={t("app.settings.pages.feedback.suggest_desc")}
           >
@@ -67,7 +74,6 @@ export default function Feedback() {
             {t("app.settings.pages.feedback.bug")}
           </CategoryButton>
         </Link>
-
       </CategoryButtonGroup>
       <CategoryButtonGroup>
         <CategoryButton
diff --git a/packages/client/components/app/interface/settings/user/Language.tsx b/packages/client/components/app/interface/settings/user/Language.tsx
index 1b5b0893..a4736c74 100644
--- a/packages/client/components/app/interface/settings/user/Language.tsx
+++ b/packages/client/components/app/interface/settings/user/Language.tsx
@@ -38,12 +38,12 @@ export default function Language() {
     <Column gap="lg">
       <CategoryButtonGroup>
         <PickLanguage />
-        <ConfigureRTL />
+        {/* <ConfigureRTL /> */}
       </CategoryButtonGroup>
-      <CategoryButtonGroup>
+      {/* <CategoryButtonGroup>
         <PickDateFormat />
         <PickTimeFormat />
-      </CategoryButtonGroup>
+      </CategoryButtonGroup> */}
       <CategoryButtonGroup>
         <ContributeLanguageLink />
       </CategoryButtonGroup>
diff --git a/packages/client/components/app/interface/settings/user/bots/MyBots.tsx b/packages/client/components/app/interface/settings/user/bots/MyBots.tsx
index f37650d0..03f53928 100644
--- a/packages/client/components/app/interface/settings/user/bots/MyBots.tsx
+++ b/packages/client/components/app/interface/settings/user/bots/MyBots.tsx
@@ -1,15 +1,4 @@
-import {
-  ErrorBoundary,
-  For,
-  Match,
-  Show,
-  Suspense,
-  Switch,
-  createSignal,
-  onMount,
-} from "solid-js";
-
-import { Bot } from "revolt.js";
+import { ErrorBoundary, For, Suspense } from "solid-js";
 
 import { useClient } from "@revolt/client";
 import { createOwnBotsResource } from "@revolt/client/resources";
@@ -91,12 +80,18 @@ function ListBots() {
           <For each={bots.data}>
             {(bot) => (
               <CategoryButton
-                icon={<Avatar src={bot.user!.animatedAvatarURL} size={24} />}
-                description={bot.id}
+                icon={
+                  <Avatar
+                    src={bot.user!.animatedAvatarURL}
+                    size={24}
+                    fallback={bot.user!.displayName}
+                  />
+                }
                 onClick={() => navigate(`bots/${bot.id}`)}
                 action="chevron"
+                // description={bot.id}
               >
-                {bot.user!.username}
+                {bot.user!.displayName}
               </CategoryButton>
             )}
           </For>
diff --git a/packages/client/components/app/interface/settings/user/index.tsx b/packages/client/components/app/interface/settings/user/index.tsx
index 78510a57..798e6397 100644
--- a/packages/client/components/app/interface/settings/user/index.tsx
+++ b/packages/client/components/app/interface/settings/user/index.tsx
@@ -60,13 +60,14 @@ import sessions from "./Sessions";
 import sync from "./Sync";
 import { AccountCard } from "./_AccountCard";
 import { MyBots, ViewBot } from "./bots";
+import { EditProfile } from "./profile";
 
 /**
  * All the available routes for client settings
  */
 const ClientSettingsRouting: Record<string, Component> = {
   account,
-  profile: () => null,
+  profile: EditProfile,
   sessions,
 
   // Bots
@@ -196,55 +197,55 @@ const Config: SettingsConfiguration<{ server: Server }> = {
         {
           title: t("app.settings.categories.client_settings"),
           entries: [
-            {
-              id: "audio",
-              icon: <MdSpeaker {...iconSize(20)} />,
-              title: t("app.settings.pages.audio.title"),
-              hidden:
-                !getController("state").experiments.isEnabled("voice_chat"),
-            },
-            {
-              id: "appearance",
-              icon: <MdPalette {...iconSize(20)} />,
-              title: t("app.settings.pages.appearance.title"),
-            },
-            {
-              id: "accessibility",
-              icon: <MdAccessibility {...iconSize(20)} />,
-              title: t("app.settings.pages.accessibility.title"),
-            },
-            {
-              id: "plugins",
-              icon: <MdExtension {...iconSize(20)} />,
-              title: t("app.settings.pages.plugins.title"),
-              hidden: !getController("state").experiments.isEnabled("plugins"),
-            },
-            {
-              id: "notifications",
-              icon: <MdNotifications {...iconSize(20)} />,
-              title: t("app.settings.pages.notifications.title"),
-            },
-            {
-              id: "keybinds",
-              icon: <MdKeybinds {...iconSize(20)} />,
-              title: t("app.settings.pages.keybinds.title"),
-            },
+            // {
+            //   id: "audio",
+            //   icon: <MdSpeaker {...iconSize(20)} />,
+            //   title: t("app.settings.pages.audio.title"),
+            //   hidden:
+            //     !getController("state").experiments.isEnabled("voice_chat"),
+            // },
+            // {
+            //   id: "appearance",
+            //   icon: <MdPalette {...iconSize(20)} />,
+            //   title: t("app.settings.pages.appearance.title"),
+            // },
+            // {
+            //   id: "accessibility",
+            //   icon: <MdAccessibility {...iconSize(20)} />,
+            //   title: t("app.settings.pages.accessibility.title"),
+            // },
+            // {
+            //   id: "plugins",
+            //   icon: <MdExtension {...iconSize(20)} />,
+            //   title: t("app.settings.pages.plugins.title"),
+            //   hidden: !getController("state").experiments.isEnabled("plugins"),
+            // },
+            // {
+            //   id: "notifications",
+            //   icon: <MdNotifications {...iconSize(20)} />,
+            //   title: t("app.settings.pages.notifications.title"),
+            // },
+            // {
+            //   id: "keybinds",
+            //   icon: <MdKeybinds {...iconSize(20)} />,
+            //   title: t("app.settings.pages.keybinds.title"),
+            // },
             {
               id: "language",
               icon: <MdLanguage {...iconSize(20)} />,
               title: t("app.settings.pages.language.title"),
             },
-            {
-              id: "sync",
-              icon: <MdSync {...iconSize(20)} />,
-              title: t("app.settings.pages.sync.title"),
-            },
-            {
-              id: "native",
-              hidden: false,
-              icon: <MdDesktopWindows {...iconSize(20)} />,
-              title: t("app.settings.pages.native.title"),
-            },
+            // {
+            //   id: "sync",
+            //   icon: <MdSync {...iconSize(20)} />,
+            //   title: t("app.settings.pages.sync.title"),
+            // },
+            // {
+            //   id: "native",
+            //   hidden: false,
+            //   icon: <MdDesktopWindows {...iconSize(20)} />,
+            //   title: t("app.settings.pages.native.title"),
+            // },
             {
               id: "experiments",
               icon: <MdScience {...iconSize(20)} />,
@@ -254,12 +255,12 @@ const Config: SettingsConfiguration<{ server: Server }> = {
         },
         {
           entries: [
-            {
-              onClick: () =>
-                getController("modal").push({ type: "changelog", posts: [] }),
-              icon: <MdFormatListBulleted {...iconSize(20)} />,
-              title: t("app.special.modals.changelogs.title"),
-            },
+            // {
+            //   onClick: () =>
+            //     getController("modal").push({ type: "changelog", posts: [] }),
+            //   icon: <MdFormatListBulleted {...iconSize(20)} />,
+            //   title: t("app.special.modals.changelogs.title"),
+            // },
             {
               href: "https://github.com/revoltchat",
               icon: <MdMemory {...iconSize(20)} />,