diff --git a/.prettierignore b/.prettierignore
index e65005c6..5437647c 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -4,5 +4,5 @@ node_modules
 .turbo
 .next
 .docusaurus
-packages/shared-db/migrations
 apps/app/src/routeTree.gen.ts
+packages/shared-db/migrations
diff --git a/apps/app/src/components/feed/EditFeedActions.tsx b/apps/app/src/components/feed/EditFeedActions.tsx
new file mode 100644
index 00000000..603f91af
--- /dev/null
+++ b/apps/app/src/components/feed/EditFeedActions.tsx
@@ -0,0 +1,60 @@
+import type { FeedConfig } from "@curatedotfun/types";
+import { Button } from "../ui/button";
+import { Loading } from "../ui/loading";
+
+interface EditFeedActionsProps {
+  currentConfig: FeedConfig | null;
+  onSaveChanges: () => Promise<void>;
+  onDeleteFeed: () => Promise<void>;
+  updateFeedMutation: {
+    isPending: boolean;
+  };
+  deleteFeedMutation: {
+    isPending: boolean;
+  };
+}
+
+export function EditFeedActions({
+  onSaveChanges,
+  onDeleteFeed,
+  updateFeedMutation,
+  deleteFeedMutation,
+}: EditFeedActionsProps) {
+  return (
+    <div className="bg-white p-6 border border-gray-200 rounded-lg">
+      <div className="flex flex-col sm:flex-row gap-4 pt-2">
+        <Button
+          onClick={onSaveChanges}
+          disabled={updateFeedMutation.isPending}
+          className="flex-1 sm:flex-none"
+          size="lg"
+        >
+          {updateFeedMutation.isPending ? (
+            <>
+              <Loading />
+              <span className="ml-2">Saving...</span>
+            </>
+          ) : (
+            "Save Changes"
+          )}
+        </Button>
+        <Button
+          variant="destructive"
+          onClick={onDeleteFeed}
+          disabled={deleteFeedMutation.isPending}
+          className="flex-1 sm:flex-none"
+          size="lg"
+        >
+          {deleteFeedMutation.isPending ? (
+            <>
+              <Loading />
+              <span className="ml-2">Deleting...</span>
+            </>
+          ) : (
+            "Delete Feed"
+          )}
+        </Button>
+      </div>
+    </div>
+  );
+}
diff --git a/apps/app/src/components/feed/EditFeedConfigSection.tsx b/apps/app/src/components/feed/EditFeedConfigSection.tsx
new file mode 100644
index 00000000..b9c21a3f
--- /dev/null
+++ b/apps/app/src/components/feed/EditFeedConfigSection.tsx
@@ -0,0 +1,96 @@
+import type { FeedConfig } from "@curatedotfun/types";
+import { useState, useRef } from "react";
+import { JsonEditor } from "../content-progress/JsonEditor";
+import { Button } from "../ui/button";
+import { Label } from "../ui/label";
+import { EditFeedForm, type EditFeedFormRef } from "./EditFeedForm";
+import { toast } from "@/hooks/use-toast";
+
+interface EditFeedConfigSectionProps {
+  jsonString: string;
+  currentConfig: FeedConfig | null;
+  onJsonChange: (newJsonString: string) => void;
+  onConfigChange: (config: FeedConfig) => void;
+}
+
+export function EditFeedConfigSection({
+  jsonString,
+  currentConfig,
+  onJsonChange,
+  onConfigChange,
+}: EditFeedConfigSectionProps) {
+  const [isJsonMode, setIsJsonMode] = useState(false);
+  const formRef = useRef<EditFeedFormRef>(null);
+
+  const handleConfigChange = (config: FeedConfig) => {
+    onConfigChange(config);
+    try {
+      onJsonChange(JSON.stringify(config, null, 2));
+    } catch (error) {
+      console.error("Failed to stringify config:", error);
+      toast({
+        title: "Error",
+        description:
+          "Failed to update JSON configuration. Please check the console for details.",
+        variant: "destructive",
+      });
+    }
+  };
+
+  const handleSwitchToFormMode = () => {
+    setIsJsonMode(false);
+    // Trigger form update after switching to form mode
+    setTimeout(() => {
+      formRef.current?.updateFromConfig();
+    }, 0);
+  };
+
+  return (
+    <div className="bg-white p-6 border border-gray-200 rounded-lg">
+      <div className="space-y-6">
+        <div className="flex items-center justify-between">
+          <div className="space-y-2">
+            <h2 className="text-xl font-semibold">Feed Configuration</h2>
+            <p className="text-gray-600">
+              {isJsonMode
+                ? "Edit the JSON configuration directly to fine-tune your feed settings"
+                : "Use the form below to easily configure your feed settings"}
+            </p>
+          </div>
+          <div className="flex gap-2">
+            <Button
+              variant={!isJsonMode ? "default" : "outline"}
+              size="sm"
+              onClick={handleSwitchToFormMode}
+            >
+              Form View
+            </Button>
+            <Button
+              variant={isJsonMode ? "default" : "outline"}
+              size="sm"
+              onClick={() => setIsJsonMode(true)}
+            >
+              JSON View
+            </Button>
+          </div>
+        </div>
+
+        {isJsonMode ? (
+          <div className="space-y-2">
+            <Label>Feed Configuration (JSON)</Label>
+            <JsonEditor
+              jsonContent={jsonString}
+              onContentChange={onJsonChange}
+            />
+          </div>
+        ) : (
+          <EditFeedForm
+            ref={formRef}
+            currentConfig={currentConfig}
+            onConfigChange={handleConfigChange}
+          />
+        )}
+      </div>
+    </div>
+  );
+}
diff --git a/apps/app/src/components/feed/EditFeedForm.tsx b/apps/app/src/components/feed/EditFeedForm.tsx
new file mode 100644
index 00000000..7062e997
--- /dev/null
+++ b/apps/app/src/components/feed/EditFeedForm.tsx
@@ -0,0 +1,364 @@
+import { type FeedConfig } from "@curatedotfun/types";
+import { zodResolver } from "@hookform/resolvers/zod";
+import {
+  useEffect,
+  useState,
+  useCallback,
+  useRef,
+  forwardRef,
+  useImperativeHandle,
+} from "react";
+import { useFieldArray, useForm } from "react-hook-form";
+import { Form } from "../ui/form";
+import {
+  BasicFieldsSection,
+  SourcesSection,
+  StreamSettingsSection,
+  ModerationSection,
+  // IngestionSection,
+  FeedConfigFormSchema,
+  type FormValues,
+} from "./form";
+
+interface EditFeedFormProps {
+  currentConfig: FeedConfig | null;
+  onConfigChange: (config: FeedConfig) => void;
+}
+
+export interface EditFeedFormRef {
+  updateFromConfig: () => void;
+}
+
+export const EditFeedForm = forwardRef<EditFeedFormRef, EditFeedFormProps>(
+  function EditFeedForm({ currentConfig, onConfigChange }, ref) {
+    const form = useForm<FormValues>({
+      resolver: zodResolver(FeedConfigFormSchema),
+      defaultValues: {
+        name: "",
+        description: "",
+        enabled: true,
+        pollingIntervalMs: undefined,
+        ingestionEnabled: false,
+        ingestionSchedule: "",
+        sources: [],
+        streamEnabled: false,
+        streamTransforms: [],
+        streamDistributors: [],
+        recaps: [],
+        moderationApprovers: {},
+        moderationBlacklist: {},
+      },
+    });
+
+    // Track when form should update from config changes
+    const isUpdatingFromForm = useRef(false);
+
+    // Function to update form from config
+    const updateFormFromConfig = useCallback(
+      (config: FeedConfig) => {
+        if (isUpdatingFromForm.current) return;
+
+        form.reset({
+          name: config.name || "",
+          description: config.description || "",
+          enabled: config.enabled ?? true,
+          pollingIntervalMs: config.pollingIntervalMs || undefined,
+          ingestionEnabled: config.ingestion?.enabled ?? false,
+          ingestionSchedule: config.ingestion?.schedule || "",
+          sources: config.sources || [],
+          streamEnabled: config.outputs?.stream?.enabled ?? false,
+          streamTransforms: (config.outputs?.stream?.transform || []).map(
+            (t) => ({
+              ...t,
+              config: t.config || {},
+            }),
+          ),
+          streamDistributors: (config.outputs?.stream?.distribute || []).map(
+            (d) => ({
+              ...d,
+              config: d.config || {},
+            }),
+          ),
+          recaps: config.outputs?.recap || [],
+          moderationApprovers: config.moderation?.approvers || {},
+          moderationBlacklist: config.moderation?.blacklist || {},
+        });
+      },
+      [form],
+    );
+
+    // Update form whenever currentConfig changes
+    useEffect(() => {
+      if (!currentConfig) return;
+      updateFormFromConfig(currentConfig);
+    }, [currentConfig, updateFormFromConfig]);
+
+    const {
+      fields: sourceFields,
+      append: appendSource,
+      remove: removeSource,
+    } = useFieldArray({
+      control: form.control,
+      name: "sources",
+    });
+
+    const {
+      fields: transformFields,
+      append: appendTransform,
+      remove: removeTransform,
+    } = useFieldArray({
+      control: form.control,
+      name: "streamTransforms",
+    });
+
+    const {
+      fields: distributorFields,
+      append: appendDistributor,
+      remove: removeDistributor,
+    } = useFieldArray({
+      control: form.control,
+      name: "streamDistributors",
+    });
+
+    // const {
+    //   fields: recapFields,
+    //   append: appendRecap,
+    //   remove: removeRecap,
+    // } = useFieldArray({
+    //   control: form.control,
+    //   name: "recaps",
+    // });
+
+    // Watch for form changes and auto-update with debouncing
+    const watchedValues = form.watch();
+    const updateTimeoutRef = useRef<NodeJS.Timeout>();
+
+    // Track if form has been initialized to avoid triggering updates during initial load
+    const [isFormInitialized, setIsFormInitialized] = useState(false);
+
+    // Mark form as initialized after first config load
+    useEffect(() => {
+      if (currentConfig && !isFormInitialized) {
+        setIsFormInitialized(true);
+      }
+    }, [currentConfig, isFormInitialized]);
+
+    // Debounced config update function
+    const debouncedUpdateConfig = useCallback(
+      (values: FormValues, config: FeedConfig) => {
+        // Clear any existing timeout
+        if (updateTimeoutRef.current) {
+          clearTimeout(updateTimeoutRef.current);
+        }
+
+        // Set a new timeout
+        updateTimeoutRef.current = setTimeout(() => {
+          // Start with the original config and only update fields that have been explicitly set in the form
+          const updatedConfig: FeedConfig = {
+            ...config, // Preserve all existing data first
+          };
+
+          // Only update fields that have been explicitly changed in the form
+          if (values.name !== undefined && values.name !== config.name) {
+            updatedConfig.name = values.name;
+          }
+
+          if (
+            values.description !== undefined &&
+            values.description !== config.description
+          ) {
+            updatedConfig.description = values.description;
+          }
+
+          if (
+            values.enabled !== undefined &&
+            values.enabled !== config.enabled
+          ) {
+            updatedConfig.enabled = values.enabled;
+          }
+
+          if (
+            values.pollingIntervalMs !== undefined &&
+            values.pollingIntervalMs !== config.pollingIntervalMs
+          ) {
+            updatedConfig.pollingIntervalMs = values.pollingIntervalMs;
+          }
+
+          // Only update sources if they exist in the form
+          if (
+            values.sources !== undefined &&
+            JSON.stringify(values.sources) !== JSON.stringify(config.sources)
+          ) {
+            updatedConfig.sources = values.sources;
+          }
+
+          // Only update ingestion if form values are different from current
+          if (
+            values.ingestionEnabled !== undefined ||
+            values.ingestionSchedule !== undefined
+          ) {
+            const currentIngestionEnabled = config.ingestion?.enabled ?? false;
+            const currentIngestionSchedule = config.ingestion?.schedule ?? "";
+
+            if (
+              values.ingestionEnabled !== currentIngestionEnabled ||
+              values.ingestionSchedule !== currentIngestionSchedule
+            ) {
+              updatedConfig.ingestion = {
+                enabled: values.ingestionEnabled ?? currentIngestionEnabled,
+                schedule: values.ingestionSchedule ?? currentIngestionSchedule,
+              };
+            }
+          }
+
+          // Handle outputs - only update if stream settings or transforms/distributors have changed
+          if (
+            values.streamEnabled !== undefined ||
+            values.streamTransforms !== undefined ||
+            values.streamDistributors !== undefined ||
+            values.recaps !== undefined
+          ) {
+            const currentStreamEnabled =
+              config.outputs?.stream?.enabled ?? false;
+            const currentTransforms = config.outputs?.stream?.transform ?? [];
+            const currentDistributors =
+              config.outputs?.stream?.distribute ?? [];
+            const currentRecaps = config.outputs?.recap ?? [];
+
+            // Check if stream output settings have changed
+            const streamChanged =
+              values.streamEnabled !== currentStreamEnabled ||
+              JSON.stringify(values.streamTransforms) !==
+                JSON.stringify(currentTransforms) ||
+              JSON.stringify(values.streamDistributors) !==
+                JSON.stringify(currentDistributors);
+
+            const recapsChanged =
+              JSON.stringify(values.recaps) !== JSON.stringify(currentRecaps);
+
+            if (streamChanged || recapsChanged) {
+              updatedConfig.outputs = {
+                ...config.outputs,
+              };
+
+              if (streamChanged) {
+                updatedConfig.outputs.stream = {
+                  ...config.outputs?.stream,
+                  enabled: values.streamEnabled ?? currentStreamEnabled,
+                  transform: values.streamTransforms ?? currentTransforms,
+                  distribute: values.streamDistributors ?? currentDistributors,
+                };
+              }
+
+              if (recapsChanged) {
+                updatedConfig.outputs.recap = values.recaps ?? currentRecaps;
+              }
+            }
+          }
+
+          // Handle moderation - only update if values have changed
+          if (
+            values.moderationApprovers !== undefined ||
+            values.moderationBlacklist !== undefined
+          ) {
+            const currentApprovers = config.moderation?.approvers ?? {};
+            const currentBlacklist = config.moderation?.blacklist ?? {};
+
+            if (
+              JSON.stringify(values.moderationApprovers) !==
+                JSON.stringify(currentApprovers) ||
+              JSON.stringify(values.moderationBlacklist) !==
+                JSON.stringify(currentBlacklist)
+            ) {
+              updatedConfig.moderation = {
+                ...config.moderation,
+                approvers: values.moderationApprovers ?? currentApprovers,
+                blacklist: values.moderationBlacklist ?? currentBlacklist,
+              };
+            }
+          }
+
+          // Only update if the config has actually changed
+          if (JSON.stringify(updatedConfig) !== JSON.stringify(config)) {
+            isUpdatingFromForm.current = true;
+            onConfigChange(updatedConfig);
+            // Reset the flag in the next tick to ensure state updates have propagated
+            Promise.resolve().then(() => {
+              isUpdatingFromForm.current = false;
+            });
+          }
+        }, 300); // 300ms debounce
+      },
+      [onConfigChange],
+    );
+
+    // Update config whenever form values change (but only after form is initialized)
+    useEffect(() => {
+      if (!currentConfig || !isFormInitialized) return;
+      debouncedUpdateConfig(watchedValues, currentConfig);
+    }, [
+      watchedValues,
+      currentConfig,
+      isFormInitialized,
+      debouncedUpdateConfig,
+    ]);
+
+    // Cleanup timeout on unmount
+    useEffect(() => {
+      return () => {
+        if (updateTimeoutRef.current) {
+          clearTimeout(updateTimeoutRef.current);
+        }
+      };
+    }, []);
+
+    // Expose updateFromConfig method to parent component
+    useImperativeHandle(ref, () => ({
+      updateFromConfig: () => {
+        if (currentConfig) {
+          // Force immediate update when switching from JSON to form view
+          updateFormFromConfig(currentConfig);
+        }
+      },
+    }));
+
+    return (
+      <div className="space-y-6">
+        <Form {...form}>
+          <div className="space-y-6">
+            <BasicFieldsSection control={form.control} />
+
+            <SourcesSection
+              control={form.control}
+              sourceFields={sourceFields}
+              appendSource={appendSource}
+              removeSource={removeSource}
+            />
+
+            <StreamSettingsSection
+              control={form.control}
+              transformFields={transformFields}
+              appendTransform={appendTransform}
+              removeTransform={removeTransform}
+              distributorFields={distributorFields}
+              appendDistributor={appendDistributor}
+              removeDistributor={removeDistributor}
+              watch={form.watch}
+            />
+            {/* 
+            <RecapsSection
+              control={form.control}
+              recapFields={recapFields}
+              appendRecap={appendRecap}
+              removeRecap={removeRecap}
+            /> */}
+
+            <ModerationSection control={form.control} />
+
+            {/* <IngestionSection control={form.control} watch={form.watch} /> */}
+          </div>
+        </Form>
+      </div>
+    );
+  },
+);
diff --git a/apps/app/src/components/feed/EditFeedHeader.tsx b/apps/app/src/components/feed/EditFeedHeader.tsx
new file mode 100644
index 00000000..bac812a6
--- /dev/null
+++ b/apps/app/src/components/feed/EditFeedHeader.tsx
@@ -0,0 +1,21 @@
+import type { FeedConfig } from "@curatedotfun/types";
+
+interface EditFeedHeaderProps {
+  feedId: string;
+  currentConfig: FeedConfig | null;
+}
+
+export function EditFeedHeader({ feedId, currentConfig }: EditFeedHeaderProps) {
+  return (
+    <div className="bg-white p-6 border-b">
+      <div className="space-y-2">
+        <h1 className="text-3xl font-bold">
+          Edit Feed: {currentConfig?.name || feedId}
+        </h1>
+        <p className="text-lg text-gray-600">
+          Modify your feed configuration and settings
+        </p>
+      </div>
+    </div>
+  );
+}
diff --git a/apps/app/src/components/feed/EditFeedImageSection.tsx b/apps/app/src/components/feed/EditFeedImageSection.tsx
new file mode 100644
index 00000000..4acf04c9
--- /dev/null
+++ b/apps/app/src/components/feed/EditFeedImageSection.tsx
@@ -0,0 +1,36 @@
+import type { FeedConfig } from "@curatedotfun/types";
+import { ImageUpload } from "../ImageUpload";
+import { toast } from "../../hooks/use-toast";
+
+interface EditFeedImageSectionProps {
+  currentConfig: FeedConfig | null;
+  feedId: string;
+  onImageUploaded: (ipfsHash: string, ipfsUrl: string) => void;
+}
+
+export function EditFeedImageSection({
+  currentConfig,
+  onImageUploaded,
+}: EditFeedImageSectionProps) {
+  const handleImageUploaded = (ipfsHash: string, ipfsUrl: string) => {
+    onImageUploaded(ipfsHash, ipfsUrl);
+    toast({
+      title: "Image Updated",
+      description: "Image URL has been updated in the JSON config.",
+    });
+  };
+
+  return (
+    <div className="bg-white p-6 border border-gray-200 rounded-lg">
+      <div className="space-y-4">
+        <h2 className="text-xl font-semibold">Feed Image</h2>
+        <ImageUpload
+          label="Feed Image"
+          initialImageUrl={currentConfig?.image || null}
+          onUploadSuccess={handleImageUploaded}
+          recommendedText="Update the image for this feed."
+        />
+      </div>
+    </div>
+  );
+}
diff --git a/apps/app/src/components/feed/EditFeedLoadingState.tsx b/apps/app/src/components/feed/EditFeedLoadingState.tsx
new file mode 100644
index 00000000..20c277c3
--- /dev/null
+++ b/apps/app/src/components/feed/EditFeedLoadingState.tsx
@@ -0,0 +1,46 @@
+import { Terminal } from "lucide-react";
+import { Alert, AlertDescription, AlertTitle } from "../ui/alert";
+import { Loading } from "../ui/loading";
+
+interface EditFeedLoadingStateProps {
+  isLoadingFeed: boolean;
+  feedError: Error | null;
+  feedData: unknown;
+}
+
+export function EditFeedLoadingState({
+  isLoadingFeed,
+  feedError,
+  feedData,
+}: EditFeedLoadingStateProps) {
+  if (isLoadingFeed) {
+    return (
+      <div className="fixed inset-0 flex items-center justify-center z-50">
+        <div className="flex flex-col items-center gap-4">
+          <Loading />
+          <p className="text-lg text-gray-600">Loading feed details...</p>
+        </div>
+      </div>
+    );
+  }
+
+  if (feedError) {
+    return (
+      <Alert variant="destructive" className="m-4">
+        <Terminal className="h-4 w-4" />
+        <AlertTitle>Error Loading Feed</AlertTitle>
+        <AlertDescription>{feedError.message}</AlertDescription>
+      </Alert>
+    );
+  }
+
+  if (!feedData) {
+    return (
+      <div className="flex items-center justify-center p-8">
+        <p className="text-gray-600">Feed not found.</p>
+      </div>
+    );
+  }
+
+  return null;
+}
diff --git a/apps/app/src/components/feed/form/BasicFieldsSection.tsx b/apps/app/src/components/feed/form/BasicFieldsSection.tsx
new file mode 100644
index 00000000..7f82f9f1
--- /dev/null
+++ b/apps/app/src/components/feed/form/BasicFieldsSection.tsx
@@ -0,0 +1,106 @@
+import { memo } from "react";
+import { Control } from "react-hook-form";
+import { Checkbox } from "../../ui/checkbox";
+import {
+  FormControl,
+  FormDescription,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from "../../ui/form";
+import { Input } from "../../ui/input";
+import { Textarea } from "../../ui/textarea";
+import { FormValues } from "./types";
+
+interface BasicFieldsSectionProps {
+  control: Control<FormValues>;
+}
+
+export const BasicFieldsSection = memo(function BasicFieldsSection({
+  control,
+}: BasicFieldsSectionProps) {
+  return (
+    <div className="space-y-6">
+      <FormField
+        control={control}
+        name="name"
+        render={({ field }) => (
+          <FormItem>
+            <FormLabel>Feed Name</FormLabel>
+            <FormControl>
+              <Input placeholder="Enter feed name" {...field} />
+            </FormControl>
+            <FormMessage />
+          </FormItem>
+        )}
+      />
+
+      <FormField
+        control={control}
+        name="description"
+        render={({ field }) => (
+          <FormItem>
+            <FormLabel>Description</FormLabel>
+            <FormControl>
+              <Textarea
+                placeholder="Describe what this feed curates"
+                {...field}
+              />
+            </FormControl>
+            <FormMessage />
+          </FormItem>
+        )}
+      />
+
+      <FormField
+        control={control}
+        name="enabled"
+        render={({ field }) => (
+          <FormItem className="flex flex-row items-start space-x-3 space-y-0">
+            <FormControl>
+              <Checkbox
+                checked={field.value}
+                onCheckedChange={field.onChange}
+              />
+            </FormControl>
+            <div className="space-y-1 leading-none">
+              <FormLabel>Enable Feed</FormLabel>
+              <FormDescription>
+                When enabled, this feed will actively curate and distribute
+                content
+              </FormDescription>
+            </div>
+          </FormItem>
+        )}
+      />
+
+      <FormField
+        control={control}
+        name="pollingIntervalMs"
+        render={({ field }) => (
+          <FormItem>
+            <FormLabel>Polling Interval (milliseconds)</FormLabel>
+            <FormControl>
+              <Input
+                type="number"
+                placeholder="60000"
+                min={1000}
+                {...field}
+                onChange={(e) =>
+                  field.onChange(
+                    e.target.value ? Number(e.target.value) : undefined,
+                  )
+                }
+              />
+            </FormControl>
+            <FormDescription>
+              How often to check for new content (minimum: 1000ms)
+            </FormDescription>
+            <FormMessage />
+          </FormItem>
+        )}
+      />
+    </div>
+  );
+});
diff --git a/apps/app/src/components/feed/form/IngestionSection.tsx b/apps/app/src/components/feed/form/IngestionSection.tsx
new file mode 100644
index 00000000..68b688d3
--- /dev/null
+++ b/apps/app/src/components/feed/form/IngestionSection.tsx
@@ -0,0 +1,72 @@
+import { memo } from "react";
+import { Control, UseFormWatch } from "react-hook-form";
+import { Checkbox } from "../../ui/checkbox";
+import {
+  FormControl,
+  FormDescription,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from "../../ui/form";
+import { Input } from "../../ui/input";
+import { FormValues } from "./types";
+
+interface IngestionSectionProps {
+  control: Control<FormValues>;
+  watch: UseFormWatch<FormValues>;
+}
+
+export const IngestionSection = memo(function IngestionSection({
+  control,
+  watch,
+}: IngestionSectionProps) {
+  return (
+    <div className="space-y-4 p-4 border rounded-lg bg-gray-50">
+      <h3 className="font-medium">Ingestion Settings</h3>
+
+      <FormField
+        control={control}
+        name="ingestionEnabled"
+        render={({ field }) => (
+          <FormItem className="flex flex-row items-start space-x-3 space-y-0">
+            <FormControl>
+              <Checkbox
+                checked={field.value}
+                onCheckedChange={field.onChange}
+              />
+            </FormControl>
+            <div className="space-y-1 leading-none">
+              <FormLabel>Enable Scheduled Ingestion</FormLabel>
+              <FormDescription>
+                Automatically ingest content based on a schedule
+              </FormDescription>
+            </div>
+          </FormItem>
+        )}
+      />
+
+      <FormField
+        control={control}
+        name="ingestionSchedule"
+        render={({ field }) => (
+          <FormItem>
+            <FormLabel>Ingestion Schedule (Cron Expression)</FormLabel>
+            <FormControl>
+              <Input
+                placeholder="0 */30 * * * *"
+                {...field}
+                disabled={!watch("ingestionEnabled")}
+              />
+            </FormControl>
+            <FormDescription>
+              Cron expression for scheduling (e.g., "0 */30 * * * *" for every
+              30 minutes)
+            </FormDescription>
+            <FormMessage />
+          </FormItem>
+        )}
+      />
+    </div>
+  );
+});
diff --git a/apps/app/src/components/feed/form/ModerationSection.tsx b/apps/app/src/components/feed/form/ModerationSection.tsx
new file mode 100644
index 00000000..eb42580c
--- /dev/null
+++ b/apps/app/src/components/feed/form/ModerationSection.tsx
@@ -0,0 +1,121 @@
+import { memo, useState, useEffect } from "react";
+import { Control, useController } from "react-hook-form";
+import {
+  FormControl,
+  FormDescription,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from "../../ui/form";
+import { Input } from "../../ui/input";
+import { FormValues } from "./types";
+
+interface ModerationSectionProps {
+  control: Control<FormValues>;
+}
+
+function TwitterApproversField({ control }: { control: Control<FormValues> }) {
+  const {
+    field,
+    fieldState: { error },
+  } = useController({
+    name: "moderationApprovers",
+    control,
+  });
+
+  const [localValue, setLocalValue] = useState(
+    field.value?.twitter?.join(", ") || "",
+  );
+
+  // Sync local value when field value changes from external sources (like form reset)
+  useEffect(() => {
+    const formValue = field.value?.twitter?.join(", ") || "";
+    setLocalValue(formValue);
+  }, [field.value]);
+
+  return (
+    <FormItem>
+      <FormLabel>Twitter Approvers (comma-separated usernames)</FormLabel>
+      <FormControl>
+        <Input
+          placeholder="user1, user2, user3"
+          value={localValue}
+          onChange={(e) => {
+            setLocalValue(e.target.value);
+          }}
+          onBlur={() => {
+            const approvers = { ...field.value };
+            approvers.twitter = localValue
+              .split(",")
+              .map((s) => s.trim())
+              .filter(Boolean);
+            field.onChange(approvers);
+          }}
+        />
+      </FormControl>
+      {error && <FormMessage>{error.message}</FormMessage>}
+    </FormItem>
+  );
+}
+
+function TwitterBlacklistField({ control }: { control: Control<FormValues> }) {
+  const {
+    field,
+    fieldState: { error },
+  } = useController({
+    name: "moderationBlacklist",
+    control,
+  });
+
+  const [localValue, setLocalValue] = useState(
+    field.value?.twitter?.join(", ") || "",
+  );
+
+  // Sync local value when field value changes from external sources (like form reset)
+  useEffect(() => {
+    const formValue = field.value?.twitter?.join(", ") || "";
+    setLocalValue(formValue);
+  }, [field.value]);
+
+  return (
+    <FormItem>
+      <FormLabel>Twitter Blacklist (comma-separated usernames)</FormLabel>
+      <FormControl>
+        <Input
+          placeholder="spammer1, bot2, unwanted3"
+          value={localValue}
+          onChange={(e) => {
+            setLocalValue(e.target.value);
+          }}
+          onBlur={() => {
+            const blacklist = { ...field.value };
+            blacklist.twitter = localValue
+              .split(",")
+              .map((s) => s.trim())
+              .filter(Boolean);
+            field.onChange(blacklist);
+          }}
+        />
+      </FormControl>
+      {error && <FormMessage>{error.message}</FormMessage>}
+    </FormItem>
+  );
+}
+
+export const ModerationSection = memo(function ModerationSection({
+  control,
+}: ModerationSectionProps) {
+  return (
+    <div className="space-y-4 p-4 border rounded-lg bg-gray-50">
+      <h3 className="font-medium">Moderation Settings</h3>
+      <FormDescription>
+        Configure content moderation rules and approvers
+      </FormDescription>
+
+      <div className="space-y-4">
+        <TwitterApproversField control={control} />
+        <TwitterBlacklistField control={control} />
+      </div>
+    </div>
+  );
+});
diff --git a/apps/app/src/components/feed/form/RecapsSection.tsx b/apps/app/src/components/feed/form/RecapsSection.tsx
new file mode 100644
index 00000000..b4849167
--- /dev/null
+++ b/apps/app/src/components/feed/form/RecapsSection.tsx
@@ -0,0 +1,124 @@
+import { memo } from "react";
+import { Control, UseFieldArrayReturn } from "react-hook-form";
+import { Plus, Trash2 } from "lucide-react";
+import { Button } from "../../ui/button";
+import { Checkbox } from "../../ui/checkbox";
+import {
+  FormControl,
+  FormDescription,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from "../../ui/form";
+import { Input } from "../../ui/input";
+import { FormValues } from "./types";
+
+interface RecapsSectionProps {
+  control: Control<FormValues>;
+  recapFields: UseFieldArrayReturn<FormValues, "recaps">["fields"];
+  appendRecap: UseFieldArrayReturn<FormValues, "recaps">["append"];
+  removeRecap: UseFieldArrayReturn<FormValues, "recaps">["remove"];
+}
+
+export const RecapsSection = memo(function RecapsSection({
+  control,
+  recapFields,
+  appendRecap,
+  removeRecap,
+}: RecapsSectionProps) {
+  return (
+    <div className="space-y-4">
+      <div className="flex items-center justify-between">
+        <h4 className="font-medium">Recap Configurations</h4>
+        <Button
+          type="button"
+          variant="outline"
+          size="sm"
+          onClick={() =>
+            appendRecap({
+              id: `recap-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`,
+              name: "",
+              enabled: false,
+              schedule: "",
+              timezone: "UTC",
+            })
+          }
+        >
+          <Plus className="h-4 w-4 mr-1" />
+          Add Recap
+        </Button>
+      </div>
+
+      {recapFields.map((field, recapIndex) => (
+        <div key={field.id} className="p-3 border rounded bg-white space-y-3">
+          <div className="flex items-center justify-between">
+            <h5 className="text-sm font-medium">Recap {recapIndex + 1}</h5>
+            <Button
+              type="button"
+              variant="ghost"
+              size="sm"
+              onClick={() => removeRecap(recapIndex)}
+            >
+              <Trash2 className="h-4 w-4" />
+            </Button>
+          </div>
+
+          <div className="grid grid-cols-1 md:grid-cols-2 gap-3">
+            <FormField
+              control={control}
+              name={`recaps.${recapIndex}.name`}
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Recap Name</FormLabel>
+                  <FormControl>
+                    <Input placeholder="Weekly Summary" {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+
+            <FormField
+              control={control}
+              name={`recaps.${recapIndex}.schedule`}
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Schedule (Cron)</FormLabel>
+                  <FormControl>
+                    <Input
+                      placeholder="0 0 * * 0 (Weekly on Sunday at midnight)"
+                      {...field}
+                    />
+                  </FormControl>
+                  <FormDescription>
+                    Enter a cron expression for the recap schedule
+                  </FormDescription>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+          </div>
+
+          <FormField
+            control={control}
+            name={`recaps.${recapIndex}.enabled`}
+            render={({ field }) => (
+              <FormItem className="flex flex-row items-start space-x-3 space-y-0">
+                <FormControl>
+                  <Checkbox
+                    checked={field.value}
+                    onCheckedChange={field.onChange}
+                  />
+                </FormControl>
+                <div className="space-y-1 leading-none">
+                  <FormLabel>Enable this recap</FormLabel>
+                </div>
+              </FormItem>
+            )}
+          />
+        </div>
+      ))}
+    </div>
+  );
+});
diff --git a/apps/app/src/components/feed/form/SourcesSection.tsx b/apps/app/src/components/feed/form/SourcesSection.tsx
new file mode 100644
index 00000000..54078a23
--- /dev/null
+++ b/apps/app/src/components/feed/form/SourcesSection.tsx
@@ -0,0 +1,178 @@
+import { memo } from "react";
+import { Control, UseFieldArrayReturn, useFieldArray } from "react-hook-form";
+import { Plus, Trash2 } from "lucide-react";
+import { Button } from "../../ui/button";
+import {
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from "../../ui/form";
+import { Input } from "../../ui/input";
+import { FormValues } from "./types";
+
+// Separate component for search entries to properly use hooks
+interface SearchEntriesProps {
+  control: Control<FormValues>;
+  sourceIndex: number;
+}
+
+const SearchEntries = memo(function SearchEntries({
+  control,
+  sourceIndex,
+}: SearchEntriesProps) {
+  const searchFieldArray = useFieldArray({
+    control,
+    name: `sources.${sourceIndex}.search`,
+  });
+
+  return (
+    <div className="space-y-2">
+      <div className="flex items-center justify-between">
+        <h5 className="text-sm font-medium">Search Queries</h5>
+        <Button
+          type="button"
+          variant="outline"
+          size="sm"
+          onClick={() =>
+            searchFieldArray.append({
+              searchId: `search-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`,
+              type: "",
+              query: "",
+            })
+          }
+        >
+          <Plus className="h-3 w-3 mr-1" />
+          Add Search
+        </Button>
+      </div>
+
+      {searchFieldArray.fields.map((field, searchIndex) => (
+        <div
+          key={field.id}
+          className="ml-4 p-2 border-l-2 border-gray-200 space-y-2"
+        >
+          <div className="flex items-center justify-between">
+            <h6 className="text-xs font-medium text-gray-600">
+              Search {searchIndex + 1}
+            </h6>
+            {searchFieldArray.fields.length > 1 && (
+              <Button
+                type="button"
+                variant="ghost"
+                size="sm"
+                onClick={() => searchFieldArray.remove(searchIndex)}
+              >
+                <Trash2 className="h-3 w-3" />
+              </Button>
+            )}
+          </div>
+
+          <FormField
+            control={control}
+            name={`sources.${sourceIndex}.search.${searchIndex}.type`}
+            render={({ field }) => (
+              <FormItem>
+                <FormLabel>Search Type</FormLabel>
+                <FormControl>
+                  <Input placeholder="e.g., twitter-search" {...field} />
+                </FormControl>
+                <FormMessage />
+              </FormItem>
+            )}
+          />
+
+          <FormField
+            control={control}
+            name={`sources.${sourceIndex}.search.${searchIndex}.query`}
+            render={({ field }) => (
+              <FormItem>
+                <FormLabel>Search Query</FormLabel>
+                <FormControl>
+                  <Input placeholder="e.g., #technology" {...field} />
+                </FormControl>
+                <FormMessage />
+              </FormItem>
+            )}
+          />
+        </div>
+      ))}
+    </div>
+  );
+});
+
+interface SourcesSectionProps {
+  control: Control<FormValues>;
+  sourceFields: UseFieldArrayReturn<FormValues, "sources">["fields"];
+  appendSource: UseFieldArrayReturn<FormValues, "sources">["append"];
+  removeSource: UseFieldArrayReturn<FormValues, "sources">["remove"];
+}
+
+export const SourcesSection = memo(function SourcesSection({
+  control,
+  sourceFields,
+  appendSource,
+  removeSource,
+}: SourcesSectionProps) {
+  return (
+    <div className="space-y-4 p-4 border rounded-lg bg-gray-50">
+      <div className="flex items-center justify-between">
+        <h3 className="font-medium">Content Sources</h3>
+        <Button
+          type="button"
+          variant="outline"
+          size="sm"
+          onClick={() =>
+            appendSource({
+              plugin: "",
+              config: {},
+              search: [
+                {
+                  searchId: `search-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`,
+                  type: "",
+                  query: "",
+                },
+              ],
+            })
+          }
+        >
+          <Plus className="h-4 w-4 mr-1" />
+          Add Source
+        </Button>
+      </div>
+
+      {sourceFields.map((field, sourceIndex) => (
+        <div key={field.id} className="p-3 border rounded bg-white space-y-3">
+          <div className="flex items-center justify-between">
+            <h4 className="text-sm font-medium">Source {sourceIndex + 1}</h4>
+            <Button
+              type="button"
+              variant="ghost"
+              size="sm"
+              onClick={() => removeSource(sourceIndex)}
+            >
+              <Trash2 className="h-4 w-4" />
+            </Button>
+          </div>
+
+          <FormField
+            control={control}
+            name={`sources.${sourceIndex}.plugin`}
+            render={({ field }) => (
+              <FormItem>
+                <FormLabel>Plugin Name</FormLabel>
+                <FormControl>
+                  <Input placeholder="e.g., twitter-scraper" {...field} />
+                </FormControl>
+                <FormMessage />
+              </FormItem>
+            )}
+          />
+
+          <SearchEntries control={control} sourceIndex={sourceIndex} />
+        </div>
+      ))}
+    </div>
+  );
+});
diff --git a/apps/app/src/components/feed/form/StreamSettingsSection.tsx b/apps/app/src/components/feed/form/StreamSettingsSection.tsx
new file mode 100644
index 00000000..8165fe68
--- /dev/null
+++ b/apps/app/src/components/feed/form/StreamSettingsSection.tsx
@@ -0,0 +1,330 @@
+import { memo, useState, useEffect } from "react";
+import {
+  Control,
+  UseFieldArrayReturn,
+  UseFormWatch,
+  useController,
+} from "react-hook-form";
+import { Plus, Trash2 } from "lucide-react";
+import { Button } from "../../ui/button";
+import { Checkbox } from "../../ui/checkbox";
+import {
+  FormControl,
+  FormDescription,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from "../../ui/form";
+import { Input } from "../../ui/input";
+import { Textarea } from "../../ui/textarea";
+import { FormValues } from "./types";
+
+interface StreamSettingsSectionProps {
+  control: Control<FormValues>;
+  transformFields: UseFieldArrayReturn<
+    FormValues,
+    "streamTransforms"
+  >["fields"];
+  appendTransform: UseFieldArrayReturn<
+    FormValues,
+    "streamTransforms"
+  >["append"];
+  removeTransform: UseFieldArrayReturn<
+    FormValues,
+    "streamTransforms"
+  >["remove"];
+  distributorFields: UseFieldArrayReturn<
+    FormValues,
+    "streamDistributors"
+  >["fields"];
+  appendDistributor: UseFieldArrayReturn<
+    FormValues,
+    "streamDistributors"
+  >["append"];
+  removeDistributor: UseFieldArrayReturn<
+    FormValues,
+    "streamDistributors"
+  >["remove"];
+  watch: UseFormWatch<FormValues>;
+}
+
+function TransformConfigField({
+  control,
+  transformIndex,
+}: {
+  control: Control<FormValues>;
+  transformIndex: number;
+}) {
+  const {
+    field,
+    fieldState: { error },
+  } = useController({
+    name: `streamTransforms.${transformIndex}.config`,
+    control,
+  });
+
+  const [localValue, setLocalValue] = useState(
+    field.value ? JSON.stringify(field.value, null, 2) : "{}",
+  );
+
+  // Sync local value when field value changes from external sources (like form reset)
+  useEffect(() => {
+    const formValue = field.value ? JSON.stringify(field.value, null, 2) : "{}";
+    setLocalValue(formValue);
+  }, [field.value]);
+
+  return (
+    <FormItem>
+      <FormLabel>Transform Config (JSON)</FormLabel>
+      <FormControl>
+        <Textarea
+          placeholder='{"key": "value"}'
+          value={localValue}
+          onChange={(e) => {
+            setLocalValue(e.target.value);
+          }}
+          onBlur={() => {
+            try {
+              const parsed = JSON.parse(localValue || "{}");
+              field.onChange(parsed);
+            } catch {
+              // If JSON is invalid, keep the current value and don't update
+              // This prevents losing data while typing
+              const formValue = field.value
+                ? JSON.stringify(field.value, null, 2)
+                : "{}";
+              setLocalValue(formValue);
+            }
+          }}
+        />
+      </FormControl>
+      {error && <FormMessage>{error.message}</FormMessage>}
+    </FormItem>
+  );
+}
+
+function DistributorConfigField({
+  control,
+  distributorIndex,
+}: {
+  control: Control<FormValues>;
+  distributorIndex: number;
+}) {
+  const {
+    field,
+    fieldState: { error },
+  } = useController({
+    name: `streamDistributors.${distributorIndex}.config`,
+    control,
+  });
+
+  const [localValue, setLocalValue] = useState(
+    field.value ? JSON.stringify(field.value, null, 2) : "{}",
+  );
+
+  // Sync local value when field value changes from external sources (like form reset)
+  useEffect(() => {
+    const formValue = field.value ? JSON.stringify(field.value, null, 2) : "{}";
+    setLocalValue(formValue);
+  }, [field.value]);
+
+  return (
+    <FormItem>
+      <FormLabel>Distributor Config (JSON)</FormLabel>
+      <FormControl>
+        <Textarea
+          placeholder='{"key": "value"}'
+          value={localValue}
+          onChange={(e) => {
+            setLocalValue(e.target.value);
+          }}
+          onBlur={() => {
+            try {
+              const parsed = JSON.parse(localValue || "{}");
+              field.onChange(parsed);
+            } catch {
+              // If JSON is invalid, keep the current value and don't update
+              // This prevents losing data while typing
+              const formValue = field.value
+                ? JSON.stringify(field.value, null, 2)
+                : "{}";
+              setLocalValue(formValue);
+            }
+          }}
+        />
+      </FormControl>
+      {error && <FormMessage>{error.message}</FormMessage>}
+    </FormItem>
+  );
+}
+
+export const StreamSettingsSection = memo(function StreamSettingsSection({
+  control,
+  transformFields,
+  appendTransform,
+  removeTransform,
+  distributorFields,
+  appendDistributor,
+  removeDistributor,
+  watch,
+}: StreamSettingsSectionProps) {
+  const streamEnabled = watch("streamEnabled");
+
+  return (
+    <div className="space-y-4 p-4 border rounded-lg bg-gray-50">
+      <h3 className="font-medium">Output Settings</h3>
+
+      <FormField
+        control={control}
+        name="streamEnabled"
+        render={({ field }) => (
+          <FormItem className="flex flex-row items-start space-x-3 space-y-0">
+            <FormControl>
+              <Checkbox
+                checked={field.value}
+                onCheckedChange={field.onChange}
+              />
+            </FormControl>
+            <div className="space-y-1 leading-none">
+              <FormLabel>Enable Stream Output</FormLabel>
+              <FormDescription>
+                Stream content in real-time as it's curated
+              </FormDescription>
+            </div>
+          </FormItem>
+        )}
+      />
+
+      {streamEnabled && (
+        <div className="ml-4 space-y-4 p-4 border-l-2 border-blue-200 bg-blue-50">
+          <div className="space-y-4">
+            <div className="flex items-center justify-between">
+              <h4 className="font-medium">Stream Transforms</h4>
+              <Button
+                type="button"
+                variant="outline"
+                size="sm"
+                onClick={() =>
+                  appendTransform({
+                    plugin: "",
+                    config: {},
+                  })
+                }
+              >
+                <Plus className="h-4 w-4 mr-1" />
+                Add Transform
+              </Button>
+            </div>
+
+            {transformFields.map((field, transformIndex) => (
+              <div
+                key={field.id}
+                className="p-3 border rounded bg-white space-y-3"
+              >
+                <div className="flex items-center justify-between">
+                  <h5 className="text-sm font-medium">
+                    Transform {transformIndex + 1}
+                  </h5>
+                  <Button
+                    type="button"
+                    variant="ghost"
+                    size="sm"
+                    onClick={() => removeTransform(transformIndex)}
+                  >
+                    <Trash2 className="h-4 w-4" />
+                  </Button>
+                </div>
+
+                <FormField
+                  control={control}
+                  name={`streamTransforms.${transformIndex}.plugin`}
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>Transform Plugin</FormLabel>
+                      <FormControl>
+                        <Input
+                          placeholder="@curatedotfun/ai-transform"
+                          {...field}
+                        />
+                      </FormControl>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+
+                <TransformConfigField
+                  control={control}
+                  transformIndex={transformIndex}
+                />
+              </div>
+            ))}
+          </div>
+
+          <div className="space-y-4">
+            <div className="flex items-center justify-between">
+              <h4 className="font-medium">Stream Distributors</h4>
+              <Button
+                type="button"
+                variant="outline"
+                size="sm"
+                onClick={() =>
+                  appendDistributor({
+                    plugin: "",
+                    config: {},
+                  })
+                }
+              >
+                <Plus className="h-4 w-4 mr-1" />
+                Add Distributor
+              </Button>
+            </div>
+
+            {distributorFields.map((field, distributorIndex) => (
+              <div
+                key={field.id}
+                className="p-3 border rounded bg-white space-y-3"
+              >
+                <div className="flex items-center justify-between">
+                  <h5 className="text-sm font-medium">
+                    Distributor {distributorIndex + 1}
+                  </h5>
+                  <Button
+                    type="button"
+                    variant="ghost"
+                    size="sm"
+                    onClick={() => removeDistributor(distributorIndex)}
+                  >
+                    <Trash2 className="h-4 w-4" />
+                  </Button>
+                </div>
+
+                <FormField
+                  control={control}
+                  name={`streamDistributors.${distributorIndex}.plugin`}
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>Distributor Plugin</FormLabel>
+                      <FormControl>
+                        <Input
+                          placeholder="@curatedotfun/twitter-distributor"
+                          {...field}
+                        />
+                      </FormControl>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+
+                <DistributorConfigField
+                  control={control}
+                  distributorIndex={distributorIndex}
+                />
+              </div>
+            ))}
+          </div>
+        </div>
+      )}
+    </div>
+  );
+});
diff --git a/apps/app/src/components/feed/form/index.ts b/apps/app/src/components/feed/form/index.ts
new file mode 100644
index 00000000..4da43ddb
--- /dev/null
+++ b/apps/app/src/components/feed/form/index.ts
@@ -0,0 +1,7 @@
+export { BasicFieldsSection } from "./BasicFieldsSection";
+export { SourcesSection } from "./SourcesSection";
+export { StreamSettingsSection } from "./StreamSettingsSection";
+export { RecapsSection } from "./RecapsSection";
+export { ModerationSection } from "./ModerationSection";
+export { IngestionSection } from "./IngestionSection";
+export { FeedConfigFormSchema, type FormValues } from "./types";
diff --git a/apps/app/src/components/feed/form/types.ts b/apps/app/src/components/feed/form/types.ts
new file mode 100644
index 00000000..248df1b7
--- /dev/null
+++ b/apps/app/src/components/feed/form/types.ts
@@ -0,0 +1,27 @@
+import { z } from "zod";
+import {
+  SourceConfigSchema,
+  TransformConfigSchema,
+  DistributorConfigSchema,
+  RecapConfigSchema,
+} from "@curatedotfun/types";
+
+export const FeedConfigFormSchema = z.object({
+  name: z.string().min(1, "Feed name is required"),
+  description: z.string().min(1, "Description is required"),
+  enabled: z.boolean(),
+  pollingIntervalMs: z.number().min(1000).optional(),
+  ingestionEnabled: z.boolean().optional(),
+  ingestionSchedule: z.string().optional(),
+  sources: z.array(SourceConfigSchema).optional(),
+  // Outputs - flattened for easier form handling
+  streamEnabled: z.boolean().optional(),
+  streamTransforms: z.array(TransformConfigSchema).optional(),
+  streamDistributors: z.array(DistributorConfigSchema).optional(),
+  recaps: z.array(RecapConfigSchema).optional(),
+  // Moderation - flattened for easier form handling
+  moderationApprovers: z.record(z.array(z.string())).optional(),
+  moderationBlacklist: z.record(z.array(z.string())).optional(),
+});
+
+export type FormValues = z.infer<typeof FeedConfigFormSchema>;
diff --git a/apps/app/src/components/profile/ProfileTabs.tsx b/apps/app/src/components/profile/ProfileTabs.tsx
deleted file mode 100644
index fbd372d3..00000000
--- a/apps/app/src/components/profile/ProfileTabs.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-import { Tabs, TabsContent, TabsList, TabsTrigger } from "../ui/profile-tabs";
-import {
-  Activity,
-  ScanSearch,
-  // Award,
-  Newspaper,
-  // NotepadTextDashed
-} from "lucide-react";
-import { ProfileOverview } from "./overview";
-// import { ProfileContent } from "./content";
-import { MyFeeds } from "./my-feeds";
-// import { ProfilePoints } from "./points";
-import { ProfileActivity } from "./activity";
-
-// Tab data structure
-const TABS = [
-  {
-    value: "overview",
-    label: "Overview",
-    icon: ScanSearch,
-    component: ProfileOverview,
-  },
-  // {
-  //   value: "content",
-  //   label: "Content",
-  //   icon: NotepadTextDashed,
-  //   component: ProfileContent,
-  // },
-  {
-    value: "my-feeds",
-    label: "My Feeds",
-    icon: Newspaper,
-    component: MyFeeds,
-  },
-  // {
-  //   value: "points",
-  //   label: "Points",
-  //   icon: Award,
-  //   component: ProfilePoints,
-  // },
-  {
-    value: "activity",
-    label: "Activity",
-    icon: Activity,
-    component: ProfileActivity,
-  },
-];
-
-export function ProfileTabs() {
-  return (
-    <>
-      <Tabs defaultValue={"overview"} className="w-full space-y-[30px]">
-        <TabsList className="overflow-x-auto">
-          {TABS.map(({ value, label, icon: Icon }) => (
-            <TabsTrigger key={value} value={value}>
-              <Icon strokeWidth={1} size={24} />
-              {label}
-            </TabsTrigger>
-          ))}
-        </TabsList>
-
-        {TABS.map(({ value, component: Component }) => (
-          <TabsContent key={value} value={value} className="w-full">
-            <Component />
-          </TabsContent>
-        ))}
-      </Tabs>
-    </>
-  );
-}
diff --git a/apps/app/src/components/profile/activity/index.tsx b/apps/app/src/components/profile/activity/index.tsx
deleted file mode 100644
index 877c3153..00000000
--- a/apps/app/src/components/profile/activity/index.tsx
+++ /dev/null
@@ -1,109 +0,0 @@
-import { ChevronsUpDown } from "lucide-react";
-import { Button } from "../../ui/button";
-import { Card, CardContent } from "../../ui/card";
-import { PaginationControls } from "./PaginationControls";
-
-// const transformActivityData = (activity: UserActivityStats): ActivityItem => {
-//   const baseItem: ActivityItem = {
-//     type: activity.type,
-//     time: new Date(activity.timestamp).toLocaleTimeString([], {
-//       hour: "2-digit",
-//       minute: "2-digit",
-//     }),
-//     icon: FileText, // Default icon
-//     content: {
-//       title: activity.data?.title || "",
-//       to: activity.data?.to || "",
-//     },
-//   };
-
-//   // Map activity types to appropriate icons and content
-//   switch (activity.type) {
-//     case ActivityType.CONTENT_SUBMISSION:
-//       return {
-//         ...baseItem,
-//         icon: FileText,
-//         content: {
-//           title: activity.data?.title || "",
-//           to: activity.data?.to || "",
-//         },
-//       };
-//     case ActivityType.CONTENT_APPROVAL:
-//       return {
-//         ...baseItem,
-//         icon: CheckCircle,
-//         content: {
-//           title: activity.data?.title || "",
-//           to: activity.data?.to || "",
-//         },
-//       };
-//     case ActivityType.TOKEN_BUY:
-//       return {
-//         ...baseItem,
-//         icon: ArrowDown,
-//         content: {
-//           token: activity.data?.token || "",
-//           amount: activity.data?.amount || "",
-//         },
-//         points: `+ ${activity.data?.amount || ""} ${activity.data?.token || ""}`,
-//       };
-//     case ActivityType.TOKEN_SELL:
-//       return {
-//         ...baseItem,
-//         icon: ArrowUp,
-//         content: {
-//           token: activity.data?.token || "",
-//           amount: activity.data?.amount || "",
-//         },
-//         points: `- ${activity.data?.amount || ""} ${activity.data?.token || ""}`,
-//       };
-//     case ActivityType.POINTS_REDEMPTION:
-//     case ActivityType.POINTS_AWARDED:
-//       return {
-//         ...baseItem,
-//         icon: Coins,
-//         content: {
-//           currency: activity.data?.currency || "",
-//           amount: activity.data?.amount || "",
-//         },
-//         points: `${activity.type === ActivityType.POINTS_AWARDED ? "+" : "-"} ${activity.data?.amount || ""} ${activity.data?.currency || ""}`,
-//       };
-//     default:
-//       return baseItem;
-//   }
-// };
-
-export function ProfileActivity() {
-  // const { currentAccountId } = useAuth();
-  // const { data: userActivity } = useUserActivity(
-  //   currentAccountId || "",
-  // );
-
-  // const transformedActivity = userActivity?.map(transformActivityData);
-  const hasData = false; // Currently no data is loaded
-
-  return (
-    <div>
-      <Card className="mb-3">
-        <CardContent className="p-0">
-          <div className="flex justify-between items-center py-3 px-4">
-            <h2 className="text-2xl mt-2 font-semibold">Activity Log</h2>
-            <Button variant="outline" size="sm" className="mt-2">
-              Filter
-              <ChevronsUpDown size={14} className="ml-1" />
-            </Button>
-          </div>
-          <div className="w-full border-t border-dashed border-neutral-300 my-1"></div>
-          {/* <ActivityTable data={transformedActivity} /> */}
-          {!hasData && (
-            <div className="p-8 text-center text-gray-500">
-              No activity data available
-            </div>
-          )}
-        </CardContent>
-      </Card>
-
-      {hasData && <PaginationControls />}
-    </div>
-  );
-}
diff --git a/apps/app/src/components/profile/my-feeds/index.tsx b/apps/app/src/components/profile/my-feeds/index.tsx
deleted file mode 100644
index 353e71ee..00000000
--- a/apps/app/src/components/profile/my-feeds/index.tsx
+++ /dev/null
@@ -1,160 +0,0 @@
-import { useNavigate } from "@tanstack/react-router";
-import { Check, ChevronsUpDown, Loader2 } from "lucide-react";
-import { useMemo, useState } from "react";
-import { useMyCreatedFeeds } from "../../../lib/api/feeds";
-import { cn } from "../../../lib/utils";
-import { Button } from "../../ui/button";
-import {
-  Command,
-  CommandEmpty,
-  CommandGroup,
-  CommandInput,
-  CommandItem,
-  CommandList,
-} from "../../ui/command";
-import { Popover, PopoverContent, PopoverTrigger } from "../../ui/popover";
-import { FeedCard } from "./FeedCard";
-import { SearchForm } from "./SearchForm";
-import { filterOptions, type FilterValue } from "./constants";
-
-export function MyFeeds() {
-  const [open, setOpen] = useState(false);
-  const [filters, setFilters] = useState<{
-    term: string;
-    value: FilterValue;
-  }>({ term: "", value: "all" });
-  const navigate = useNavigate();
-
-  const { data: feeds = [], isLoading, error } = useMyCreatedFeeds();
-
-  const filteredFeeds = useMemo(() => {
-    return feeds.filter((feed) => {
-      const matchesSearch =
-        !filters.term ||
-        feed.name.toLowerCase().includes(filters.term.toLowerCase()) ||
-        (feed.description &&
-          feed.description.toLowerCase().includes(filters.term.toLowerCase()));
-
-      const isComplete = !!(
-        feed.config &&
-        feed.config.name &&
-        feed.config.description &&
-        feed.config.sources &&
-        feed.config.sources.length > 0
-      );
-
-      if (filters.value === "all") return matchesSearch;
-      if (filters.value === "completed") return matchesSearch && isComplete;
-      if (filters.value === "incomplete") return matchesSearch && !isComplete;
-
-      return matchesSearch;
-    });
-  }, [feeds, filters]);
-
-  const handleCreateNewFeed = () => {
-    navigate({ to: "/create/feed" });
-  };
-
-  if (error) {
-    return (
-      <div className="flex items-center justify-center p-8">
-        <p className="text-red-500">Failed to load feeds. Please try again.</p>
-      </div>
-    );
-  }
-
-  return (
-    <div className="flex flex-col gap-4 sm:gap-6 w-full">
-      <div className="flex flex-col md:flex-row md:gap-0 gap-4 items-stretch justify-between w-full">
-        <SearchForm
-          searchTerm={filters.term}
-          onSearchChange={(term) => setFilters((f) => ({ ...f, term }))}
-        />
-        <div className="ms-auto md:ms-0 flex items-stretch gap-3">
-          <Popover open={open} onOpenChange={setOpen}>
-            <PopoverTrigger asChild>
-              <Button
-                variant="outline"
-                role="combobox"
-                aria-expanded={open}
-                className="truncate justify-between h-auto"
-              >
-                {filters.value
-                  ? `${filterOptions.find((option) => option.value === filters.value)?.label} Feeds`
-                  : "Select filter..."}
-                <ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
-              </Button>
-            </PopoverTrigger>
-            <PopoverContent className="p-0">
-              <Command>
-                <CommandInput placeholder="Search feeds" />
-                <CommandList>
-                  <CommandEmpty>No filter found.</CommandEmpty>
-                  <CommandGroup>
-                    {filterOptions.map((option) => (
-                      <CommandItem
-                        key={option.value}
-                        value={option.value}
-                        onSelect={(currentValue) => {
-                          setFilters((f) => ({
-                            ...f,
-                            value:
-                              currentValue === f.value
-                                ? "all"
-                                : (currentValue as FilterValue),
-                          }));
-                          setOpen(false);
-                        }}
-                      >
-                        <Check
-                          className={cn(
-                            "mr-2 h-4 w-4",
-                            filters.value === option.value
-                              ? "opacity-100"
-                              : "opacity-0",
-                          )}
-                        />
-                        {option.label}
-                      </CommandItem>
-                    ))}
-                  </CommandGroup>
-                </CommandList>
-              </Command>
-            </PopoverContent>
-          </Popover>
-          <Button
-            variant="filled"
-            className="h-auto"
-            onClick={handleCreateNewFeed}
-          >
-            Create New Feed
-          </Button>
-        </div>
-      </div>
-      {isLoading ? (
-        <div className="flex items-center justify-center p-8">
-          <Loader2 className="h-8 w-8 animate-spin" />
-          <span className="ml-2">Loading your feeds...</span>
-        </div>
-      ) : filteredFeeds && filteredFeeds.length === 0 ? (
-        <div className="flex flex-col items-center justify-center p-8 text-center">
-          <p className="text-gray-500 mb-4">
-            {filters.term || filters.value !== "all"
-              ? "No feeds match your search criteria."
-              : "You haven't created any feeds yet."}
-          </p>
-          {!filters.term && filters.value === "all" && (
-            <Button variant="filled" onClick={handleCreateNewFeed}>
-              Create Your First Feed
-            </Button>
-          )}
-        </div>
-      ) : (
-        <div className="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 gap-4 sm:gap-5">
-          {filteredFeeds &&
-            filteredFeeds.map((feed) => <FeedCard key={feed.id} feed={feed} />)}
-        </div>
-      )}
-    </div>
-  );
-}
diff --git a/apps/app/src/components/profile/overview/index.tsx b/apps/app/src/components/profile/overview/index.tsx
deleted file mode 100644
index 603fb214..00000000
--- a/apps/app/src/components/profile/overview/index.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ApproverFor } from "./ApproverFor";
-// import { CurateCTA } from "./CurateCTA";
-import { CuratorFor } from "./CuratorFor";
-// import { TopBadges } from "./TopBadges";
-// import { UserStats } from "./UserStats";
-
-export function ProfileOverview() {
-  return (
-    <div className="flex flex-col items-stretch gap-4 sm:gap-6">
-      {/* <div className="grid grid-cols-1 md:grid-cols-2 gap-4 sm:gap-6">
-        <UserStats />
-        <TopBadges />
-      </div> */}
-      {/* <CurateCTA /> */}
-      <div className="grid grid-cols-1 md:grid-cols-2 gap-4 sm:gap-6">
-        <ApproverFor />
-        <CuratorFor />
-      </div>
-    </div>
-  );
-}
diff --git a/apps/app/src/components/ui/tabs.tsx b/apps/app/src/components/ui/tabs.tsx
index af846886..297a1bff 100644
--- a/apps/app/src/components/ui/tabs.tsx
+++ b/apps/app/src/components/ui/tabs.tsx
@@ -12,7 +12,7 @@ const TabsList = React.forwardRef<
   <TabsPrimitive.List
     ref={ref}
     className={cn(
-      "inline-flex h-9 items-center justify-center rounded-lg bg-slate-100 p-1 text-neutral-500 dark:bg-neutral-800 dark:text-neutral-400",
+      "inline-flex w-full items-center justify-start border border-neutral-300 rounded-lg bg-white p-1 text-black dark:bg-neutral-800 dark:text-neutral-400",
       className,
     )}
     {...props}
@@ -27,7 +27,7 @@ const TabsTrigger = React.forwardRef<
   <TabsPrimitive.Trigger
     ref={ref}
     className={cn(
-      "inline-flex items-center justify-center whitespace-nowrap rounded-md px-3 py-1 text-sm font-medium ring-offset-white transition-all focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-neutral-950 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-white data-[state=active]:text-neutral-950 data-[state=active]:shadow dark:ring-offset-neutral-950 dark:focus-visible:ring-neutral-300 dark:data-[state=active]:bg-neutral-950 dark:data-[state=active]:text-neutral-50",
+      "inline-flex shrink-0 min-w-[85.4px] gap-2 items-center justify-center whitespace-nowrap rounded-[4px] px-3 py-1.5 text-base font-normal ring-offset-white transition-all focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-neutral-950 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-black data-[state=active]:text-white dark:ring-offset-neutral-950 dark:focus-visible:ring-neutral-300 dark:data-[state=active]:bg-neutral-950 dark:data-[state=active]:text-neutral-50",
       className,
     )}
     {...props}
diff --git a/apps/app/src/components/ui/textarea.tsx b/apps/app/src/components/ui/textarea.tsx
index 7a67cb43..becd1237 100644
--- a/apps/app/src/components/ui/textarea.tsx
+++ b/apps/app/src/components/ui/textarea.tsx
@@ -9,7 +9,7 @@ const Textarea = React.forwardRef<
   return (
     <textarea
       className={cn(
-        "flex min-h-[60px] w-full rounded-md border border-neutral-200 bg-transparent px-3 py-2 text-base shadow-sm placeholder:text-neutral-500 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-neutral-950 disabled:cursor-not-allowed disabled:opacity-50 md:text-sm dark:border-neutral-800 dark:placeholder:text-neutral-400 dark:focus-visible:ring-neutral-300",
+        "min-h-[100px] flex h-auto w-full rounded border border-neutral-400 bg-white px-2.5 py-2 text-base shadow-sm transition-colors placeholder:text-neutral-500 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-neutral-950 disabled:cursor-not-allowed disabled:opacity-50 md:text-base dark:border-neutral-800 dark:placeholder:text-neutral-400 dark:focus-visible:ring-neutral-300",
         className,
       )}
       ref={ref}
diff --git a/apps/app/src/routes/_layout/edit/feed.$feedId.tsx b/apps/app/src/hooks/use-edit-feed.ts
similarity index 57%
rename from apps/app/src/routes/_layout/edit/feed.$feedId.tsx
rename to apps/app/src/hooks/use-edit-feed.ts
index 07909be2..81237d81 100644
--- a/apps/app/src/routes/_layout/edit/feed.$feedId.tsx
+++ b/apps/app/src/hooks/use-edit-feed.ts
@@ -1,26 +1,23 @@
 import type { FeedConfig } from "@curatedotfun/types";
-import { createFileRoute, useNavigate } from "@tanstack/react-router";
-import { Terminal } from "lucide-react";
+import { useNavigate } from "@tanstack/react-router";
 import { useEffect, useState } from "react";
-import { JsonEditor } from "../../../components/content-progress/JsonEditor";
-import { ImageUpload } from "../../../components/ImageUpload";
-import {
-  Alert,
-  AlertDescription,
-  AlertTitle,
-} from "../../../components/ui/alert";
-import { Button } from "../../../components/ui/button";
-import { Label } from "../../../components/ui/label";
-import { Loading } from "../../../components/ui/loading";
-import { toast } from "../../../hooks/use-toast";
-import { useDeleteFeed, useFeed, useUpdateFeed } from "../../../lib/api";
+import { toast } from "../hooks/use-toast";
+import { useDeleteFeed, useFeed, useUpdateFeed } from "../lib/api";
 
-export const Route = createFileRoute("/_layout/edit/feed/$feedId")({
-  component: EditFeedComponent,
-});
-
-function EditFeedComponent() {
-  const { feedId } = Route.useParams();
+export function useEditFeed(feedId: string): {
+  feedData: unknown;
+  isLoadingFeed: boolean;
+  feedError: Error | null;
+  currentConfig: FeedConfig | null;
+  jsonString: string;
+  updateFeedMutation: ReturnType<typeof useUpdateFeed>;
+  deleteFeedMutation: ReturnType<typeof useDeleteFeed>;
+  handleImageUploaded: (ipfsHash: string, ipfsUrl: string) => void;
+  handleJsonChange: (newJsonString: string) => void;
+  handleConfigChange: (config: FeedConfig) => void;
+  handleSaveChanges: () => Promise<void>;
+  handleDeleteFeed: () => Promise<void>;
+} {
   const navigate = useNavigate();
   const {
     data: feedData,
@@ -33,21 +30,7 @@ function EditFeedComponent() {
   const [currentConfig, setCurrentConfig] = useState<FeedConfig | null>(null);
   const [jsonString, setJsonString] = useState<string>("");
 
-  const handleImageUploaded = (_ipfsHash: string, ipfsUrl: string) => {
-    setCurrentConfig((prevConfig) => {
-      const newConfig = {
-        ...(prevConfig || { id: feedId, name: "", description: "" }),
-        image: ipfsUrl,
-      } as FeedConfig;
-      setJsonString(JSON.stringify(newConfig, null, 2));
-      return newConfig;
-    });
-    toast({
-      title: "Image Updated",
-      description: "Image URL has been updated in the JSON config.",
-    });
-  };
-
+  // Initialize config when feed data loads
   useEffect(() => {
     if (feedData?.config) {
       const configWithPotentiallyMissingFields: FeedConfig = {
@@ -73,6 +56,17 @@ function EditFeedComponent() {
     }
   }, [feedData]);
 
+  const handleImageUploaded = (_ipfsHash: string, ipfsUrl: string) => {
+    setCurrentConfig((prevConfig) => {
+      const newConfig = {
+        ...(prevConfig || { id: feedId, name: "", description: "" }),
+        image: ipfsUrl,
+      } as FeedConfig;
+      setJsonString(JSON.stringify(newConfig, null, 2));
+      return newConfig;
+    });
+  };
+
   const handleJsonChange = (newJsonString: string) => {
     setJsonString(newJsonString);
     try {
@@ -80,9 +74,19 @@ function EditFeedComponent() {
       setCurrentConfig(parsedConfig);
     } catch (e) {
       console.error("Invalid JSON:", e);
+      toast({
+        title: "Invalid JSON",
+        description: "Please check your JSON syntax and try again.",
+        variant: "destructive",
+      });
     }
   };
 
+  const handleConfigChange = (config: FeedConfig) => {
+    setCurrentConfig(config);
+    setJsonString(JSON.stringify(config, null, 2));
+  };
+
   const handleSaveChanges = async () => {
     if (!currentConfig) {
       toast({
@@ -93,7 +97,7 @@ function EditFeedComponent() {
       return;
     }
     try {
-      await updateFeedMutation.mutateAsync({ config: currentConfig });
+      await updateFeedMutation.mutateAsync(currentConfig);
       toast({
         title: "Success",
         description: "Feed configuration updated successfully.",
@@ -131,60 +135,18 @@ function EditFeedComponent() {
     }
   };
 
-  if (isLoadingFeed)
-    return (
-      <div className="p-4">
-        <Loading /> <p>Loading feed details...</p>
-      </div>
-    );
-  if (feedError)
-    return (
-      <Alert variant="destructive" className="m-4">
-        <Terminal className="h-4 w-4" />
-        <AlertTitle>Error Loading Feed</AlertTitle>
-        <AlertDescription>{feedError.message}</AlertDescription>
-      </Alert>
-    );
-  if (!feedData) return <div className="p-4">Feed not found.</div>;
-
-  return (
-    <div className="container mx-auto p-4 space-y-6">
-      <h1 className="text-2xl font-bold">
-        Edit Feed: {currentConfig?.name || feedId}
-      </h1>
-
-      <ImageUpload
-        label="Feed Image"
-        initialImageUrl={currentConfig?.image || null}
-        onUploadSuccess={handleImageUploaded}
-        recommendedText="Update the image for this feed."
-      />
-
-      <div className="space-y-2">
-        <Label>Feed Configuration (JSON)</Label>
-        <JsonEditor
-          jsonContent={jsonString}
-          onContentChange={handleJsonChange}
-        />
-      </div>
-
-      <div className="flex space-x-4">
-        <Button
-          onClick={handleSaveChanges}
-          disabled={updateFeedMutation.isPending}
-        >
-          {updateFeedMutation.isPending ? <Loading /> : null}
-          Save Changes
-        </Button>
-        <Button
-          variant="destructive"
-          onClick={handleDeleteFeed}
-          disabled={deleteFeedMutation.isPending}
-        >
-          {deleteFeedMutation.isPending ? <Loading /> : null}
-          Delete Feed
-        </Button>
-      </div>
-    </div>
-  );
+  return {
+    feedData,
+    isLoadingFeed,
+    feedError,
+    currentConfig,
+    jsonString,
+    updateFeedMutation,
+    deleteFeedMutation,
+    handleImageUploaded,
+    handleJsonChange,
+    handleConfigChange,
+    handleSaveChanges,
+    handleDeleteFeed,
+  };
 }
diff --git a/apps/app/src/routeTree.gen.ts b/apps/app/src/routeTree.gen.ts
index 9cccef33..411b9ed4 100644
--- a/apps/app/src/routeTree.gen.ts
+++ b/apps/app/src/routeTree.gen.ts
@@ -13,29 +13,27 @@ import { createFileRoute } from '@tanstack/react-router'
 import { Route as rootRouteImport } from './routes/__root'
 import { Route as LayoutRouteImport } from './routes/_layout'
 import { Route as LayoutIndexRouteImport } from './routes/_layout/index'
+import { Route as LayoutProfileRouteImport } from './routes/_layout/profile'
 import { Route as LayoutLeaderboardRouteImport } from './routes/_layout/leaderboard'
 import { Route as LayoutTestIndexRouteImport } from './routes/_layout/test/index'
 import { Route as LayoutProfileIndexRouteImport } from './routes/_layout/profile/index'
 import { Route as LayoutPluginIndexRouteImport } from './routes/_layout/plugin/index'
+import { Route as LayoutProfileTabsRouteImport } from './routes/_layout/profile/_tabs'
 import { Route as LayoutPluginPluginIdRouteImport } from './routes/_layout/plugin/$pluginId'
 import { Route as LayoutFeedFeedIdRouteImport } from './routes/_layout/feed/$feedId'
 import { Route as LayoutCreatePluginRouteImport } from './routes/_layout/create/plugin'
 import { Route as LayoutCreateFeedRouteImport } from './routes/_layout/create/feed'
-import { Route as LayoutProfileSettingsRouteRouteImport } from './routes/_layout/profile/settings/route'
-import { Route as LayoutProfileTabsRouteRouteImport } from './routes/_layout/profile/_tabs/route'
-import { Route as LayoutProfileSettingsIndexRouteImport } from './routes/_layout/profile/settings/index'
 import { Route as LayoutCreateFeedIndexRouteImport } from './routes/_layout/create/feed/index'
-import { Route as LayoutProfileSettingsPreferencesRouteImport } from './routes/_layout/profile/settings/preferences'
-import { Route as LayoutProfileSettingsNotificationsRouteImport } from './routes/_layout/profile/settings/notifications'
-import { Route as LayoutProfileSettingsConnectionsRouteImport } from './routes/_layout/profile/settings/connections'
 import { Route as LayoutProfileTabsOverviewRouteImport } from './routes/_layout/profile/_tabs/overview'
 import { Route as LayoutProfileTabsMyFeedsRouteImport } from './routes/_layout/profile/_tabs/my-feeds'
 import { Route as LayoutProfileTabsActivityRouteImport } from './routes/_layout/profile/_tabs/activity'
 import { Route as LayoutFeedFeedIdTabsRouteImport } from './routes/_layout/feed/$feedId/_tabs'
-import { Route as LayoutEditFeedFeedIdRouteImport } from './routes/_layout/edit/feed.$feedId'
+import { Route as LayoutEditFeedFeedIdRouteImport } from './routes/_layout/edit/feed/$feedId'
 import { Route as LayoutCreateFeedSettingsRouteImport } from './routes/_layout/create/feed/settings'
 import { Route as LayoutCreateFeedReviewRouteImport } from './routes/_layout/create/feed/review'
+import { Route as LayoutProfileTabsSettingsIndexRouteImport } from './routes/_layout/profile/_tabs/settings/index'
 import { Route as LayoutFeedFeedIdTabsIndexRouteImport } from './routes/_layout/feed/$feedId/_tabs/index'
+import { Route as LayoutProfileTabsSettingsTabsRouteImport } from './routes/_layout/profile/_tabs/settings/_tabs'
 import { Route as LayoutFeedFeedIdTabsTokenRouteImport } from './routes/_layout/feed/$feedId/_tabs/token'
 import { Route as LayoutFeedFeedIdTabsProposalsRouteImport } from './routes/_layout/feed/$feedId/_tabs/proposals'
 import { Route as LayoutFeedFeedIdTabsProcessingRouteImport } from './routes/_layout/feed/$feedId/_tabs/processing'
@@ -43,24 +41,29 @@ import { Route as LayoutFeedFeedIdTabsPointsRouteImport } from './routes/_layout
 import { Route as LayoutFeedFeedIdTabsMembersRouteImport } from './routes/_layout/feed/$feedId/_tabs/members'
 import { Route as LayoutFeedFeedIdTabsCurationRouteImport } from './routes/_layout/feed/$feedId/_tabs/curation'
 import { Route as LayoutFeedFeedIdTabsSettingsIndexRouteImport } from './routes/_layout/feed/$feedId/_tabs/settings/index'
+import { Route as LayoutProfileTabsSettingsTabsPreferencesRouteImport } from './routes/_layout/profile/_tabs/settings/_tabs/preferences'
+import { Route as LayoutProfileTabsSettingsTabsNotificationsRouteImport } from './routes/_layout/profile/_tabs/settings/_tabs/notifications'
+import { Route as LayoutProfileTabsSettingsTabsConnectionsRouteImport } from './routes/_layout/profile/_tabs/settings/_tabs/connections'
 import { Route as LayoutFeedFeedIdTabsSettingsConnectedRouteImport } from './routes/_layout/feed/$feedId/_tabs/settings/connected'
 
-const LayoutProfileRouteImport = createFileRoute('/_layout/profile')()
+const LayoutProfileTabsSettingsRouteImport = createFileRoute(
+  '/_layout/profile/_tabs/settings',
+)()
 
 const LayoutRoute = LayoutRouteImport.update({
   id: '/_layout',
   getParentRoute: () => rootRouteImport,
 } as any)
-const LayoutProfileRoute = LayoutProfileRouteImport.update({
-  id: '/profile',
-  path: '/profile',
-  getParentRoute: () => LayoutRoute,
-} as any)
 const LayoutIndexRoute = LayoutIndexRouteImport.update({
   id: '/',
   path: '/',
   getParentRoute: () => LayoutRoute,
 } as any)
+const LayoutProfileRoute = LayoutProfileRouteImport.update({
+  id: '/profile',
+  path: '/profile',
+  getParentRoute: () => LayoutRoute,
+} as any)
 const LayoutLeaderboardRoute = LayoutLeaderboardRouteImport.update({
   id: '/leaderboard',
   path: '/leaderboard',
@@ -81,6 +84,10 @@ const LayoutPluginIndexRoute = LayoutPluginIndexRouteImport.update({
   path: '/plugin/',
   getParentRoute: () => LayoutRoute,
 } as any)
+const LayoutProfileTabsRoute = LayoutProfileTabsRouteImport.update({
+  id: '/_tabs',
+  getParentRoute: () => LayoutProfileRoute,
+} as any)
 const LayoutPluginPluginIdRoute = LayoutPluginPluginIdRouteImport.update({
   id: '/plugin/$pluginId',
   path: '/plugin/$pluginId',
@@ -101,62 +108,34 @@ const LayoutCreateFeedRoute = LayoutCreateFeedRouteImport.update({
   path: '/create/feed',
   getParentRoute: () => LayoutRoute,
 } as any)
-const LayoutProfileSettingsRouteRoute =
-  LayoutProfileSettingsRouteRouteImport.update({
+const LayoutProfileTabsSettingsRoute =
+  LayoutProfileTabsSettingsRouteImport.update({
     id: '/settings',
     path: '/settings',
-    getParentRoute: () => LayoutProfileRoute,
-  } as any)
-const LayoutProfileTabsRouteRoute = LayoutProfileTabsRouteRouteImport.update({
-  id: '/_tabs',
-  getParentRoute: () => LayoutProfileRoute,
-} as any)
-const LayoutProfileSettingsIndexRoute =
-  LayoutProfileSettingsIndexRouteImport.update({
-    id: '/',
-    path: '/',
-    getParentRoute: () => LayoutProfileSettingsRouteRoute,
+    getParentRoute: () => LayoutProfileTabsRoute,
   } as any)
 const LayoutCreateFeedIndexRoute = LayoutCreateFeedIndexRouteImport.update({
   id: '/',
   path: '/',
   getParentRoute: () => LayoutCreateFeedRoute,
 } as any)
-const LayoutProfileSettingsPreferencesRoute =
-  LayoutProfileSettingsPreferencesRouteImport.update({
-    id: '/preferences',
-    path: '/preferences',
-    getParentRoute: () => LayoutProfileSettingsRouteRoute,
-  } as any)
-const LayoutProfileSettingsNotificationsRoute =
-  LayoutProfileSettingsNotificationsRouteImport.update({
-    id: '/notifications',
-    path: '/notifications',
-    getParentRoute: () => LayoutProfileSettingsRouteRoute,
-  } as any)
-const LayoutProfileSettingsConnectionsRoute =
-  LayoutProfileSettingsConnectionsRouteImport.update({
-    id: '/connections',
-    path: '/connections',
-    getParentRoute: () => LayoutProfileSettingsRouteRoute,
-  } as any)
 const LayoutProfileTabsOverviewRoute =
   LayoutProfileTabsOverviewRouteImport.update({
     id: '/overview',
     path: '/overview',
-    getParentRoute: () => LayoutProfileTabsRouteRoute,
+    getParentRoute: () => LayoutProfileTabsRoute,
   } as any)
 const LayoutProfileTabsMyFeedsRoute =
   LayoutProfileTabsMyFeedsRouteImport.update({
     id: '/my-feeds',
     path: '/my-feeds',
-    getParentRoute: () => LayoutProfileTabsRouteRoute,
+    getParentRoute: () => LayoutProfileTabsRoute,
   } as any)
 const LayoutProfileTabsActivityRoute =
   LayoutProfileTabsActivityRouteImport.update({
     id: '/activity',
     path: '/activity',
-    getParentRoute: () => LayoutProfileTabsRouteRoute,
+    getParentRoute: () => LayoutProfileTabsRoute,
   } as any)
 const LayoutFeedFeedIdTabsRoute = LayoutFeedFeedIdTabsRouteImport.update({
   id: '/_tabs',
@@ -178,12 +157,23 @@ const LayoutCreateFeedReviewRoute = LayoutCreateFeedReviewRouteImport.update({
   path: '/review',
   getParentRoute: () => LayoutCreateFeedRoute,
 } as any)
+const LayoutProfileTabsSettingsIndexRoute =
+  LayoutProfileTabsSettingsIndexRouteImport.update({
+    id: '/',
+    path: '/',
+    getParentRoute: () => LayoutProfileTabsSettingsRoute,
+  } as any)
 const LayoutFeedFeedIdTabsIndexRoute =
   LayoutFeedFeedIdTabsIndexRouteImport.update({
     id: '/',
     path: '/',
     getParentRoute: () => LayoutFeedFeedIdTabsRoute,
   } as any)
+const LayoutProfileTabsSettingsTabsRoute =
+  LayoutProfileTabsSettingsTabsRouteImport.update({
+    id: '/_tabs',
+    getParentRoute: () => LayoutProfileTabsSettingsRoute,
+  } as any)
 const LayoutFeedFeedIdTabsTokenRoute =
   LayoutFeedFeedIdTabsTokenRouteImport.update({
     id: '/token',
@@ -226,6 +216,24 @@ const LayoutFeedFeedIdTabsSettingsIndexRoute =
     path: '/settings/',
     getParentRoute: () => LayoutFeedFeedIdTabsRoute,
   } as any)
+const LayoutProfileTabsSettingsTabsPreferencesRoute =
+  LayoutProfileTabsSettingsTabsPreferencesRouteImport.update({
+    id: '/preferences',
+    path: '/preferences',
+    getParentRoute: () => LayoutProfileTabsSettingsTabsRoute,
+  } as any)
+const LayoutProfileTabsSettingsTabsNotificationsRoute =
+  LayoutProfileTabsSettingsTabsNotificationsRouteImport.update({
+    id: '/notifications',
+    path: '/notifications',
+    getParentRoute: () => LayoutProfileTabsSettingsTabsRoute,
+  } as any)
+const LayoutProfileTabsSettingsTabsConnectionsRoute =
+  LayoutProfileTabsSettingsTabsConnectionsRouteImport.update({
+    id: '/connections',
+    path: '/connections',
+    getParentRoute: () => LayoutProfileTabsSettingsTabsRoute,
+  } as any)
 const LayoutFeedFeedIdTabsSettingsConnectedRoute =
   LayoutFeedFeedIdTabsSettingsConnectedRouteImport.update({
     id: '/settings/connected',
@@ -235,9 +243,8 @@ const LayoutFeedFeedIdTabsSettingsConnectedRoute =
 
 export interface FileRoutesByFullPath {
   '/leaderboard': typeof LayoutLeaderboardRoute
+  '/profile': typeof LayoutProfileTabsRouteWithChildren
   '/': typeof LayoutIndexRoute
-  '/profile': typeof LayoutProfileTabsRouteRouteWithChildren
-  '/profile/settings': typeof LayoutProfileSettingsRouteRouteWithChildren
   '/create/feed': typeof LayoutCreateFeedRouteWithChildren
   '/create/plugin': typeof LayoutCreatePluginRoute
   '/feed/$feedId': typeof LayoutFeedFeedIdTabsRouteWithChildren
@@ -251,28 +258,29 @@ export interface FileRoutesByFullPath {
   '/profile/activity': typeof LayoutProfileTabsActivityRoute
   '/profile/my-feeds': typeof LayoutProfileTabsMyFeedsRoute
   '/profile/overview': typeof LayoutProfileTabsOverviewRoute
-  '/profile/settings/connections': typeof LayoutProfileSettingsConnectionsRoute
-  '/profile/settings/notifications': typeof LayoutProfileSettingsNotificationsRoute
-  '/profile/settings/preferences': typeof LayoutProfileSettingsPreferencesRoute
   '/create/feed/': typeof LayoutCreateFeedIndexRoute
-  '/profile/settings/': typeof LayoutProfileSettingsIndexRoute
   '/feed/$feedId/curation': typeof LayoutFeedFeedIdTabsCurationRoute
   '/feed/$feedId/members': typeof LayoutFeedFeedIdTabsMembersRoute
   '/feed/$feedId/points': typeof LayoutFeedFeedIdTabsPointsRoute
   '/feed/$feedId/processing': typeof LayoutFeedFeedIdTabsProcessingRoute
   '/feed/$feedId/proposals': typeof LayoutFeedFeedIdTabsProposalsRoute
   '/feed/$feedId/token': typeof LayoutFeedFeedIdTabsTokenRoute
+  '/profile/settings': typeof LayoutProfileTabsSettingsTabsRouteWithChildren
   '/feed/$feedId/': typeof LayoutFeedFeedIdTabsIndexRoute
+  '/profile/settings/': typeof LayoutProfileTabsSettingsIndexRoute
   '/feed/$feedId/settings/connected': typeof LayoutFeedFeedIdTabsSettingsConnectedRoute
+  '/profile/settings/connections': typeof LayoutProfileTabsSettingsTabsConnectionsRoute
+  '/profile/settings/notifications': typeof LayoutProfileTabsSettingsTabsNotificationsRoute
+  '/profile/settings/preferences': typeof LayoutProfileTabsSettingsTabsPreferencesRoute
   '/feed/$feedId/settings': typeof LayoutFeedFeedIdTabsSettingsIndexRoute
 }
 export interface FileRoutesByTo {
   '/leaderboard': typeof LayoutLeaderboardRoute
   '/': typeof LayoutIndexRoute
-  '/profile': typeof LayoutProfileIndexRoute
   '/create/plugin': typeof LayoutCreatePluginRoute
   '/feed/$feedId': typeof LayoutFeedFeedIdTabsIndexRoute
   '/plugin/$pluginId': typeof LayoutPluginPluginIdRoute
+  '/profile': typeof LayoutProfileIndexRoute
   '/plugin': typeof LayoutPluginIndexRoute
   '/test': typeof LayoutTestIndexRoute
   '/create/feed/review': typeof LayoutCreateFeedReviewRoute
@@ -281,32 +289,31 @@ export interface FileRoutesByTo {
   '/profile/activity': typeof LayoutProfileTabsActivityRoute
   '/profile/my-feeds': typeof LayoutProfileTabsMyFeedsRoute
   '/profile/overview': typeof LayoutProfileTabsOverviewRoute
-  '/profile/settings/connections': typeof LayoutProfileSettingsConnectionsRoute
-  '/profile/settings/notifications': typeof LayoutProfileSettingsNotificationsRoute
-  '/profile/settings/preferences': typeof LayoutProfileSettingsPreferencesRoute
   '/create/feed': typeof LayoutCreateFeedIndexRoute
-  '/profile/settings': typeof LayoutProfileSettingsIndexRoute
   '/feed/$feedId/curation': typeof LayoutFeedFeedIdTabsCurationRoute
   '/feed/$feedId/members': typeof LayoutFeedFeedIdTabsMembersRoute
   '/feed/$feedId/points': typeof LayoutFeedFeedIdTabsPointsRoute
   '/feed/$feedId/processing': typeof LayoutFeedFeedIdTabsProcessingRoute
   '/feed/$feedId/proposals': typeof LayoutFeedFeedIdTabsProposalsRoute
   '/feed/$feedId/token': typeof LayoutFeedFeedIdTabsTokenRoute
+  '/profile/settings': typeof LayoutProfileTabsSettingsIndexRoute
   '/feed/$feedId/settings/connected': typeof LayoutFeedFeedIdTabsSettingsConnectedRoute
+  '/profile/settings/connections': typeof LayoutProfileTabsSettingsTabsConnectionsRoute
+  '/profile/settings/notifications': typeof LayoutProfileTabsSettingsTabsNotificationsRoute
+  '/profile/settings/preferences': typeof LayoutProfileTabsSettingsTabsPreferencesRoute
   '/feed/$feedId/settings': typeof LayoutFeedFeedIdTabsSettingsIndexRoute
 }
 export interface FileRoutesById {
   __root__: typeof rootRouteImport
   '/_layout': typeof LayoutRouteWithChildren
   '/_layout/leaderboard': typeof LayoutLeaderboardRoute
-  '/_layout/': typeof LayoutIndexRoute
   '/_layout/profile': typeof LayoutProfileRouteWithChildren
-  '/_layout/profile/_tabs': typeof LayoutProfileTabsRouteRouteWithChildren
-  '/_layout/profile/settings': typeof LayoutProfileSettingsRouteRouteWithChildren
+  '/_layout/': typeof LayoutIndexRoute
   '/_layout/create/feed': typeof LayoutCreateFeedRouteWithChildren
   '/_layout/create/plugin': typeof LayoutCreatePluginRoute
   '/_layout/feed/$feedId': typeof LayoutFeedFeedIdRouteWithChildren
   '/_layout/plugin/$pluginId': typeof LayoutPluginPluginIdRoute
+  '/_layout/profile/_tabs': typeof LayoutProfileTabsRouteWithChildren
   '/_layout/plugin/': typeof LayoutPluginIndexRoute
   '/_layout/profile/': typeof LayoutProfileIndexRoute
   '/_layout/test/': typeof LayoutTestIndexRoute
@@ -317,28 +324,29 @@ export interface FileRoutesById {
   '/_layout/profile/_tabs/activity': typeof LayoutProfileTabsActivityRoute
   '/_layout/profile/_tabs/my-feeds': typeof LayoutProfileTabsMyFeedsRoute
   '/_layout/profile/_tabs/overview': typeof LayoutProfileTabsOverviewRoute
-  '/_layout/profile/settings/connections': typeof LayoutProfileSettingsConnectionsRoute
-  '/_layout/profile/settings/notifications': typeof LayoutProfileSettingsNotificationsRoute
-  '/_layout/profile/settings/preferences': typeof LayoutProfileSettingsPreferencesRoute
   '/_layout/create/feed/': typeof LayoutCreateFeedIndexRoute
-  '/_layout/profile/settings/': typeof LayoutProfileSettingsIndexRoute
   '/_layout/feed/$feedId/_tabs/curation': typeof LayoutFeedFeedIdTabsCurationRoute
   '/_layout/feed/$feedId/_tabs/members': typeof LayoutFeedFeedIdTabsMembersRoute
   '/_layout/feed/$feedId/_tabs/points': typeof LayoutFeedFeedIdTabsPointsRoute
   '/_layout/feed/$feedId/_tabs/processing': typeof LayoutFeedFeedIdTabsProcessingRoute
   '/_layout/feed/$feedId/_tabs/proposals': typeof LayoutFeedFeedIdTabsProposalsRoute
   '/_layout/feed/$feedId/_tabs/token': typeof LayoutFeedFeedIdTabsTokenRoute
+  '/_layout/profile/_tabs/settings': typeof LayoutProfileTabsSettingsRouteWithChildren
+  '/_layout/profile/_tabs/settings/_tabs': typeof LayoutProfileTabsSettingsTabsRouteWithChildren
   '/_layout/feed/$feedId/_tabs/': typeof LayoutFeedFeedIdTabsIndexRoute
+  '/_layout/profile/_tabs/settings/': typeof LayoutProfileTabsSettingsIndexRoute
   '/_layout/feed/$feedId/_tabs/settings/connected': typeof LayoutFeedFeedIdTabsSettingsConnectedRoute
+  '/_layout/profile/_tabs/settings/_tabs/connections': typeof LayoutProfileTabsSettingsTabsConnectionsRoute
+  '/_layout/profile/_tabs/settings/_tabs/notifications': typeof LayoutProfileTabsSettingsTabsNotificationsRoute
+  '/_layout/profile/_tabs/settings/_tabs/preferences': typeof LayoutProfileTabsSettingsTabsPreferencesRoute
   '/_layout/feed/$feedId/_tabs/settings/': typeof LayoutFeedFeedIdTabsSettingsIndexRoute
 }
 export interface FileRouteTypes {
   fileRoutesByFullPath: FileRoutesByFullPath
   fullPaths:
     | '/leaderboard'
-    | '/'
     | '/profile'
-    | '/profile/settings'
+    | '/'
     | '/create/feed'
     | '/create/plugin'
     | '/feed/$feedId'
@@ -352,28 +360,29 @@ export interface FileRouteTypes {
     | '/profile/activity'
     | '/profile/my-feeds'
     | '/profile/overview'
-    | '/profile/settings/connections'
-    | '/profile/settings/notifications'
-    | '/profile/settings/preferences'
     | '/create/feed/'
-    | '/profile/settings/'
     | '/feed/$feedId/curation'
     | '/feed/$feedId/members'
     | '/feed/$feedId/points'
     | '/feed/$feedId/processing'
     | '/feed/$feedId/proposals'
     | '/feed/$feedId/token'
+    | '/profile/settings'
     | '/feed/$feedId/'
+    | '/profile/settings/'
     | '/feed/$feedId/settings/connected'
+    | '/profile/settings/connections'
+    | '/profile/settings/notifications'
+    | '/profile/settings/preferences'
     | '/feed/$feedId/settings'
   fileRoutesByTo: FileRoutesByTo
   to:
     | '/leaderboard'
     | '/'
-    | '/profile'
     | '/create/plugin'
     | '/feed/$feedId'
     | '/plugin/$pluginId'
+    | '/profile'
     | '/plugin'
     | '/test'
     | '/create/feed/review'
@@ -382,31 +391,30 @@ export interface FileRouteTypes {
     | '/profile/activity'
     | '/profile/my-feeds'
     | '/profile/overview'
-    | '/profile/settings/connections'
-    | '/profile/settings/notifications'
-    | '/profile/settings/preferences'
     | '/create/feed'
-    | '/profile/settings'
     | '/feed/$feedId/curation'
     | '/feed/$feedId/members'
     | '/feed/$feedId/points'
     | '/feed/$feedId/processing'
     | '/feed/$feedId/proposals'
     | '/feed/$feedId/token'
+    | '/profile/settings'
     | '/feed/$feedId/settings/connected'
+    | '/profile/settings/connections'
+    | '/profile/settings/notifications'
+    | '/profile/settings/preferences'
     | '/feed/$feedId/settings'
   id:
     | '__root__'
     | '/_layout'
     | '/_layout/leaderboard'
-    | '/_layout/'
     | '/_layout/profile'
-    | '/_layout/profile/_tabs'
-    | '/_layout/profile/settings'
+    | '/_layout/'
     | '/_layout/create/feed'
     | '/_layout/create/plugin'
     | '/_layout/feed/$feedId'
     | '/_layout/plugin/$pluginId'
+    | '/_layout/profile/_tabs'
     | '/_layout/plugin/'
     | '/_layout/profile/'
     | '/_layout/test/'
@@ -417,19 +425,21 @@ export interface FileRouteTypes {
     | '/_layout/profile/_tabs/activity'
     | '/_layout/profile/_tabs/my-feeds'
     | '/_layout/profile/_tabs/overview'
-    | '/_layout/profile/settings/connections'
-    | '/_layout/profile/settings/notifications'
-    | '/_layout/profile/settings/preferences'
     | '/_layout/create/feed/'
-    | '/_layout/profile/settings/'
     | '/_layout/feed/$feedId/_tabs/curation'
     | '/_layout/feed/$feedId/_tabs/members'
     | '/_layout/feed/$feedId/_tabs/points'
     | '/_layout/feed/$feedId/_tabs/processing'
     | '/_layout/feed/$feedId/_tabs/proposals'
     | '/_layout/feed/$feedId/_tabs/token'
+    | '/_layout/profile/_tabs/settings'
+    | '/_layout/profile/_tabs/settings/_tabs'
     | '/_layout/feed/$feedId/_tabs/'
+    | '/_layout/profile/_tabs/settings/'
     | '/_layout/feed/$feedId/_tabs/settings/connected'
+    | '/_layout/profile/_tabs/settings/_tabs/connections'
+    | '/_layout/profile/_tabs/settings/_tabs/notifications'
+    | '/_layout/profile/_tabs/settings/_tabs/preferences'
     | '/_layout/feed/$feedId/_tabs/settings/'
   fileRoutesById: FileRoutesById
 }
@@ -446,13 +456,6 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof LayoutRouteImport
       parentRoute: typeof rootRouteImport
     }
-    '/_layout/profile': {
-      id: '/_layout/profile'
-      path: '/profile'
-      fullPath: '/profile'
-      preLoaderRoute: typeof LayoutProfileRouteImport
-      parentRoute: typeof LayoutRoute
-    }
     '/_layout/': {
       id: '/_layout/'
       path: '/'
@@ -460,6 +463,13 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof LayoutIndexRouteImport
       parentRoute: typeof LayoutRoute
     }
+    '/_layout/profile': {
+      id: '/_layout/profile'
+      path: '/profile'
+      fullPath: '/profile'
+      preLoaderRoute: typeof LayoutProfileRouteImport
+      parentRoute: typeof LayoutRoute
+    }
     '/_layout/leaderboard': {
       id: '/_layout/leaderboard'
       path: '/leaderboard'
@@ -488,6 +498,13 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof LayoutPluginIndexRouteImport
       parentRoute: typeof LayoutRoute
     }
+    '/_layout/profile/_tabs': {
+      id: '/_layout/profile/_tabs'
+      path: ''
+      fullPath: '/profile'
+      preLoaderRoute: typeof LayoutProfileTabsRouteImport
+      parentRoute: typeof LayoutProfileRoute
+    }
     '/_layout/plugin/$pluginId': {
       id: '/_layout/plugin/$pluginId'
       path: '/plugin/$pluginId'
@@ -516,26 +533,12 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof LayoutCreateFeedRouteImport
       parentRoute: typeof LayoutRoute
     }
-    '/_layout/profile/settings': {
-      id: '/_layout/profile/settings'
+    '/_layout/profile/_tabs/settings': {
+      id: '/_layout/profile/_tabs/settings'
       path: '/settings'
       fullPath: '/profile/settings'
-      preLoaderRoute: typeof LayoutProfileSettingsRouteRouteImport
-      parentRoute: typeof LayoutProfileRoute
-    }
-    '/_layout/profile/_tabs': {
-      id: '/_layout/profile/_tabs'
-      path: '/profile'
-      fullPath: '/profile'
-      preLoaderRoute: typeof LayoutProfileTabsRouteRouteImport
-      parentRoute: typeof LayoutProfileRoute
-    }
-    '/_layout/profile/settings/': {
-      id: '/_layout/profile/settings/'
-      path: '/'
-      fullPath: '/profile/settings/'
-      preLoaderRoute: typeof LayoutProfileSettingsIndexRouteImport
-      parentRoute: typeof LayoutProfileSettingsRouteRoute
+      preLoaderRoute: typeof LayoutProfileTabsSettingsRouteImport
+      parentRoute: typeof LayoutProfileTabsRoute
     }
     '/_layout/create/feed/': {
       id: '/_layout/create/feed/'
@@ -544,47 +547,26 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof LayoutCreateFeedIndexRouteImport
       parentRoute: typeof LayoutCreateFeedRoute
     }
-    '/_layout/profile/settings/preferences': {
-      id: '/_layout/profile/settings/preferences'
-      path: '/preferences'
-      fullPath: '/profile/settings/preferences'
-      preLoaderRoute: typeof LayoutProfileSettingsPreferencesRouteImport
-      parentRoute: typeof LayoutProfileSettingsRouteRoute
-    }
-    '/_layout/profile/settings/notifications': {
-      id: '/_layout/profile/settings/notifications'
-      path: '/notifications'
-      fullPath: '/profile/settings/notifications'
-      preLoaderRoute: typeof LayoutProfileSettingsNotificationsRouteImport
-      parentRoute: typeof LayoutProfileSettingsRouteRoute
-    }
-    '/_layout/profile/settings/connections': {
-      id: '/_layout/profile/settings/connections'
-      path: '/connections'
-      fullPath: '/profile/settings/connections'
-      preLoaderRoute: typeof LayoutProfileSettingsConnectionsRouteImport
-      parentRoute: typeof LayoutProfileSettingsRouteRoute
-    }
     '/_layout/profile/_tabs/overview': {
       id: '/_layout/profile/_tabs/overview'
       path: '/overview'
       fullPath: '/profile/overview'
       preLoaderRoute: typeof LayoutProfileTabsOverviewRouteImport
-      parentRoute: typeof LayoutProfileTabsRouteRoute
+      parentRoute: typeof LayoutProfileTabsRoute
     }
     '/_layout/profile/_tabs/my-feeds': {
       id: '/_layout/profile/_tabs/my-feeds'
       path: '/my-feeds'
       fullPath: '/profile/my-feeds'
       preLoaderRoute: typeof LayoutProfileTabsMyFeedsRouteImport
-      parentRoute: typeof LayoutProfileTabsRouteRoute
+      parentRoute: typeof LayoutProfileTabsRoute
     }
     '/_layout/profile/_tabs/activity': {
       id: '/_layout/profile/_tabs/activity'
       path: '/activity'
       fullPath: '/profile/activity'
       preLoaderRoute: typeof LayoutProfileTabsActivityRouteImport
-      parentRoute: typeof LayoutProfileTabsRouteRoute
+      parentRoute: typeof LayoutProfileTabsRoute
     }
     '/_layout/feed/$feedId/_tabs': {
       id: '/_layout/feed/$feedId/_tabs'
@@ -614,6 +596,13 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof LayoutCreateFeedReviewRouteImport
       parentRoute: typeof LayoutCreateFeedRoute
     }
+    '/_layout/profile/_tabs/settings/': {
+      id: '/_layout/profile/_tabs/settings/'
+      path: '/'
+      fullPath: '/profile/settings/'
+      preLoaderRoute: typeof LayoutProfileTabsSettingsIndexRouteImport
+      parentRoute: typeof LayoutProfileTabsSettingsRoute
+    }
     '/_layout/feed/$feedId/_tabs/': {
       id: '/_layout/feed/$feedId/_tabs/'
       path: '/'
@@ -621,6 +610,13 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof LayoutFeedFeedIdTabsIndexRouteImport
       parentRoute: typeof LayoutFeedFeedIdTabsRoute
     }
+    '/_layout/profile/_tabs/settings/_tabs': {
+      id: '/_layout/profile/_tabs/settings/_tabs'
+      path: '/settings'
+      fullPath: '/profile/settings'
+      preLoaderRoute: typeof LayoutProfileTabsSettingsTabsRouteImport
+      parentRoute: typeof LayoutProfileTabsSettingsRoute
+    }
     '/_layout/feed/$feedId/_tabs/token': {
       id: '/_layout/feed/$feedId/_tabs/token'
       path: '/token'
@@ -670,6 +666,27 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof LayoutFeedFeedIdTabsSettingsIndexRouteImport
       parentRoute: typeof LayoutFeedFeedIdTabsRoute
     }
+    '/_layout/profile/_tabs/settings/_tabs/preferences': {
+      id: '/_layout/profile/_tabs/settings/_tabs/preferences'
+      path: '/preferences'
+      fullPath: '/profile/settings/preferences'
+      preLoaderRoute: typeof LayoutProfileTabsSettingsTabsPreferencesRouteImport
+      parentRoute: typeof LayoutProfileTabsSettingsTabsRoute
+    }
+    '/_layout/profile/_tabs/settings/_tabs/notifications': {
+      id: '/_layout/profile/_tabs/settings/_tabs/notifications'
+      path: '/notifications'
+      fullPath: '/profile/settings/notifications'
+      preLoaderRoute: typeof LayoutProfileTabsSettingsTabsNotificationsRouteImport
+      parentRoute: typeof LayoutProfileTabsSettingsTabsRoute
+    }
+    '/_layout/profile/_tabs/settings/_tabs/connections': {
+      id: '/_layout/profile/_tabs/settings/_tabs/connections'
+      path: '/connections'
+      fullPath: '/profile/settings/connections'
+      preLoaderRoute: typeof LayoutProfileTabsSettingsTabsConnectionsRouteImport
+      parentRoute: typeof LayoutProfileTabsSettingsTabsRoute
+    }
     '/_layout/feed/$feedId/_tabs/settings/connected': {
       id: '/_layout/feed/$feedId/_tabs/settings/connected'
       path: '/settings/connected'
@@ -680,56 +697,68 @@ declare module '@tanstack/react-router' {
   }
 }
 
-interface LayoutProfileTabsRouteRouteChildren {
-  LayoutProfileTabsActivityRoute: typeof LayoutProfileTabsActivityRoute
-  LayoutProfileTabsMyFeedsRoute: typeof LayoutProfileTabsMyFeedsRoute
-  LayoutProfileTabsOverviewRoute: typeof LayoutProfileTabsOverviewRoute
+interface LayoutProfileTabsSettingsTabsRouteChildren {
+  LayoutProfileTabsSettingsTabsConnectionsRoute: typeof LayoutProfileTabsSettingsTabsConnectionsRoute
+  LayoutProfileTabsSettingsTabsNotificationsRoute: typeof LayoutProfileTabsSettingsTabsNotificationsRoute
+  LayoutProfileTabsSettingsTabsPreferencesRoute: typeof LayoutProfileTabsSettingsTabsPreferencesRoute
 }
 
-const LayoutProfileTabsRouteRouteChildren: LayoutProfileTabsRouteRouteChildren =
+const LayoutProfileTabsSettingsTabsRouteChildren: LayoutProfileTabsSettingsTabsRouteChildren =
   {
-    LayoutProfileTabsActivityRoute: LayoutProfileTabsActivityRoute,
-    LayoutProfileTabsMyFeedsRoute: LayoutProfileTabsMyFeedsRoute,
-    LayoutProfileTabsOverviewRoute: LayoutProfileTabsOverviewRoute,
+    LayoutProfileTabsSettingsTabsConnectionsRoute:
+      LayoutProfileTabsSettingsTabsConnectionsRoute,
+    LayoutProfileTabsSettingsTabsNotificationsRoute:
+      LayoutProfileTabsSettingsTabsNotificationsRoute,
+    LayoutProfileTabsSettingsTabsPreferencesRoute:
+      LayoutProfileTabsSettingsTabsPreferencesRoute,
   }
 
-const LayoutProfileTabsRouteRouteWithChildren =
-  LayoutProfileTabsRouteRoute._addFileChildren(
-    LayoutProfileTabsRouteRouteChildren,
+const LayoutProfileTabsSettingsTabsRouteWithChildren =
+  LayoutProfileTabsSettingsTabsRoute._addFileChildren(
+    LayoutProfileTabsSettingsTabsRouteChildren,
   )
 
-interface LayoutProfileSettingsRouteRouteChildren {
-  LayoutProfileSettingsConnectionsRoute: typeof LayoutProfileSettingsConnectionsRoute
-  LayoutProfileSettingsNotificationsRoute: typeof LayoutProfileSettingsNotificationsRoute
-  LayoutProfileSettingsPreferencesRoute: typeof LayoutProfileSettingsPreferencesRoute
-  LayoutProfileSettingsIndexRoute: typeof LayoutProfileSettingsIndexRoute
+interface LayoutProfileTabsSettingsRouteChildren {
+  LayoutProfileTabsSettingsTabsRoute: typeof LayoutProfileTabsSettingsTabsRouteWithChildren
+  LayoutProfileTabsSettingsIndexRoute: typeof LayoutProfileTabsSettingsIndexRoute
 }
 
-const LayoutProfileSettingsRouteRouteChildren: LayoutProfileSettingsRouteRouteChildren =
+const LayoutProfileTabsSettingsRouteChildren: LayoutProfileTabsSettingsRouteChildren =
   {
-    LayoutProfileSettingsConnectionsRoute:
-      LayoutProfileSettingsConnectionsRoute,
-    LayoutProfileSettingsNotificationsRoute:
-      LayoutProfileSettingsNotificationsRoute,
-    LayoutProfileSettingsPreferencesRoute:
-      LayoutProfileSettingsPreferencesRoute,
-    LayoutProfileSettingsIndexRoute: LayoutProfileSettingsIndexRoute,
+    LayoutProfileTabsSettingsTabsRoute:
+      LayoutProfileTabsSettingsTabsRouteWithChildren,
+    LayoutProfileTabsSettingsIndexRoute: LayoutProfileTabsSettingsIndexRoute,
   }
 
-const LayoutProfileSettingsRouteRouteWithChildren =
-  LayoutProfileSettingsRouteRoute._addFileChildren(
-    LayoutProfileSettingsRouteRouteChildren,
+const LayoutProfileTabsSettingsRouteWithChildren =
+  LayoutProfileTabsSettingsRoute._addFileChildren(
+    LayoutProfileTabsSettingsRouteChildren,
   )
 
+interface LayoutProfileTabsRouteChildren {
+  LayoutProfileTabsActivityRoute: typeof LayoutProfileTabsActivityRoute
+  LayoutProfileTabsMyFeedsRoute: typeof LayoutProfileTabsMyFeedsRoute
+  LayoutProfileTabsOverviewRoute: typeof LayoutProfileTabsOverviewRoute
+  LayoutProfileTabsSettingsRoute: typeof LayoutProfileTabsSettingsRouteWithChildren
+}
+
+const LayoutProfileTabsRouteChildren: LayoutProfileTabsRouteChildren = {
+  LayoutProfileTabsActivityRoute: LayoutProfileTabsActivityRoute,
+  LayoutProfileTabsMyFeedsRoute: LayoutProfileTabsMyFeedsRoute,
+  LayoutProfileTabsOverviewRoute: LayoutProfileTabsOverviewRoute,
+  LayoutProfileTabsSettingsRoute: LayoutProfileTabsSettingsRouteWithChildren,
+}
+
+const LayoutProfileTabsRouteWithChildren =
+  LayoutProfileTabsRoute._addFileChildren(LayoutProfileTabsRouteChildren)
+
 interface LayoutProfileRouteChildren {
-  LayoutProfileTabsRouteRoute: typeof LayoutProfileTabsRouteRouteWithChildren
-  LayoutProfileSettingsRouteRoute: typeof LayoutProfileSettingsRouteRouteWithChildren
+  LayoutProfileTabsRoute: typeof LayoutProfileTabsRouteWithChildren
   LayoutProfileIndexRoute: typeof LayoutProfileIndexRoute
 }
 
 const LayoutProfileRouteChildren: LayoutProfileRouteChildren = {
-  LayoutProfileTabsRouteRoute: LayoutProfileTabsRouteRouteWithChildren,
-  LayoutProfileSettingsRouteRoute: LayoutProfileSettingsRouteRouteWithChildren,
+  LayoutProfileTabsRoute: LayoutProfileTabsRouteWithChildren,
   LayoutProfileIndexRoute: LayoutProfileIndexRoute,
 }
 
@@ -794,8 +823,8 @@ const LayoutFeedFeedIdRouteWithChildren =
 
 interface LayoutRouteChildren {
   LayoutLeaderboardRoute: typeof LayoutLeaderboardRoute
-  LayoutIndexRoute: typeof LayoutIndexRoute
   LayoutProfileRoute: typeof LayoutProfileRouteWithChildren
+  LayoutIndexRoute: typeof LayoutIndexRoute
   LayoutCreateFeedRoute: typeof LayoutCreateFeedRouteWithChildren
   LayoutCreatePluginRoute: typeof LayoutCreatePluginRoute
   LayoutFeedFeedIdRoute: typeof LayoutFeedFeedIdRouteWithChildren
@@ -807,8 +836,8 @@ interface LayoutRouteChildren {
 
 const LayoutRouteChildren: LayoutRouteChildren = {
   LayoutLeaderboardRoute: LayoutLeaderboardRoute,
-  LayoutIndexRoute: LayoutIndexRoute,
   LayoutProfileRoute: LayoutProfileRouteWithChildren,
+  LayoutIndexRoute: LayoutIndexRoute,
   LayoutCreateFeedRoute: LayoutCreateFeedRouteWithChildren,
   LayoutCreatePluginRoute: LayoutCreatePluginRoute,
   LayoutFeedFeedIdRoute: LayoutFeedFeedIdRouteWithChildren,
diff --git a/apps/app/src/routes/_layout/edit/feed/$feedId.tsx b/apps/app/src/routes/_layout/edit/feed/$feedId.tsx
new file mode 100644
index 00000000..8549c1ee
--- /dev/null
+++ b/apps/app/src/routes/_layout/edit/feed/$feedId.tsx
@@ -0,0 +1,77 @@
+import { createFileRoute } from "@tanstack/react-router";
+import { EditFeedActions } from "../../../../components/feed/EditFeedActions";
+import { EditFeedConfigSection } from "../../../../components/feed/EditFeedConfigSection";
+import { EditFeedHeader } from "../../../../components/feed/EditFeedHeader";
+import { EditFeedImageSection } from "../../../../components/feed/EditFeedImageSection";
+import { EditFeedLoadingState } from "../../../../components/feed/EditFeedLoadingState";
+import { Hero } from "../../../../components/Hero";
+import { useEditFeed } from "../../../../hooks/use-edit-feed";
+
+export const Route = createFileRoute("/_layout/edit/feed/$feedId")({
+  component: EditFeedComponent,
+});
+
+function EditFeedComponent() {
+  const { feedId } = Route.useParams();
+  const {
+    feedData,
+    isLoadingFeed,
+    feedError,
+    currentConfig,
+    jsonString,
+    updateFeedMutation,
+    deleteFeedMutation,
+    handleImageUploaded,
+    handleJsonChange,
+    handleConfigChange,
+    handleSaveChanges,
+    handleDeleteFeed,
+  } = useEditFeed(feedId);
+
+  // Show loading, error, or not found states
+  const loadingState = EditFeedLoadingState({
+    isLoadingFeed,
+    feedError,
+    feedData,
+  });
+
+  if (loadingState) {
+    return loadingState;
+  }
+
+  return (
+    <div className="min-h-screen bg-gray-50">
+      <Hero
+        title="Edit your feed configuration"
+        description="Modify your feed settings, update images, and manage your content curation preferences."
+      />
+
+      <div className="w-full px-6 py-8">
+        <div className="max-w-7xl mx-auto space-y-8">
+          <EditFeedHeader feedId={feedId} currentConfig={currentConfig} />
+
+          <EditFeedImageSection
+            currentConfig={currentConfig}
+            feedId={feedId}
+            onImageUploaded={handleImageUploaded}
+          />
+
+          <EditFeedConfigSection
+            jsonString={jsonString}
+            currentConfig={currentConfig}
+            onJsonChange={handleJsonChange}
+            onConfigChange={handleConfigChange}
+          />
+
+          <EditFeedActions
+            currentConfig={currentConfig}
+            onSaveChanges={handleSaveChanges}
+            onDeleteFeed={handleDeleteFeed}
+            updateFeedMutation={updateFeedMutation}
+            deleteFeedMutation={deleteFeedMutation}
+          />
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/apps/app/src/routes/_layout/profile.tsx b/apps/app/src/routes/_layout/profile.tsx
new file mode 100644
index 00000000..d7620187
--- /dev/null
+++ b/apps/app/src/routes/_layout/profile.tsx
@@ -0,0 +1,35 @@
+import { Outlet, createFileRoute } from "@tanstack/react-router";
+import { Container } from "../../components/Container";
+import { ProfileHeader } from "../../components/profile/ProfileHeader";
+import { useAuth } from "../../contexts/auth-context";
+import { Button } from "../../components/ui/button";
+
+export const Route = createFileRoute("/_layout/profile")({
+  component: ProfileLayout,
+});
+
+function ProfileLayout() {
+  const { isSignedIn, currentAccountId, handleSignIn } = useAuth();
+
+  if (!isSignedIn || !currentAccountId) {
+    return (
+      <main className="mx-auto w-full px-3 py-3 sm:px-4 sm:py-4 md:px-6 md:py-6 lg:px-8 lg:py-8 xl:px-12 lg:max-w-6xl xl:max-w-7xl">
+        <div className="min-h-screen mx-auto max-w-[1440px] flex flex-col gap-4 items-center justify-center">
+          <h1>Please Login to Continue</h1>
+          <Button onClick={handleSignIn}>Login</Button>
+        </div>
+      </main>
+    );
+  }
+
+  return (
+    <main className="mx-auto w-full px-3 py-3 sm:px-4 sm:py-4 md:px-6 md:py-6 lg:px-8 lg:py-8 xl:px-12 lg:max-w-6xl xl:max-w-7xl">
+      <Container>
+        <div className="flex flex-col gap-3 sm:gap-4 md:gap-6 lg:gap-8">
+          <ProfileHeader accountId={currentAccountId} />
+          <Outlet />
+        </div>
+      </Container>
+    </main>
+  );
+}
diff --git a/apps/app/src/routes/_layout/profile/_tabs.tsx b/apps/app/src/routes/_layout/profile/_tabs.tsx
new file mode 100644
index 00000000..158c004a
--- /dev/null
+++ b/apps/app/src/routes/_layout/profile/_tabs.tsx
@@ -0,0 +1,71 @@
+import {
+  Link,
+  Outlet,
+  createFileRoute,
+  useRouterState,
+} from "@tanstack/react-router";
+import {
+  Activity,
+  Newspaper,
+  ScanSearch,
+  Settings,
+  type LucideIcon,
+} from "lucide-react";
+import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs";
+
+interface TabDefinition {
+  to: string;
+  label: string;
+  icon: LucideIcon;
+}
+
+const TABS: TabDefinition[] = [
+  {
+    to: "/profile/overview",
+    label: "Overview",
+    icon: ScanSearch,
+  },
+  {
+    to: "/profile/my-feeds",
+    label: "My Feeds",
+    icon: Newspaper,
+  },
+  {
+    to: "/profile/activity",
+    label: "Activity",
+    icon: Activity,
+  },
+  {
+    to: "/profile/settings",
+    label: "Settings",
+    icon: Settings,
+  },
+];
+
+export const Route = createFileRoute("/_layout/profile/_tabs")({
+  component: ProfileTabsAreaLayout,
+});
+
+function ProfileTabsAreaLayout() {
+  const router = useRouterState();
+  const currentPath = router.location.pathname;
+  const activeTab = TABS.find((tab) => currentPath.startsWith(tab.to));
+
+  return (
+    <Tabs value={activeTab?.to ?? currentPath}>
+      <TabsList>
+        {TABS.map(({ to, label, icon: Icon }) => (
+          <Link key={label} to={to}>
+            <TabsTrigger value={to}>
+              <Icon strokeWidth={1} size={20} />
+              <span>{label}</span>
+            </TabsTrigger>
+          </Link>
+        ))}
+      </TabsList>
+      <div className="mt-4">
+        <Outlet />
+      </div>
+    </Tabs>
+  );
+}
diff --git a/apps/app/src/routes/_layout/profile/_tabs/activity.tsx b/apps/app/src/routes/_layout/profile/_tabs/activity.tsx
index 4427e5f7..923627fe 100644
--- a/apps/app/src/routes/_layout/profile/_tabs/activity.tsx
+++ b/apps/app/src/routes/_layout/profile/_tabs/activity.tsx
@@ -1,10 +1,114 @@
+import { PaginationControls } from "@/components/profile/activity/PaginationControls";
+import { Button } from "@/components/ui/button";
+import { Card, CardContent } from "@/components/ui/card";
 import { createFileRoute } from "@tanstack/react-router";
-import { ProfileActivity } from "../../../../components/profile/activity";
+import { ChevronsUpDown } from "lucide-react";
 
 export const Route = createFileRoute("/_layout/profile/_tabs/activity")({
-  component: RouteComponent,
+  component: ProfileActivity,
 });
 
-function RouteComponent() {
-  return <ProfileActivity />;
+// const transformActivityData = (activity: UserActivityStats): ActivityItem => {
+//   const baseItem: ActivityItem = {
+//     type: activity.type,
+//     time: new Date(activity.timestamp).toLocaleTimeString([], {
+//       hour: "2-digit",
+//       minute: "2-digit",
+//     }),
+//     icon: FileText, // Default icon
+//     content: {
+//       title: activity.data?.title || "",
+//       to: activity.data?.to || "",
+//     },
+//   };
+
+//   // Map activity types to appropriate icons and content
+//   switch (activity.type) {
+//     case ActivityType.CONTENT_SUBMISSION:
+//       return {
+//         ...baseItem,
+//         icon: FileText,
+//         content: {
+//           title: activity.data?.title || "",
+//           to: activity.data?.to || "",
+//         },
+//       };
+//     case ActivityType.CONTENT_APPROVAL:
+//       return {
+//         ...baseItem,
+//         icon: CheckCircle,
+//         content: {
+//           title: activity.data?.title || "",
+//           to: activity.data?.to || "",
+//         },
+//       };
+//     case ActivityType.TOKEN_BUY:
+//       return {
+//         ...baseItem,
+//         icon: ArrowDown,
+//         content: {
+//           token: activity.data?.token || "",
+//           amount: activity.data?.amount || "",
+//         },
+//         points: `+ ${activity.data?.amount || ""} ${activity.data?.token || ""}`,
+//       };
+//     case ActivityType.TOKEN_SELL:
+//       return {
+//         ...baseItem,
+//         icon: ArrowUp,
+//         content: {
+//           token: activity.data?.token || "",
+//           amount: activity.data?.amount || "",
+//         },
+//         points: `- ${activity.data?.amount || ""} ${activity.data?.token || ""}`,
+//       };
+//     case ActivityType.POINTS_REDEMPTION:
+//     case ActivityType.POINTS_AWARDED:
+//       return {
+//         ...baseItem,
+//         icon: Coins,
+//         content: {
+//           currency: activity.data?.currency || "",
+//           amount: activity.data?.amount || "",
+//         },
+//         points: `${activity.type === ActivityType.POINTS_AWARDED ? "+" : "-"} ${activity.data?.amount || ""} ${activity.data?.currency || ""}`,
+//       };
+//     default:
+//       return baseItem;
+//   }
+// };
+
+export function ProfileActivity() {
+  // const { currentAccountId } = useAuth();
+  // const { data: userActivity } = useUserActivity(
+  //   currentAccountId || "",
+  // );
+
+  // const transformedActivity = userActivity?.map(transformActivityData);
+  const hasData = false; // Currently no data is loaded
+
+  return (
+    <div>
+      <Card className="mb-3">
+        <CardContent className="p-0">
+          <div className="flex justify-between items-center py-3 px-4">
+            <h2 className="text-2xl mt-2 font-semibold">Activity Log</h2>
+            <Button variant="outline" size="sm" className="mt-2">
+              Filter
+              <ChevronsUpDown size={14} className="ml-1" />
+            </Button>
+          </div>
+          <div className="w-full border-t border-dashed border-neutral-300 my-1"></div>
+          {/* <ActivityTable data={transformedActivity} /> */}
+          {!hasData && (
+            <div className="p-8 text-center text-gray-500">
+              No activity data available
+            </div>
+          )}
+        </CardContent>
+      </Card>
+
+      {hasData && <PaginationControls />}
+    </div>
+  );
 }
diff --git a/apps/app/src/routes/_layout/profile/_tabs/my-feeds.tsx b/apps/app/src/routes/_layout/profile/_tabs/my-feeds.tsx
index c9d0ecfa..b064cd72 100644
--- a/apps/app/src/routes/_layout/profile/_tabs/my-feeds.tsx
+++ b/apps/app/src/routes/_layout/profile/_tabs/my-feeds.tsx
@@ -1,10 +1,172 @@
 import { createFileRoute } from "@tanstack/react-router";
-import { MyFeeds } from "../../../../components/profile/my-feeds";
+import { useNavigate } from "@tanstack/react-router";
+import { Check, ChevronsUpDown, Loader2 } from "lucide-react";
+import { useMemo, useState } from "react";
+import { useMyCreatedFeeds } from "@/lib/api/feeds";
+import { cn } from "@/lib/utils";
+import { Button } from "@/components/ui/button";
+import {
+  Command,
+  CommandEmpty,
+  CommandGroup,
+  CommandInput,
+  CommandItem,
+  CommandList,
+} from "@/components/ui/command";
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from "@/components/ui/popover";
+import { FeedCard } from "@/components/profile/my-feeds/FeedCard";
+import { SearchForm } from "@/components/profile/my-feeds/SearchForm";
+import {
+  filterOptions,
+  type FilterValue,
+} from "@/components/profile/my-feeds/constants";
 
 export const Route = createFileRoute("/_layout/profile/_tabs/my-feeds")({
-  component: RouteComponent,
+  component: MyFeeds,
 });
 
-function RouteComponent() {
-  return <MyFeeds />;
+function MyFeeds() {
+  const [open, setOpen] = useState(false);
+  const [filters, setFilters] = useState<{
+    term: string;
+    value: FilterValue;
+  }>({ term: "", value: "all" });
+  const navigate = useNavigate();
+
+  const { data: feeds = [], isLoading, error } = useMyCreatedFeeds();
+
+  const filteredFeeds = useMemo(() => {
+    return feeds.filter((feed) => {
+      const matchesSearch =
+        !filters.term ||
+        feed.name.toLowerCase().includes(filters.term.toLowerCase()) ||
+        (feed.description &&
+          feed.description.toLowerCase().includes(filters.term.toLowerCase()));
+
+      const isComplete = !!(
+        feed.config &&
+        feed.config.name &&
+        feed.config.description &&
+        feed.config.sources &&
+        feed.config.sources.length > 0
+      );
+
+      if (filters.value === "all") return matchesSearch;
+      if (filters.value === "completed") return matchesSearch && isComplete;
+      if (filters.value === "incomplete") return matchesSearch && !isComplete;
+
+      return matchesSearch;
+    });
+  }, [feeds, filters]);
+
+  const handleCreateNewFeed = () => {
+    navigate({ to: "/create/feed" });
+  };
+
+  if (error) {
+    return (
+      <div className="flex items-center justify-center p-8">
+        <p className="text-red-500">Failed to load feeds. Please try again.</p>
+      </div>
+    );
+  }
+
+  return (
+    <div className="flex flex-col gap-4 sm:gap-6 w-full">
+      <div className="flex flex-col md:flex-row md:gap-0 gap-4 items-stretch justify-between w-full">
+        <SearchForm
+          searchTerm={filters.term}
+          onSearchChange={(term) => setFilters((f) => ({ ...f, term }))}
+        />
+        <div className="ms-auto md:ms-0 flex items-stretch gap-3">
+          <Popover open={open} onOpenChange={setOpen}>
+            <PopoverTrigger asChild>
+              <Button
+                variant="outline"
+                role="combobox"
+                aria-expanded={open}
+                className="truncate justify-between h-auto"
+              >
+                {filters.value
+                  ? `${filterOptions.find((option) => option.value === filters.value)?.label} Feeds`
+                  : "Select filter..."}
+                <ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
+              </Button>
+            </PopoverTrigger>
+            <PopoverContent className="p-0">
+              <Command>
+                <CommandInput placeholder="Search feeds" />
+                <CommandList>
+                  <CommandEmpty>No filter found.</CommandEmpty>
+                  <CommandGroup>
+                    {filterOptions.map((option) => (
+                      <CommandItem
+                        key={option.value}
+                        value={option.value}
+                        onSelect={(currentValue) => {
+                          setFilters((f) => ({
+                            ...f,
+                            value:
+                              currentValue === f.value
+                                ? "all"
+                                : (currentValue as FilterValue),
+                          }));
+                          setOpen(false);
+                        }}
+                      >
+                        <Check
+                          className={cn(
+                            "mr-2 h-4 w-4",
+                            filters.value === option.value
+                              ? "opacity-100"
+                              : "opacity-0",
+                          )}
+                        />
+                        {option.label}
+                      </CommandItem>
+                    ))}
+                  </CommandGroup>
+                </CommandList>
+              </Command>
+            </PopoverContent>
+          </Popover>
+          <Button
+            variant="filled"
+            className="h-auto"
+            onClick={handleCreateNewFeed}
+          >
+            Create New Feed
+          </Button>
+        </div>
+      </div>
+      {isLoading ? (
+        <div className="flex items-center justify-center p-8">
+          <Loader2 className="h-8 w-8 animate-spin" />
+          <span className="ml-2">Loading your feeds...</span>
+        </div>
+      ) : filteredFeeds && filteredFeeds.length === 0 ? (
+        <div className="flex flex-col items-center justify-center p-8 text-center">
+          <p className="text-gray-500 mb-4">
+            {filters.term || filters.value !== "all"
+              ? "No feeds match your search criteria."
+              : "You haven't created any feeds yet."}
+          </p>
+          {!filters.term && filters.value === "all" && (
+            <Button variant="filled" onClick={handleCreateNewFeed}>
+              Create Your First Feed
+            </Button>
+          )}
+        </div>
+      ) : (
+        <div className="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 gap-4 sm:gap-5">
+          {filteredFeeds &&
+            filteredFeeds.map((feed) => <FeedCard key={feed.id} feed={feed} />)}
+        </div>
+      )}
+    </div>
+  );
 }
diff --git a/apps/app/src/routes/_layout/profile/_tabs/overview.tsx b/apps/app/src/routes/_layout/profile/_tabs/overview.tsx
index 2e34c3e3..c43c31f4 100644
--- a/apps/app/src/routes/_layout/profile/_tabs/overview.tsx
+++ b/apps/app/src/routes/_layout/profile/_tabs/overview.tsx
@@ -1,10 +1,26 @@
+import { ApproverFor } from "@/components/profile/overview/ApproverFor";
 import { createFileRoute } from "@tanstack/react-router";
-import { ProfileOverview } from "../../../../components/profile/overview";
+// import { CurateCTA } from "./CurateCTA";
+import { CuratorFor } from "@/components/profile/overview/CuratorFor";
+// import { TopBadges } from "./TopBadges";
+// import { UserStats } from "./UserStats";
 
 export const Route = createFileRoute("/_layout/profile/_tabs/overview")({
-  component: RouteComponent,
+  component: ProfileOverview,
 });
 
-function RouteComponent() {
-  return <ProfileOverview />;
+function ProfileOverview() {
+  return (
+    <div className="flex flex-col items-stretch gap-4 sm:gap-6">
+      {/* <div className="grid grid-cols-1 md:grid-cols-2 gap-4 sm:gap-6">
+        <UserStats />
+        <TopBadges />
+      </div> */}
+      {/* <CurateCTA /> */}
+      <div className="grid grid-cols-1 md:grid-cols-2 gap-4 sm:gap-6">
+        <ApproverFor />
+        <CuratorFor />
+      </div>
+    </div>
+  );
 }
diff --git a/apps/app/src/routes/_layout/profile/_tabs/route.tsx b/apps/app/src/routes/_layout/profile/_tabs/route.tsx
deleted file mode 100644
index 011aaf73..00000000
--- a/apps/app/src/routes/_layout/profile/_tabs/route.tsx
+++ /dev/null
@@ -1,103 +0,0 @@
-import {
-  createFileRoute,
-  Outlet,
-  useLocation,
-  useNavigate,
-} from "@tanstack/react-router";
-import { Container } from "../../../../components/Container";
-import { ProfileHeader } from "../../../../components/profile/ProfileHeader";
-import { Button } from "../../../../components/ui/button";
-import {
-  Tabs,
-  TabsList,
-  TabsTrigger,
-} from "../../../../components/ui/profile-tabs";
-import { useAuth } from "../../../../contexts/auth-context";
-import { Activity, Newspaper, ScanSearch } from "lucide-react";
-
-export const Route = createFileRoute("/_layout/profile/_tabs")({
-  component: RouteComponent,
-});
-
-const navigationItems = [
-  {
-    value: "overview",
-    path: "/profile/overview",
-    label: "Overview",
-    icon: ScanSearch,
-  },
-  {
-    value: "my-feeds",
-    path: "/profile/my-feeds",
-    label: "My Feeds",
-    icon: Newspaper,
-  },
-  {
-    value: "activity",
-    path: "/profile/activity",
-    label: "Activity",
-    icon: Activity,
-  },
-];
-
-function RouteComponent() {
-  const { isSignedIn, currentAccountId, handleSignIn } = useAuth();
-  const location = useLocation();
-  const navigate = useNavigate();
-
-  const getCurrentTab = () => {
-    const path = location.pathname;
-    const tab = navigationItems.find((item) => path.startsWith(item.path));
-    return tab?.value || "overview";
-  };
-
-  const handleTabChange = (value: string) => {
-    const item = navigationItems.find((item) => item.value === value);
-    if (item) {
-      navigate({ to: item.path });
-    }
-  };
-
-  if (!isSignedIn || !currentAccountId) {
-    return (
-      <main className="mx-auto w-full px-3 py-3 sm:px-4 sm:py-4 md:px-6 md:py-6 lg:px-8 lg:py-8 xl:px-12 lg:max-w-6xl xl:max-w-7xl">
-        <div className="min-h-screen mx-auto max-w-[1440px] flex flex-col gap-4 items-center justify-center">
-          <h1>Please Login to Continue</h1>
-          <Button onClick={handleSignIn}>Login</Button>
-        </div>
-      </main>
-    );
-  }
-
-  return (
-    <main className="mx-auto w-full px-3 py-3 sm:px-4 sm:py-4 md:px-6 md:py-6 lg:px-8 lg:py-8 xl:px-12 lg:max-w-6xl xl:max-w-7xl">
-      <Container>
-        <div className="flex flex-col gap-3 sm:gap-4 md:gap-6 lg:gap-8">
-          <ProfileHeader accountId={currentAccountId} />
-
-          <Tabs
-            value={getCurrentTab()}
-            onValueChange={handleTabChange}
-            className="w-full space-y-[30px]"
-          >
-            <TabsList className="overflow-x-auto">
-              {navigationItems.map((item) => {
-                const IconComponent = item.icon;
-                return (
-                  <TabsTrigger key={item.value} value={item.value}>
-                    <IconComponent strokeWidth={1} size={24} />
-                    {item.label}
-                  </TabsTrigger>
-                );
-              })}
-            </TabsList>
-
-            <div className="w-full">
-              <Outlet />
-            </div>
-          </Tabs>
-        </div>
-      </Container>
-    </main>
-  );
-}
diff --git a/apps/app/src/routes/_layout/profile/_tabs/settings/_tabs.tsx b/apps/app/src/routes/_layout/profile/_tabs/settings/_tabs.tsx
new file mode 100644
index 00000000..7af25da2
--- /dev/null
+++ b/apps/app/src/routes/_layout/profile/_tabs/settings/_tabs.tsx
@@ -0,0 +1,73 @@
+import {
+  Outlet,
+  createFileRoute,
+  useLocation,
+  useNavigate,
+} from "@tanstack/react-router";
+import {
+  Tabs,
+  TabsList,
+  TabsTrigger,
+  TabsContent,
+} from "../../../../../components/ui/tabs";
+
+export const Route = createFileRoute("/_layout/profile/_tabs/settings/_tabs")({
+  component: SettingsTabsAreaLayout,
+});
+
+function SettingsTabsAreaLayout() {
+  const location = useLocation();
+  const navigate = useNavigate();
+
+  const navigationItems = [
+    {
+      value: "connections",
+      path: "/profile/settings/connections",
+      label: "Connected Accounts",
+    },
+    {
+      value: "notifications",
+      path: "/profile/settings/notifications",
+      label: "Notifications",
+    },
+    {
+      value: "preferences",
+      path: "/profile/settings/preferences",
+      label: "Preferences",
+    },
+  ];
+
+  const getCurrentTab = () => {
+    const currentItem = navigationItems.find(
+      (item) => location.pathname === item.path,
+    );
+    return currentItem?.value || "connections";
+  };
+
+  const handleTabChange = (value: string) => {
+    const item = navigationItems.find((nav) => nav.value === value);
+    if (item) {
+      navigate({ to: item.path });
+    }
+  };
+
+  return (
+    <Tabs
+      value={getCurrentTab()}
+      onValueChange={handleTabChange}
+      className="w-full"
+    >
+      <TabsList className="w-full justify-start">
+        {navigationItems.map((item) => (
+          <TabsTrigger key={item.value} value={item.value}>
+            {item.label}
+          </TabsTrigger>
+        ))}
+      </TabsList>
+
+      <TabsContent value={getCurrentTab()} className="mt-6">
+        <Outlet />
+      </TabsContent>
+    </Tabs>
+  );
+}
diff --git a/apps/app/src/routes/_layout/profile/settings/connections.tsx b/apps/app/src/routes/_layout/profile/_tabs/settings/_tabs/connections.tsx
similarity index 85%
rename from apps/app/src/routes/_layout/profile/settings/connections.tsx
rename to apps/app/src/routes/_layout/profile/_tabs/settings/_tabs/connections.tsx
index c146d049..0989611f 100644
--- a/apps/app/src/routes/_layout/profile/settings/connections.tsx
+++ b/apps/app/src/routes/_layout/profile/_tabs/settings/_tabs/connections.tsx
@@ -1,10 +1,12 @@
 import { Platform, type ConnectedAccount } from "@crosspost/types";
 import { createFileRoute } from "@tanstack/react-router";
-import { ConnectPlatform } from "../../../../components/buttons/ConnectPlatform";
-import { Card } from "../../../../components/ui/card";
-import { useConnectedAccounts } from "../../../../lib/crosspost";
+import { ConnectPlatform } from "../../../../../../components/buttons/ConnectPlatform";
+import { Card } from "../../../../../../components/ui/card";
+import { useConnectedAccounts } from "../../../../../../lib/crosspost";
 
-export const Route = createFileRoute("/_layout/profile/settings/connections")({
+export const Route = createFileRoute(
+  "/_layout/profile/_tabs/settings/_tabs/connections",
+)({
   component: ConnectionsComponent,
 });
 
diff --git a/apps/app/src/routes/_layout/profile/settings/notifications.tsx b/apps/app/src/routes/_layout/profile/_tabs/settings/_tabs/notifications.tsx
similarity index 81%
rename from apps/app/src/routes/_layout/profile/settings/notifications.tsx
rename to apps/app/src/routes/_layout/profile/_tabs/settings/_tabs/notifications.tsx
index ff853594..9b4dab83 100644
--- a/apps/app/src/routes/_layout/profile/settings/notifications.tsx
+++ b/apps/app/src/routes/_layout/profile/_tabs/settings/_tabs/notifications.tsx
@@ -1,11 +1,11 @@
 import { createFileRoute } from "@tanstack/react-router";
 import { ComingSoon } from "@/components/coming-soon";
 
-export const Route = createFileRoute("/_layout/profile/settings/notifications")(
-  {
-    component: NotificationsComponent,
-  },
-);
+export const Route = createFileRoute(
+  "/_layout/profile/_tabs/settings/_tabs/notifications",
+)({
+  component: NotificationsComponent,
+});
 
 function NotificationsComponent() {
   return (
diff --git a/apps/app/src/routes/_layout/profile/settings/preferences.tsx b/apps/app/src/routes/_layout/profile/_tabs/settings/_tabs/preferences.tsx
similarity index 86%
rename from apps/app/src/routes/_layout/profile/settings/preferences.tsx
rename to apps/app/src/routes/_layout/profile/_tabs/settings/_tabs/preferences.tsx
index db41872d..f960d047 100644
--- a/apps/app/src/routes/_layout/profile/settings/preferences.tsx
+++ b/apps/app/src/routes/_layout/profile/_tabs/settings/_tabs/preferences.tsx
@@ -1,7 +1,9 @@
 import { createFileRoute } from "@tanstack/react-router";
 import { ComingSoon } from "@/components/coming-soon";
 
-export const Route = createFileRoute("/_layout/profile/settings/preferences")({
+export const Route = createFileRoute(
+  "/_layout/profile/_tabs/settings/_tabs/preferences",
+)({
   component: PreferencesComponent,
 });
 
diff --git a/apps/app/src/routes/_layout/profile/_tabs/settings/index.tsx b/apps/app/src/routes/_layout/profile/_tabs/settings/index.tsx
new file mode 100644
index 00000000..69376b43
--- /dev/null
+++ b/apps/app/src/routes/_layout/profile/_tabs/settings/index.tsx
@@ -0,0 +1,7 @@
+import { createFileRoute, redirect } from "@tanstack/react-router";
+
+export const Route = createFileRoute("/_layout/profile/_tabs/settings/")({
+  beforeLoad: () => {
+    throw redirect({ to: "/profile/settings/connections", search: {} });
+  },
+});
diff --git a/apps/app/src/routes/_layout/profile/index.tsx b/apps/app/src/routes/_layout/profile/index.tsx
index 7c5a6b8d..bfb30b7a 100644
--- a/apps/app/src/routes/_layout/profile/index.tsx
+++ b/apps/app/src/routes/_layout/profile/index.tsx
@@ -2,6 +2,6 @@ import { createFileRoute, redirect } from "@tanstack/react-router";
 
 export const Route = createFileRoute("/_layout/profile/")({
   beforeLoad: () => {
-    throw redirect({ to: "/profile/overview" });
+    throw redirect({ to: "/profile/overview", search: {} });
   },
 });
diff --git a/apps/app/src/routes/_layout/profile/settings/index.tsx b/apps/app/src/routes/_layout/profile/settings/index.tsx
deleted file mode 100644
index c8a33589..00000000
--- a/apps/app/src/routes/_layout/profile/settings/index.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import { createFileRoute, Navigate } from "@tanstack/react-router";
-
-export const Route = createFileRoute("/_layout/profile/settings/")({
-  component: () => <Navigate to="/profile/settings/connections" />,
-});
diff --git a/apps/app/src/routes/_layout/profile/settings/route.tsx b/apps/app/src/routes/_layout/profile/settings/route.tsx
deleted file mode 100644
index 74ea9181..00000000
--- a/apps/app/src/routes/_layout/profile/settings/route.tsx
+++ /dev/null
@@ -1,104 +0,0 @@
-import {
-  Outlet,
-  useLocation,
-  useNavigate,
-  createFileRoute,
-} from "@tanstack/react-router";
-import { Container } from "../../../../components/Container";
-import { Button } from "../../../../components/ui/button";
-import {
-  Tabs,
-  TabsList,
-  TabsTrigger,
-  TabsContent,
-} from "../../../../components/ui/tabs";
-import { useAuth } from "../../../../contexts/auth-context";
-
-export const Route = createFileRoute("/_layout/profile/settings")({
-  component: SettingsPageComponent,
-});
-
-function SettingsPageComponent() {
-  const { isSignedIn, currentAccountId, handleSignIn } = useAuth();
-  const location = useLocation();
-  const navigate = useNavigate();
-
-  // Navigation items
-  const navigationItems = [
-    {
-      value: "connections",
-      path: "/profile/settings/connections",
-      label: "Connected Accounts",
-    },
-    {
-      value: "notifications",
-      path: "/profile/settings/notifications",
-      label: "Notifications",
-    },
-    {
-      value: "preferences",
-      path: "/profile/settings/preferences",
-      label: "Preferences",
-    },
-  ];
-
-  // Get current tab based on pathname
-  const getCurrentTab = () => {
-    const currentItem = navigationItems.find(
-      (item) => location.pathname === item.path,
-    );
-    return currentItem?.value || "connections";
-  };
-
-  const handleTabChange = (value: string) => {
-    const item = navigationItems.find((nav) => nav.value === value);
-    if (item) {
-      navigate({ to: item.path });
-    }
-  };
-
-  if (!isSignedIn || !currentAccountId) {
-    return (
-      <main className="mx-auto w-full px-3 py-3 sm:px-4 sm:py-4 md:px-6 md:py-6 lg:px-8 lg:py-8 xl:px-12 lg:max-w-6xl xl:max-w-7xl">
-        <div className="min-h-screen mx-auto max-w-[1440px] flex flex-col gap-4 items-center justify-center">
-          <h1>Please Login to Continue</h1>
-          <Button onClick={handleSignIn}>Login</Button>
-        </div>
-      </main>
-    );
-  }
-
-  return (
-    <main className="mx-auto w-full px-3 py-3 sm:px-4 sm:py-4 md:px-6 md:py-6 lg:px-8 lg:py-8 xl:px-12 lg:max-w-6xl xl:max-w-7xl">
-      <Container>
-        <div className="flex flex-col gap-6">
-          <div>
-            <h1 className="text-[30px]">Settings</h1>
-            <p className="font-[Geist] text-sm font-medium">
-              Manage your account settings and preferences
-            </p>
-          </div>
-
-          {/* Navigation using Tabs UI */}
-          <Tabs
-            value={getCurrentTab()}
-            onValueChange={handleTabChange}
-            className="w-full"
-          >
-            <TabsList className="w-full justify-start">
-              {navigationItems.map((item) => (
-                <TabsTrigger key={item.value} value={item.value}>
-                  {item.label}
-                </TabsTrigger>
-              ))}
-            </TabsList>
-
-            <TabsContent value={getCurrentTab()} className="mt-6">
-              <Outlet />
-            </TabsContent>
-          </Tabs>
-        </div>
-      </Container>
-    </main>
-  );
-}