diff --git a/apps/web/app/(app)/[emailAccountId]/assistant/ExecutedRulesTable.tsx b/apps/web/app/(app)/[emailAccountId]/assistant/ExecutedRulesTable.tsx
index a05495a7e1..c8cd08893e 100644
--- a/apps/web/app/(app)/[emailAccountId]/assistant/ExecutedRulesTable.tsx
+++ b/apps/web/app/(app)/[emailAccountId]/assistant/ExecutedRulesTable.tsx
@@ -62,7 +62,6 @@ export function RuleCell({
   status,
   reason,
   message,
-  isTest,
   setInput,
 }: {
   emailAccountId: string;
@@ -70,7 +69,6 @@ export function RuleCell({
   status: ExecutedRuleStatus;
   reason?: string | null;
   message: ParsedMessage;
-  isTest: boolean;
   setInput: SetInputFunction;
 }) {
   const { createAssistantUrl } = useAssistantNavigation(emailAccountId);
@@ -106,6 +104,7 @@ export function RuleCell({
                       href={createAssistantUrl({
                         tab: "rule",
                         ruleId: rule.id,
+                        path: `/assistant/rule/${rule.id}`,
                       })}
                     >
                       View
diff --git a/apps/web/app/(app)/[emailAccountId]/assistant/FixWithChat.tsx b/apps/web/app/(app)/[emailAccountId]/assistant/FixWithChat.tsx
index e6e3b2ca70..bc76ee7718 100644
--- a/apps/web/app/(app)/[emailAccountId]/assistant/FixWithChat.tsx
+++ b/apps/web/app/(app)/[emailAccountId]/assistant/FixWithChat.tsx
@@ -85,7 +85,13 @@ export function FixWithChat({
                   setInput(input);
                 } else {
                   // redirect to the assistant page
-                  router.push(createAssistantUrl({ input, tab: "history" }));
+                  router.push(
+                    createAssistantUrl({
+                      input,
+                      tab: "history",
+                      path: "/assistant?tab=history",
+                    }),
+                  );
                 }
 
                 setIsModalOpen(false);
diff --git a/apps/web/app/(app)/[emailAccountId]/assistant/History.tsx b/apps/web/app/(app)/[emailAccountId]/assistant/History.tsx
index cca3cafa22..b307aa1f60 100644
--- a/apps/web/app/(app)/[emailAccountId]/assistant/History.tsx
+++ b/apps/web/app/(app)/[emailAccountId]/assistant/History.tsx
@@ -108,7 +108,6 @@ function HistoryTable({
                   status={p.status}
                   reason={p.reason}
                   message={p.message}
-                  isTest={false}
                   setInput={setInput}
                 />
                 {/* <ActionItemsCell actionItems={p.actionItems} /> */}
diff --git a/apps/web/app/(app)/[emailAccountId]/assistant/Pending.tsx b/apps/web/app/(app)/[emailAccountId]/assistant/Pending.tsx
index aa207c1a99..30734fbc1a 100644
--- a/apps/web/app/(app)/[emailAccountId]/assistant/Pending.tsx
+++ b/apps/web/app/(app)/[emailAccountId]/assistant/Pending.tsx
@@ -192,7 +192,6 @@ function PendingTable({
                   status={p.status}
                   reason={p.reason}
                   message={p.message}
-                  isTest={true}
                   setInput={setInput}
                 />
               </TableCell>
diff --git a/apps/web/app/(app)/[emailAccountId]/assistant/Rules.tsx b/apps/web/app/(app)/[emailAccountId]/assistant/Rules.tsx
index 800473a48b..ea8a5fb2ff 100644
--- a/apps/web/app/(app)/[emailAccountId]/assistant/Rules.tsx
+++ b/apps/web/app/(app)/[emailAccountId]/assistant/Rules.tsx
@@ -11,7 +11,6 @@ import {
   Trash2Icon,
   ToggleRightIcon,
   ToggleLeftIcon,
-  SlidersIcon,
 } from "lucide-react";
 import { useMemo } from "react";
 import { LoadingContent } from "@/components/LoadingContent";
@@ -36,10 +35,7 @@ import {
   TableHeader,
   TableRow,
 } from "@/components/ui/table";
-import {
-  setRuleRunOnThreadsAction,
-  setRuleEnabledAction,
-} from "@/utils/actions/ai-rule";
+import { setRuleEnabledAction } from "@/utils/actions/ai-rule";
 import { deleteRuleAction } from "@/utils/actions/rule";
 import { conditionsToString } from "@/utils/condition";
 import { Badge } from "@/components/Badge";
@@ -202,6 +198,7 @@ export function Rules({ size = "md" }: { size?: "sm" | "md" }) {
                     : createAssistantUrl({
                         tab: "rule",
                         ruleId: rule.id,
+                        path: `/assistant/rule/${rule.id}`,
                       });
 
                   return (
@@ -300,6 +297,7 @@ export function Rules({ size = "md" }: { size?: "sm" | "md" }) {
                                     : createAssistantUrl({
                                         tab: "history",
                                         ruleId: rule.id,
+                                        path: "/assistant?tab=history",
                                       })
                                 }
                                 target={
@@ -404,19 +402,12 @@ export function Rules({ size = "md" }: { size?: "sm" | "md" }) {
 
       {hasRules && (
         <div className="my-2 flex justify-end gap-2">
-          {/* <Button asChild variant="outline">
-            <Link href={prefixPath(emailAccountId, "/assistant?tab=prompt")}>
+          <Button asChild variant="outline">
+            <Link href={prefixPath(emailAccountId, "/automation?tab=prompt")}>
               <PenIcon className="mr-2 hidden size-4 md:block" />
               Add Rule via Prompt
             </Link>
-          </Button> */}
-          <Button asChild variant="outline">
-            <Link href={prefixPath(emailAccountId, "/assistant/onboarding")}>
-              <SlidersIcon className="mr-2 hidden size-4 md:block" />
-              View Setup
-            </Link>
           </Button>
-
           <Button asChild variant="outline">
             <Link href={prefixPath(emailAccountId, "/assistant/rule/create")}>
               <PlusIcon className="mr-2 hidden size-4 md:block" />
diff --git a/apps/web/app/(app)/[emailAccountId]/automation/page.tsx b/apps/web/app/(app)/[emailAccountId]/automation/page.tsx
index 67de65137c..62f6dd4452 100644
--- a/apps/web/app/(app)/[emailAccountId]/automation/page.tsx
+++ b/apps/web/app/(app)/[emailAccountId]/automation/page.tsx
@@ -2,7 +2,7 @@ import { Suspense } from "react";
 import { cookies } from "next/headers";
 import Link from "next/link";
 import { redirect } from "next/navigation";
-import { MessageCircleIcon } from "lucide-react";
+import { MessageCircleIcon, SlidersIcon } from "lucide-react";
 import prisma from "@/utils/prisma";
 import { History } from "@/app/(app)/[emailAccountId]/assistant/History";
 import { Pending } from "@/app/(app)/[emailAccountId]/assistant/Pending";
@@ -88,6 +88,15 @@ export default async function AutomationPage({
             </div>
 
             <div className="flex items-center gap-2">
+              <Button asChild variant="outline" size="sm">
+                <Link
+                  href={prefixPath(emailAccountId, "/assistant/onboarding")}
+                >
+                  <SlidersIcon className="mr-2 hidden size-4 md:block" />
+                  View Setup
+                </Link>
+              </Button>
+
               <OnboardingModal
                 title="Getting started with AI Personal Assistant"
                 description={
diff --git a/apps/web/hooks/useAssistantNavigation.ts b/apps/web/hooks/useAssistantNavigation.ts
index 2be7fed6e2..4b85b530f5 100644
--- a/apps/web/hooks/useAssistantNavigation.ts
+++ b/apps/web/hooks/useAssistantNavigation.ts
@@ -25,7 +25,9 @@ export function useAssistantNavigation(emailAccountId: string) {
     (params: {
       tab?: string;
       ruleId?: string;
-      [key: string]: string | undefined;
+      path: `/${string}`;
+      input?: string;
+      // [key: string]: string | undefined;
     }) => {
       if (isOnAssistantPage) {
         // If we're on the assistant page, use current search params as base to preserve existing params
@@ -34,11 +36,8 @@ export function useAssistantNavigation(emailAccountId: string) {
           `/assistant${assistantSearchParamsSerializer(searchParams, params)}`,
         );
       } else {
-        // If we're not on the assistant page, just use the new params
-        return prefixPath(
-          emailAccountId,
-          `/assistant${assistantSearchParamsSerializer(params)}`,
-        );
+        // If we're not on the assistant page, just use the set path
+        return prefixPath(emailAccountId, params.path);
       }
     },
     [emailAccountId, isOnAssistantPage, searchParams],
diff --git a/package.json b/package.json
index e0eddab71f..ef9882d7e3 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "prettier-plugin-tailwindcss": "0.6.11",
     "turbo": "2.5.3"
   },
-  "packageManager": "pnpm@10.8.1+sha512.c50088ba998c67b8ca8c99df8a5e02fd2ae2e2b29aaf238feaa9e124248d3f48f9fb6db2424949ff901cffbb5e0f0cc1ad6aedb602cd29450751d11c35023677",
+  "packageManager": "pnpm@10.11.0",
   "lint-staged": {
     "*.{ts,tsx,md}": "prettier --write"
   },
diff --git a/version.txt b/version.txt
index 2abd4de0dd..174d0de8f5 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-v1.2.22
\ No newline at end of file
+v1.2.23
\ No newline at end of file