diff --git a/apps/app/src/actions/change-organization.ts b/apps/app/src/actions/change-organization.ts
new file mode 100644
index 0000000000..c8ad0fda76
--- /dev/null
+++ b/apps/app/src/actions/change-organization.ts
@@ -0,0 +1,59 @@
+"use server";
+
+import { authActionClient } from "./safe-action";
+import { z } from "zod";
+import { db } from "@bubba/db";
+
+export const changeOrganizationAction = authActionClient
+  .schema(
+    z.object({
+      organizationId: z.string(),
+    })
+  )
+  .metadata({
+    name: "change-organization",
+    track: {
+      event: "create-employee",
+      channel: "server",
+    },
+  })
+  .action(async ({ parsedInput, ctx }) => {
+    const { organizationId } = parsedInput;
+    const { user } = ctx;
+
+    try {
+      const organization = await db.organization.findUnique({
+        where: {
+          id: organizationId,
+        },
+      });
+
+      if (!organization) {
+        return {
+          success: false,
+          error: "Organization not found",
+        };
+      }
+
+      await db.user.update({
+        where: {
+          id: user.id,
+        },
+        data: {
+          organizationId: organization.id,
+        },
+      });
+
+      return {
+        success: true,
+        data: organization,
+      };
+    } catch (error) {
+      console.error("Error changing organization:", error);
+
+      return {
+        success: false,
+        error: "Failed to change organization",
+      };
+    }
+  });
diff --git a/apps/app/src/actions/organization/create-api-key-action.ts b/apps/app/src/actions/organization/create-api-key-action.ts
index 106cb1642b..344b4adb4a 100644
--- a/apps/app/src/actions/organization/create-api-key-action.ts
+++ b/apps/app/src/actions/organization/create-api-key-action.ts
@@ -7,113 +7,113 @@ import { db } from "@bubba/db";
 import { revalidatePath } from "next/cache";
 
 export const createApiKeyAction = authActionClient
-	.schema(apiKeySchema)
-	.metadata({
-		name: "createApiKey",
-		track: {
-			event: "createApiKey",
-			channel: "server",
-		},
-	})
-	.action(async ({ parsedInput, ctx }) => {
-		try {
-			const { name, expiresAt } = parsedInput;
-			console.log(`Creating API key "${name}" with expiration: ${expiresAt}`);
+  .schema(apiKeySchema)
+  .metadata({
+    name: "createApiKey",
+    track: {
+      event: "createApiKey",
+      channel: "server",
+    },
+  })
+  .action(async ({ parsedInput, ctx }) => {
+    try {
+      const { name, expiresAt } = parsedInput;
+      console.log(`Creating API key "${name}" with expiration: ${expiresAt}`);
 
-			// Generate a new API key and salt
-			const apiKey = generateApiKey();
-			const salt = generateSalt();
-			const hashedKey = hashApiKey(apiKey, salt);
-			console.log(
-				`Generated new API key for organization: ${ctx.user.organizationId}`,
-			);
+      // Generate a new API key and salt
+      const apiKey = generateApiKey();
+      const salt = generateSalt();
+      const hashedKey = hashApiKey(apiKey, salt);
+      console.log(
+        `Generated new API key for organization: ${ctx.user.organizationId}`
+      );
 
-			// Parse the expiration date
-			let expirationDate: Date | null = null;
-			if (expiresAt && expiresAt !== "never") {
-				const now = new Date();
-				switch (expiresAt) {
-					case "30days":
-						expirationDate = new Date(now.setDate(now.getDate() + 30));
-						break;
-					case "90days":
-						expirationDate = new Date(now.setDate(now.getDate() + 90));
-						break;
-					case "1year":
-						expirationDate = new Date(now.setFullYear(now.getFullYear() + 1));
-						break;
-				}
-				console.log(`Set expiration date to: ${expirationDate?.toISOString()}`);
-			} else {
-				console.log("No expiration date set for API key");
-			}
+      // Parse the expiration date
+      let expirationDate: Date | null = null;
+      if (expiresAt && expiresAt !== "never") {
+        const now = new Date();
+        switch (expiresAt) {
+          case "30days":
+            expirationDate = new Date(now.setDate(now.getDate() + 30));
+            break;
+          case "90days":
+            expirationDate = new Date(now.setDate(now.getDate() + 90));
+            break;
+          case "1year":
+            expirationDate = new Date(now.setFullYear(now.getFullYear() + 1));
+            break;
+        }
+        console.log(`Set expiration date to: ${expirationDate?.toISOString()}`);
+      } else {
+        console.log("No expiration date set for API key");
+      }
 
-			// Create the API key in the database
-			const apiKeyRecord = await db.organizationApiKey.create({
-				data: {
-					name,
-					key: hashedKey,
-					salt, // Store the salt with the hashed key
-					expiresAt: expirationDate,
-					organizationId: ctx.user.organizationId!,
-				},
-				select: {
-					id: true,
-					name: true,
-					createdAt: true,
-					expiresAt: true,
-				},
-			});
-			console.log(`Successfully created API key with ID: ${apiKeyRecord.id}`);
+      // Create the API key in the database
+      const apiKeyRecord = await db.organizationApiKey.create({
+        data: {
+          name,
+          key: hashedKey,
+          salt, // Store the salt with the hashed key
+          expiresAt: expirationDate,
+          organizationId: ctx.user.organizationId!,
+        },
+        select: {
+          id: true,
+          name: true,
+          createdAt: true,
+          expiresAt: true,
+        },
+      });
+      console.log(`Successfully created API key with ID: ${apiKeyRecord.id}`);
 
-			revalidatePath("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/settings/api-keys");
+      revalidatePath(`/${ctx.user.organizationId}/settings/api-keys`);
 
-			return {
-				success: true,
-				data: {
-					...apiKeyRecord,
-					key: apiKey,
-					createdAt: apiKeyRecord.createdAt.toISOString(),
-					expiresAt: apiKeyRecord.expiresAt
-						? apiKeyRecord.expiresAt.toISOString()
-						: null,
-				},
-			};
-		} catch (error) {
-			console.error("Error creating API key:", error);
+      return {
+        success: true,
+        data: {
+          ...apiKeyRecord,
+          key: apiKey,
+          createdAt: apiKeyRecord.createdAt.toISOString(),
+          expiresAt: apiKeyRecord.expiresAt
+            ? apiKeyRecord.expiresAt.toISOString()
+            : null,
+        },
+      };
+    } catch (error) {
+      console.error("Error creating API key:", error);
 
-			// Provide more specific error messages based on error type
-			if (error instanceof Error) {
-				console.error(`Error details: ${error.message}`);
+      // Provide more specific error messages based on error type
+      if (error instanceof Error) {
+        console.error(`Error details: ${error.message}`);
 
-				if (error.message.includes("Unique constraint")) {
-					return {
-						success: false,
-						error: {
-							code: "DUPLICATE_NAME",
-							message: "An API key with this name already exists",
-						},
-					};
-				}
+        if (error.message.includes("Unique constraint")) {
+          return {
+            success: false,
+            error: {
+              code: "DUPLICATE_NAME",
+              message: "An API key with this name already exists",
+            },
+          };
+        }
 
-				if (error.message.includes("Foreign key constraint")) {
-					return {
-						success: false,
-						error: {
-							code: "INVALID_ORGANIZATION",
-							message:
-								"The organization does not exist or you don't have access",
-						},
-					};
-				}
-			}
+        if (error.message.includes("Foreign key constraint")) {
+          return {
+            success: false,
+            error: {
+              code: "INVALID_ORGANIZATION",
+              message:
+                "The organization does not exist or you don't have access",
+            },
+          };
+        }
+      }
 
-			return {
-				success: false,
-				error: {
-					code: "INTERNAL_ERROR",
-					message: "An unexpected error occurred while creating the API key",
-				},
-			};
-		}
-	});
+      return {
+        success: false,
+        error: {
+          code: "INTERNAL_ERROR",
+          message: "An unexpected error occurred while creating the API key",
+        },
+      };
+    }
+  });
diff --git a/apps/app/src/actions/organization/create-organization-action.ts b/apps/app/src/actions/organization/create-organization-action.ts
index 21432c933f..728e4f54c4 100644
--- a/apps/app/src/actions/organization/create-organization-action.ts
+++ b/apps/app/src/actions/organization/create-organization-action.ts
@@ -1,73 +1,56 @@
-// update-organization-action.ts
-
 "use server";
 
 import { createOrganizationAndConnectUser } from "@/auth/org";
-import { db } from "@bubba/db";
 import { authActionClient } from "../safe-action";
 import { organizationSchema } from "../schema";
 import { tasks } from "@trigger.dev/sdk/v3";
 import type { createOrganizationTask } from "@/jobs/tasks/organization/create-organization";
 
 export const createOrganizationAction = authActionClient
-	.schema(organizationSchema)
-	.metadata({
-		name: "create-organization",
-		track: {
-			event: "create-organization",
-			channel: "server",
-		},
-	})
-	.action(async ({ parsedInput, ctx }) => {
-		const { name, website, frameworks } = parsedInput;
-		const { id: userId, organizationId } = ctx.user;
-
-		if (!name || !website) {
-			console.log("Invalid input detected:", { name, website });
-			throw new Error("Invalid user input");
-		}
-
-		if (!organizationId) {
-			await createOrganizationAndConnectUser({
-				userId,
-				normalizedEmail: ctx.user.email!,
-			});
-		}
-
-		const organization = await db.organization.findFirst({
-			where: {
-				users: {
-					some: {
-						id: userId,
-					},
-				},
-			},
-		});
-
-		if (!organization) {
-			throw new Error("Organization not found");
-		}
-
-		try {
-			const handle = await tasks.trigger<typeof createOrganizationTask>(
-				"create-organization",
-				{
-					userId,
-					fullName: name,
-					website,
-					frameworkIds: frameworks,
-					organizationId: organization.id,
-				},
-			);
-
-			return {
-				success: true,
-				runId: handle.id,
-				publicAccessToken: handle.publicAccessToken,
-			};
-		} catch (error) {
-			console.error("Error during organization update:", error);
-
-			throw new Error("Failed to update organization");
-		}
-	});
+  .schema(organizationSchema)
+  .metadata({
+    name: "create-organization",
+    track: {
+      event: "create-organization",
+      channel: "server",
+    },
+  })
+  .action(async ({ parsedInput, ctx }) => {
+    const { name, website, frameworks } = parsedInput;
+    const { id: userId } = ctx.user;
+
+    if (!name || !website) {
+      console.log("Invalid input detected:", { name, website });
+      throw new Error("Invalid user input");
+    }
+
+    const newOrganization = await createOrganizationAndConnectUser({
+      userId,
+      normalizedEmail: ctx.user.email!,
+      orgName: name,
+    });
+
+    try {
+      const handle = await tasks.trigger<typeof createOrganizationTask>(
+        "create-organization",
+        {
+          userId,
+          fullName: name,
+          website,
+          frameworkIds: frameworks,
+          organizationId: newOrganization.id,
+        }
+      );
+
+      return {
+        success: true,
+        runId: handle.id,
+        publicAccessToken: handle.publicAccessToken,
+        newOrganization,
+      };
+    } catch (error) {
+      console.error("Error during organization update:", error);
+
+      throw new Error("Failed to update organization");
+    }
+  });
diff --git a/apps/app/src/actions/organization/revoke-api-key-action.ts b/apps/app/src/actions/organization/revoke-api-key-action.ts
index 43534697e7..b5ba2f4da3 100644
--- a/apps/app/src/actions/organization/revoke-api-key-action.ts
+++ b/apps/app/src/actions/organization/revoke-api-key-action.ts
@@ -6,50 +6,50 @@ import { db } from "@bubba/db";
 import { revalidatePath } from "next/cache";
 
 const revokeApiKeySchema = z.object({
-	id: z.string().min(1),
+  id: z.string().min(1),
 });
 
 export const revokeApiKeyAction = authActionClient
-	.schema(revokeApiKeySchema)
-	.metadata({
-		name: "revokeApiKey",
-		track: {
-			event: "revokeApiKey",
-			channel: "server",
-		},
-	})
-	.action(async ({ parsedInput, ctx }) => {
-		try {
-			const { id } = parsedInput;
+  .schema(revokeApiKeySchema)
+  .metadata({
+    name: "revokeApiKey",
+    track: {
+      event: "revokeApiKey",
+      channel: "server",
+    },
+  })
+  .action(async ({ parsedInput, ctx }) => {
+    try {
+      const { id } = parsedInput;
 
-			const result = await db.organizationApiKey.updateMany({
-				where: {
-					id,
-					organizationId: ctx.user.organizationId!,
-				},
-				data: {
-					isActive: false,
-				},
-			});
+      const result = await db.organizationApiKey.updateMany({
+        where: {
+          id,
+          organizationId: ctx.user.organizationId!,
+        },
+        data: {
+          isActive: false,
+        },
+      });
 
-			if (result.count === 0) {
-				return {
-					success: false,
-					error: "API key not found or not authorized to revoke",
-				};
-			}
+      if (result.count === 0) {
+        return {
+          success: false,
+          error: "API key not found or not authorized to revoke",
+        };
+      }
 
-			revalidatePath("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/settings/api-keys");
+      revalidatePath(`/${ctx.user.organizationId}/settings/api-keys`);
 
-			return {
-				success: true,
-				message: "API key revoked successfully",
-			};
-		} catch (error) {
-			console.error("Error revoking API key:", error);
-			return {
-				success: false,
-				error: "An error occurred while revoking the API key",
-			};
-		}
-	});
+      return {
+        success: true,
+        message: "API key revoked successfully",
+      };
+    } catch (error) {
+      console.error("Error revoking API key:", error);
+      return {
+        success: false,
+        error: "An error occurred while revoking the API key",
+      };
+    }
+  });
diff --git a/apps/app/src/actions/policies/create-new-policy.ts b/apps/app/src/actions/policies/create-new-policy.ts
index ec1594e558..63c176b6fb 100644
--- a/apps/app/src/actions/policies/create-new-policy.ts
+++ b/apps/app/src/actions/policies/create-new-policy.ts
@@ -1,76 +1,73 @@
 "use server";
 
 import { db } from "@bubba/db";
-import {
-  Departments,
-  Frequency,
-} from "@bubba/db/types";
+import { Departments, Frequency } from "@bubba/db/types";
 import { revalidatePath, revalidateTag } from "next/cache";
 import { authActionClient } from "../safe-action";
 import { createPolicySchema } from "../schema";
 
 export const createPolicyAction = authActionClient
-	.schema(createPolicySchema)
-	.metadata({
-		name: "create-policy",
-		track: {
-			event: "create-policy",
-			channel: "server",
-		},
-	})
-	.action(async ({ parsedInput, ctx }) => {
-		const { title, description, frameworkIds, controlIds } = parsedInput;
-		const { user } = ctx;
+  .schema(createPolicySchema)
+  .metadata({
+    name: "create-policy",
+    track: {
+      event: "create-policy",
+      channel: "server",
+    },
+  })
+  .action(async ({ parsedInput, ctx }) => {
+    const { title, description, frameworkIds, controlIds } = parsedInput;
+    const { user } = ctx;
 
-		if (!user || !user.organizationId) {
-			return {
-				success: false,
-				error: "Not authorized",
-			};
-		}
+    if (!user || !user.organizationId) {
+      return {
+        success: false,
+        error: "Not authorized",
+      };
+    }
 
-		try {
-			const policy = await db.policy.create({
-				data: {
-					slug: title,
-					name: title,
-					description,
-					content: [
-						{ type: "paragraph", content: [{ type: "text", text: "" }] },
-					],
-					usedBy: JSON.stringify([]),
-					policyFrameworks: {
-						create: frameworkIds.map((id) => ({ frameworkId: id })),
-					},
-					PolicyControl: {
-						create: controlIds.map((id) => ({ controlId: id })),
-					},
-				},
-			});
+    try {
+      const policy = await db.policy.create({
+        data: {
+          slug: title,
+          name: title,
+          description,
+          content: [
+            { type: "paragraph", content: [{ type: "text", text: "" }] },
+          ],
+          usedBy: JSON.stringify([]),
+          policyFrameworks: {
+            create: frameworkIds.map((id) => ({ frameworkId: id })),
+          },
+          PolicyControl: {
+            create: controlIds.map((id) => ({ controlId: id })),
+          },
+        },
+      });
 
-			await db.organizationPolicy.create({
-				data: {
-					organizationId: user.organizationId,
-					policyId: policy.id,
-					ownerId: user.id,
-					department: Departments.none,
-					frequency: Frequency.monthly,
-				},
-			});
+      await db.organizationPolicy.create({
+        data: {
+          organizationId: user.organizationId,
+          policyId: policy.id,
+          ownerId: user.id,
+          department: Departments.none,
+          frequency: Frequency.monthly,
+        },
+      });
 
-			revalidatePath("/policies");
-			revalidateTag("policies");
+      revalidatePath(`/${user.organizationId}/policies`);
+      revalidateTag("policies");
 
-			return {
-				success: true,
-				policyId: policy.id,
-			};
-		} catch (error) {
-			console.error(error);
+      return {
+        success: true,
+        policyId: policy.id,
+      };
+    } catch (error) {
+      console.error(error);
 
-			return {
-				success: false,
-				error: "Failed to create policy",
-			};
-		}
-	});
+      return {
+        success: false,
+        error: "Failed to create policy",
+      };
+    }
+  });
diff --git a/apps/app/src/actions/policies/update-policy-action.ts b/apps/app/src/actions/policies/update-policy-action.ts
index 014b944ae5..f75dc79c40 100644
--- a/apps/app/src/actions/policies/update-policy-action.ts
+++ b/apps/app/src/actions/policies/update-policy-action.ts
@@ -17,7 +17,7 @@ interface ContentNode {
 
 // Simplified content processor that creates a new plain object
 function processContent(
-  content: ContentNode | ContentNode[],
+  content: ContentNode | ContentNode[]
 ): ContentNode | ContentNode[] {
   if (!content) return content;
 
@@ -87,7 +87,7 @@ export const updatePolicyAction = authActionClient
 
       // Create a new plain object from the content
       const processedContent = JSON.parse(
-        JSON.stringify(processContent(content as ContentNode)),
+        JSON.stringify(processContent(content as ContentNode))
       );
 
       await db.organizationPolicy.update({
@@ -95,8 +95,8 @@ export const updatePolicyAction = authActionClient
         data: { content: processedContent.content },
       });
 
-      revalidatePath(`/policies/${id}`);
-      revalidatePath("/policies");
+      revalidatePath(`/${user.organizationId}/policies/${id}`);
+      revalidatePath(`/${user.organizationId}/policies`);
       revalidateTag(`user_${user.id}`);
 
       return {
diff --git a/apps/app/src/actions/policies/update-policy-form-action.ts b/apps/app/src/actions/policies/update-policy-form-action.ts
index 74dfef2371..3743c528e2 100644
--- a/apps/app/src/actions/policies/update-policy-form-action.ts
+++ b/apps/app/src/actions/policies/update-policy-form-action.ts
@@ -11,7 +11,7 @@ import { PolicyStatus } from "@bubba/db/types";
 // Helper function to calculate next review date based on frequency
 function calculateNextReviewDate(
   frequency: string,
-  baseDate: Date = new Date(),
+  baseDate: Date = new Date()
 ): Date {
   const nextDate = new Date(baseDate);
 
@@ -43,8 +43,15 @@ export const updatePolicyFormAction = authActionClient
     },
   })
   .action(async ({ parsedInput, ctx }) => {
-    const { id, status, ownerId, department, review_frequency, review_date, isRequiredToSign } =
-      parsedInput;
+    const {
+      id,
+      status,
+      ownerId,
+      department,
+      review_frequency,
+      review_date,
+      isRequiredToSign,
+    } = parsedInput;
     const { user } = ctx;
 
     if (!user.id || !user.organizationId) {
@@ -95,26 +102,26 @@ export const updatePolicyFormAction = authActionClient
       if (isRequiredToSign !== undefined) {
         const orgPolicy = await db.organizationPolicy.findUnique({
           where: { id },
-          select: { 
+          select: {
             policyId: true,
           },
         });
-        
+
         if (orgPolicy?.policyId) {
           // Update the policy using the Prisma client with type assertion
           await db.policy.update({
             where: { id: orgPolicy.policyId },
-            data: { 
+            data: {
               // Use type assertion to handle the new field
               // that might not be in the generated types yet
-              isRequiredToSign: isRequiredToSign === "required" 
+              isRequiredToSign: isRequiredToSign === "required",
             } as any,
           });
         }
       }
 
-      revalidatePath("/policies");
-      revalidatePath(`/policies/all/${id}`);
+      revalidatePath(`/${user.organizationId}/policies`);
+      revalidatePath(`/${user.organizationId}/policies/all/${id}`);
       revalidateTag("policies");
 
       return {
diff --git a/apps/app/src/actions/policies/update-policy-overview-action.ts b/apps/app/src/actions/policies/update-policy-overview-action.ts
index f3e9830ac6..4a821c12f6 100644
--- a/apps/app/src/actions/policies/update-policy-overview-action.ts
+++ b/apps/app/src/actions/policies/update-policy-overview-action.ts
@@ -51,15 +51,17 @@ export const updatePolicyOverviewAction = authActionClient
               description,
               // Use type assertion to handle the new field
               // that might not be in the generated types yet
-              ...(isRequiredToSign !== undefined ? { isRequiredToSign: isRequiredToSign === "required" } as any : {}),
+              ...(isRequiredToSign !== undefined
+                ? ({ isRequiredToSign: isRequiredToSign === "required" } as any)
+                : {}),
             },
           },
         },
       });
 
-      revalidatePath(`/policies/all/${id}`);
-      revalidatePath("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/policies/all");
-      revalidatePath("/policies");
+      revalidatePath(`/${user.organizationId}/policies/all/${id}`);
+      revalidatePath(`/${user.organizationId}/policies/all`);
+      revalidatePath(`/${user.organizationId}/policies`);
 
       return {
         success: true,
diff --git a/apps/app/src/actions/policy/create-policy-comment.ts b/apps/app/src/actions/policy/create-policy-comment.ts
index d896b50112..7e286b22a4 100644
--- a/apps/app/src/actions/policy/create-policy-comment.ts
+++ b/apps/app/src/actions/policy/create-policy-comment.ts
@@ -31,7 +31,7 @@ export const createPolicyCommentAction = authActionClient
       },
     });
 
-    revalidatePath(`/policies/all/${policyId}`);
+    revalidatePath(`/${user.organizationId}/policies/all/${policyId}`);
     revalidateTag(`policy_${user.organizationId}`);
 
     return { success: true };
diff --git a/apps/app/src/actions/risk/create-risk-action.ts b/apps/app/src/actions/risk/create-risk-action.ts
index 39a4dbf4de..f30f6f3862 100644
--- a/apps/app/src/actions/risk/create-risk-action.ts
+++ b/apps/app/src/actions/risk/create-risk-action.ts
@@ -38,8 +38,8 @@ export const createRiskAction = authActionClient
         },
       });
 
-      revalidatePath("/risk");
-      revalidatePath("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/risk/register");
+      revalidatePath(`/${user.organizationId}/risk`);
+      revalidatePath(`/${user.organizationId}/risk/register`);
       revalidateTag(`risk_${user.organizationId}`);
 
       return {
diff --git a/apps/app/src/actions/risk/create-risk-comment.ts b/apps/app/src/actions/risk/create-risk-comment.ts
index d06ab8d3f4..030cf6a63a 100644
--- a/apps/app/src/actions/risk/create-risk-comment.ts
+++ b/apps/app/src/actions/risk/create-risk-comment.ts
@@ -33,8 +33,8 @@ export const createRiskCommentAction = authActionClient
       },
     });
 
-    revalidatePath(`/risk/${riskId}`);
-    revalidatePath(`/risk/${riskId}/comments`);
+    revalidatePath(`/${user.organizationId}/risk/${riskId}`);
+    revalidatePath(`/${user.organizationId}/risk/${riskId}/comments`);
     revalidateTag(`risk_${user.organizationId}`);
 
     return { success: true };
diff --git a/apps/app/src/actions/risk/task/create-task-action.ts b/apps/app/src/actions/risk/task/create-task-action.ts
index 25a61a047e..cf4a1da3b1 100644
--- a/apps/app/src/actions/risk/task/create-task-action.ts
+++ b/apps/app/src/actions/risk/task/create-task-action.ts
@@ -36,7 +36,7 @@ export const createTaskAction = authActionClient
         },
       });
 
-      revalidatePath(`/risk/${riskId}`);
+      revalidatePath(`/${user.organizationId}/risk/${riskId}`);
       revalidateTag(`risk_${user.organizationId}`);
 
       return {
diff --git a/apps/app/src/actions/risk/task/create-task-comment.ts b/apps/app/src/actions/risk/task/create-task-comment.ts
index ed94094d82..488d32ceb1 100644
--- a/apps/app/src/actions/risk/task/create-task-comment.ts
+++ b/apps/app/src/actions/risk/task/create-task-comment.ts
@@ -34,8 +34,8 @@ export const createTaskCommentAction = authActionClient
       },
     });
 
-    revalidatePath(`/risk/${riskId}`);
-    revalidatePath(`/risk/${riskId}/tasks/${taskId}`);
+    revalidatePath(`/${user.organizationId}/risk/${riskId}`);
+    revalidatePath(`/${user.organizationId}/risk/${riskId}/tasks/${taskId}`);
     revalidateTag(`risk_${user.organizationId}`);
 
     return { success: true };
diff --git a/apps/app/src/actions/risk/task/revalidate-upload.ts b/apps/app/src/actions/risk/task/revalidate-upload.ts
index b2cbf78339..52bc32d218 100644
--- a/apps/app/src/actions/risk/task/revalidate-upload.ts
+++ b/apps/app/src/actions/risk/task/revalidate-upload.ts
@@ -22,8 +22,8 @@ export const revalidateUpload = authActionClient
       throw new Error("Invalid user input");
     }
 
-    revalidatePath(`/risk/${riskId}`);
-    revalidatePath(`/risk/${riskId}/tasks/${taskId}`);
+    revalidatePath(`/${user.organizationId}/risk/${riskId}`);
+    revalidatePath(`/${user.organizationId}/risk/${riskId}/tasks/${taskId}`);
     revalidateTag("risk-cache");
 
     return {
diff --git a/apps/app/src/actions/risk/task/update-task-action.ts b/apps/app/src/actions/risk/task/update-task-action.ts
index b14b4dc827..709a1bc3fb 100644
--- a/apps/app/src/actions/risk/task/update-task-action.ts
+++ b/apps/app/src/actions/risk/task/update-task-action.ts
@@ -53,9 +53,11 @@ export const updateTaskAction = authActionClient
         },
       });
 
-      revalidatePath("/risk");
-      revalidatePath(`/risk/${riskId.riskId}`);
-      revalidatePath(`/risk/${riskId.riskId}/tasks/${id}`);
+      revalidatePath(`/${user.organizationId}/risk`);
+      revalidatePath(`/${user.organizationId}/risk/${riskId.riskId}`);
+      revalidatePath(
+        `/${user.organizationId}/risk/${riskId.riskId}/tasks/${id}`
+      );
       revalidateTag("risks");
 
       return { success: true };
diff --git a/apps/app/src/actions/risk/update-inherent-risk-action.ts b/apps/app/src/actions/risk/update-inherent-risk-action.ts
index e2ef247821..a612dfe699 100644
--- a/apps/app/src/actions/risk/update-inherent-risk-action.ts
+++ b/apps/app/src/actions/risk/update-inherent-risk-action.ts
@@ -34,9 +34,9 @@ export const updateInherentRiskAction = authActionClient
         },
       });
 
-      revalidatePath("/risk");
-      revalidatePath("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/risk/register");
-      revalidatePath(`/risk/${id}`);
+      revalidatePath(`/${user.organizationId}/risk`);
+      revalidatePath(`/${user.organizationId}/risk/register`);
+      revalidatePath(`/${user.organizationId}/risk/${id}`);
       revalidateTag("risks");
 
       return {
diff --git a/apps/app/src/actions/risk/update-residual-risk-action.ts b/apps/app/src/actions/risk/update-residual-risk-action.ts
index 325d3152ca..23325bf7e1 100644
--- a/apps/app/src/actions/risk/update-residual-risk-action.ts
+++ b/apps/app/src/actions/risk/update-residual-risk-action.ts
@@ -34,9 +34,9 @@ export const updateResidualRiskAction = authActionClient
         },
       });
 
-      revalidatePath("/risk");
-      revalidatePath("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/risk/register");
-      revalidatePath(`/risk/${id}`);
+      revalidatePath(`/${user.organizationId}/risk`);
+      revalidatePath(`/${user.organizationId}/risk/register`);
+      revalidatePath(`/${user.organizationId}/risk/${id}`);
       revalidateTag("risks");
 
       return {
diff --git a/apps/app/src/actions/risk/update-risk-action.ts b/apps/app/src/actions/risk/update-risk-action.ts
index 57573056df..a32b31f841 100644
--- a/apps/app/src/actions/risk/update-risk-action.ts
+++ b/apps/app/src/actions/risk/update-risk-action.ts
@@ -41,9 +41,9 @@ export const updateRiskAction = authActionClient
         },
       });
 
-      revalidatePath("/risk");
-      revalidatePath("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/risk/register");
-      revalidatePath(`/risk/${id}`);
+      revalidatePath(`/${user.organizationId}/risk`);
+      revalidatePath(`/${user.organizationId}/risk/register`);
+      revalidatePath(`/${user.organizationId}/risk/${id}`);
       revalidateTag("risks");
 
       return {
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/(home)/components/FrameworkProgress.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/(home)/components/FrameworkProgress.tsx
deleted file mode 100644
index 6ea731744b..0000000000
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/(home)/components/FrameworkProgress.tsx
+++ /dev/null
@@ -1,181 +0,0 @@
-"use client";
-
-import { useComplianceScores } from "@/hooks/use-compliance-scores";
-import { useI18n } from "@/locales/client";
-import type {
-  Framework,
-  OrganizationControl,
-  OrganizationFramework,
-} from "@bubba/db/types";
-import { Button } from "@bubba/ui/button";
-import { Card, CardContent, CardHeader, CardTitle } from "@bubba/ui/card";
-import { FileStack } from "lucide-react";
-import Link from "next/link";
-import { useMediaQuery } from "@bubba/ui/hooks";
-import type { ReactNode } from "react";
-
-interface Props {
-  frameworks: (OrganizationFramework & {
-    organizationControl: OrganizationControl[];
-    framework: Framework;
-  })[];
-}
-
-export function FrameworkProgress({ frameworks }: Props) {
-  const t = useI18n();
-  const {
-    policiesCompliance,
-    evidenceTasksCompliance,
-    cloudTestsCompliance,
-    overallCompliance,
-    isLoading,
-  } = useComplianceScores({ frameworks });
-
-  const isMobile = useMediaQuery("(max-width: 640px)");
-
-  const CircleProgress = ({
-    percentage,
-    label,
-    href,
-  }: {
-    percentage: number;
-    label: ReactNode;
-    href: string;
-  }) => (
-    <Link
-      href={href}
-      className="flex flex-col items-center hover:opacity-80 transition-opacity select-none"
-    >
-      <div className="relative h-24 w-24">
-        <svg className="h-24 w-24" viewBox="0 0 100 100">
-          {/* Background circle */}
-          <circle
-            className="stroke-muted"
-            strokeWidth="8"
-            fill="transparent"
-            r="46"
-            cx="50"
-            cy="50"
-          />
-          {/* Progress circle */}
-          <circle
-            className="stroke-primary transition-all duration-300 ease-in-out"
-            strokeWidth="8"
-            strokeLinecap="round"
-            fill="transparent"
-            r="46"
-            cx="50"
-            cy="50"
-            strokeDasharray={`${percentage * 2.89}, 1000`}
-            transform="rotate(-90 50 50)"
-          />
-        </svg>
-        <div className="absolute inset-0 flex flex-col items-center justify-center">
-          <div className="text-xl font-semibold">{percentage}%</div>
-        </div>
-      </div>
-      <div className="mt-2 text-center">
-        <span className="text-sm font-medium leading-tight">{label}</span>
-      </div>
-    </Link>
-  );
-
-  return (
-    <Card>
-      <CardHeader className="flex flex-row items-center justify-between">
-        <CardTitle>{t("frameworks.overview.progress.title")}</CardTitle>
-      </CardHeader>
-      <CardContent>
-        {isLoading ? (
-          <div className="flex flex-col items-center justify-center py-8 text-center">
-            <div className="h-12 w-12 animate-spin rounded-full border-4 border-primary border-t-transparent" />
-            <p className="mt-4 text-sm text-muted-foreground">
-              Loading compliance data...
-            </p>
-          </div>
-        ) : frameworks.length === 0 ? (
-          <div className="flex flex-col items-center justify-center py-8 text-center">
-            <FileStack className="h-12 w-12 text-muted-foreground/50" />
-            <h3 className="mt-4 text-lg font-semibold">
-              {t("frameworks.overview.progress.empty.title")}
-            </h3>
-            <p className="mt-2 text-sm text-muted-foreground">
-              {t("frameworks.overview.progress.empty.description")}
-            </p>
-            <Button asChild className="mt-4">
-              <Link href="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/overview/frameworks">
-                {t("frameworks.overview.progress.empty.action")}
-              </Link>
-            </Button>
-          </div>
-        ) : (
-          <div className="flex flex-col space-y-8">
-            {/* Main compliance circle */}
-            <div className="flex justify-center">
-              <div className="relative h-32 w-32">
-                <svg className="h-32 w-32" viewBox="0 0 100 100">
-                  {/* Background circle */}
-                  <circle
-                    className="stroke-muted"
-                    strokeWidth="8"
-                    fill="transparent"
-                    r="46"
-                    cx="50"
-                    cy="50"
-                  />
-                  {/* Progress circle */}
-                  <circle
-                    className="stroke-primary transition-all duration-300 ease-in-out"
-                    strokeWidth="8"
-                    strokeLinecap="round"
-                    fill="transparent"
-                    r="46"
-                    cx="50"
-                    cy="50"
-                    strokeDasharray={`${overallCompliance * 2.89}, 1000`}
-                    transform="rotate(-90 50 50)"
-                  />
-                </svg>
-                <div className="absolute inset-0 flex flex-col items-center justify-center">
-                  <div className="text-2xl font-semibold">
-                    {overallCompliance}%
-                  </div>
-                  <div className="text-xs text-muted-foreground">Compliant</div>
-                </div>
-              </div>
-            </div>
-
-            {/* Three smaller circles */}
-            <div className="grid grid-cols-3 gap-4">
-              <CircleProgress
-                percentage={policiesCompliance}
-                label="Policies"
-                href="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/policies/all"
-              />
-              <CircleProgress
-                percentage={evidenceTasksCompliance}
-                label={
-                  <>
-                    <span className="sm:hidden">Evidence</span>
-                    <span className="hidden sm:inline">Evidence Tasks</span>
-                  </>
-                }
-                href="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/evidence/list"
-              />
-              <CircleProgress
-                percentage={cloudTestsCompliance}
-                label={
-                  <>
-                    <span className="sm:hidden">Tests</span>
-                    <span className="hidden sm:inline">Cloud Tests</span>
-                  </>
-                }
-                href="/tests"
-              />
-            </div>
-          </div>
-        )}
-      </CardContent>
-    </Card>
-  );
-}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/(home)/actions/getFrameworkCategoriesAction.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/actions/getFrameworkCategoriesAction.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/(home)/actions/getFrameworkCategoriesAction.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/actions/getFrameworkCategoriesAction.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/(home)/actions/getFrameworksAction.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/actions/getFrameworksAction.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/(home)/actions/getFrameworksAction.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/actions/getFrameworksAction.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/(home)/actions/selectFrameworksAction.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/actions/selectFrameworksAction.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/(home)/actions/selectFrameworksAction.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/actions/selectFrameworksAction.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/components/FrameworkProgress.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/components/FrameworkProgress.tsx
new file mode 100644
index 0000000000..87cf230595
--- /dev/null
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/components/FrameworkProgress.tsx
@@ -0,0 +1,184 @@
+"use client";
+
+import { useComplianceScores } from "@/hooks/use-compliance-scores";
+import { useI18n } from "@/locales/client";
+import type {
+	Framework,
+	OrganizationControl,
+	OrganizationFramework,
+} from "@bubba/db/types";
+import { Button } from "@bubba/ui/button";
+import { Card, CardContent, CardHeader, CardTitle } from "@bubba/ui/card";
+import { FileStack } from "lucide-react";
+import Link from "next/link";
+import { useMediaQuery } from "@bubba/ui/hooks";
+import type { ReactNode } from "react";
+import { useParams } from "next/navigation";
+import { auth } from "@/auth";
+interface Props {
+	frameworks: (OrganizationFramework & {
+		organizationControl: OrganizationControl[];
+		framework: Framework;
+	})[];
+}
+
+export function FrameworkProgress({ frameworks }: Props) {
+	const t = useI18n();
+	const {
+		policiesCompliance,
+		evidenceTasksCompliance,
+		cloudTestsCompliance,
+		overallCompliance,
+		isLoading,
+	} = useComplianceScores({ frameworks });
+
+	const { orgId } = useParams<{ orgId: string }>();
+
+	const isMobile = useMediaQuery("(max-width: 640px)");
+
+	const CircleProgress = ({
+		percentage,
+		label,
+		href,
+	}: {
+		percentage: number;
+		label: ReactNode;
+		href: string;
+	}) => (
+		<Link
+			href={href}
+			className="flex flex-col items-center hover:opacity-80 transition-opacity select-none"
+		>
+			<div className="relative h-24 w-24">
+				<svg className="h-24 w-24" viewBox="0 0 100 100">
+					{/* Background circle */}
+					<circle
+						className="stroke-muted"
+						strokeWidth="8"
+						fill="transparent"
+						r="46"
+						cx="50"
+						cy="50"
+					/>
+					{/* Progress circle */}
+					<circle
+						className="stroke-primary transition-all duration-300 ease-in-out"
+						strokeWidth="8"
+						strokeLinecap="round"
+						fill="transparent"
+						r="46"
+						cx="50"
+						cy="50"
+						strokeDasharray={`${percentage * 2.89}, 1000`}
+						transform="rotate(-90 50 50)"
+					/>
+				</svg>
+				<div className="absolute inset-0 flex flex-col items-center justify-center">
+					<div className="text-xl font-semibold">{percentage}%</div>
+				</div>
+			</div>
+			<div className="mt-2 text-center">
+				<span className="text-sm font-medium leading-tight">{label}</span>
+			</div>
+		</Link>
+	);
+
+	return (
+		<Card>
+			<CardHeader className="flex flex-row items-center justify-between">
+				<CardTitle>{t("frameworks.overview.progress.title")}</CardTitle>
+			</CardHeader>
+			<CardContent>
+				{isLoading ? (
+					<div className="flex flex-col items-center justify-center py-8 text-center">
+						<div className="h-12 w-12 animate-spin rounded-full border-4 border-primary border-t-transparent" />
+						<p className="mt-4 text-sm text-muted-foreground">
+							Loading compliance data...
+						</p>
+					</div>
+				) : frameworks.length === 0 ? (
+					<div className="flex flex-col items-center justify-center py-8 text-center">
+						<FileStack className="h-12 w-12 text-muted-foreground/50" />
+						<h3 className="mt-4 text-lg font-semibold">
+							{t("frameworks.overview.progress.empty.title")}
+						</h3>
+						<p className="mt-2 text-sm text-muted-foreground">
+							{t("frameworks.overview.progress.empty.description")}
+						</p>
+						<Button asChild className="mt-4">
+							<Link href="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/overview/frameworks">
+								{t("frameworks.overview.progress.empty.action")}
+							</Link>
+						</Button>
+					</div>
+				) : (
+					<div className="flex flex-col space-y-8">
+						{/* Main compliance circle */}
+						<div className="flex justify-center">
+							<div className="relative h-32 w-32">
+								<svg className="h-32 w-32" viewBox="0 0 100 100">
+									{/* Background circle */}
+									<circle
+										className="stroke-muted"
+										strokeWidth="8"
+										fill="transparent"
+										r="46"
+										cx="50"
+										cy="50"
+									/>
+									{/* Progress circle */}
+									<circle
+										className="stroke-primary transition-all duration-300 ease-in-out"
+										strokeWidth="8"
+										strokeLinecap="round"
+										fill="transparent"
+										r="46"
+										cx="50"
+										cy="50"
+										strokeDasharray={`${overallCompliance * 2.89}, 1000`}
+										transform="rotate(-90 50 50)"
+									/>
+								</svg>
+								<div className="absolute inset-0 flex flex-col items-center justify-center">
+									<div className="text-2xl font-semibold">
+										{overallCompliance}%
+									</div>
+									<div className="text-xs text-muted-foreground">Compliant</div>
+								</div>
+							</div>
+						</div>
+
+						{/* Three smaller circles */}
+						<div className="grid grid-cols-3 gap-4">
+							<CircleProgress
+								percentage={policiesCompliance}
+								label="Policies"
+								href={`/${orgId}/policies/all`}
+							/>
+							<CircleProgress
+								percentage={evidenceTasksCompliance}
+								label={
+									<>
+										<span className="sm:hidden">Evidence</span>
+										<span className="hidden sm:inline">Evidence Tasks</span>
+									</>
+								}
+								href={`/${orgId}/evidence/list`}
+							/>
+							<CircleProgress
+								percentage={cloudTestsCompliance}
+								label={
+									<>
+										<span className="sm:hidden">Tests</span>
+										<span className="hidden sm:inline">Cloud Tests</span>
+									</>
+								}
+								href={`/${orgId}/tests`}
+							/>
+						</div>
+					</div>
+				)}
+			</CardContent>
+		</Card>
+	);
+}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/(home)/components/FrameworksGrid.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/components/FrameworksGrid.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/(home)/components/FrameworksGrid.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/components/FrameworksGrid.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/(home)/components/FrameworksOverview.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/components/FrameworksOverview.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/(home)/components/FrameworksOverview.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/components/FrameworksOverview.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/(home)/components/RequirementStatusChart.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/components/RequirementStatusChart.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/(home)/components/RequirementStatusChart.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/components/RequirementStatusChart.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/(home)/hooks/useFrameworks.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/hooks/useFrameworks.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/(home)/hooks/useFrameworks.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/hooks/useFrameworks.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/(home)/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/layout.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/(home)/layout.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/layout.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/[frameworkId]/actions/getOrganizationCategories.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/[frameworkId]/actions/getOrganizationCategories.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/[frameworkId]/actions/getOrganizationCategories.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/[frameworkId]/actions/getOrganizationCategories.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/[frameworkId]/actions/getOrganizationControlsProgress.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/[frameworkId]/actions/getOrganizationControlsProgress.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/[frameworkId]/actions/getOrganizationControlsProgress.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/[frameworkId]/actions/getOrganizationControlsProgress.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/[frameworkId]/actions/getOrganizationFramework.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/[frameworkId]/actions/getOrganizationFramework.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/[frameworkId]/actions/getOrganizationFramework.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/[frameworkId]/actions/getOrganizationFramework.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/[frameworkId]/components/FrameworkControls.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/[frameworkId]/components/FrameworkControls.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/[frameworkId]/components/FrameworkControls.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/[frameworkId]/components/FrameworkControls.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/[frameworkId]/components/FrameworkOverview.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/[frameworkId]/components/FrameworkOverview.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/[frameworkId]/components/FrameworkOverview.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/[frameworkId]/components/FrameworkOverview.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/[frameworkId]/components/table/FrameworkControlsTable.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/[frameworkId]/components/table/FrameworkControlsTable.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/[frameworkId]/components/table/FrameworkControlsTable.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/[frameworkId]/components/table/FrameworkControlsTable.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/[frameworkId]/components/table/FrameworkControlsTableColumns.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/[frameworkId]/components/table/FrameworkControlsTableColumns.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/[frameworkId]/components/table/FrameworkControlsTableColumns.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/[frameworkId]/components/table/FrameworkControlsTableColumns.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/[frameworkId]/components/table/FrameworkControlsTableHeader.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/[frameworkId]/components/table/FrameworkControlsTableHeader.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/[frameworkId]/components/table/FrameworkControlsTableHeader.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/[frameworkId]/components/table/FrameworkControlsTableHeader.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/[frameworkId]/hooks/useOrganizationCategories.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/[frameworkId]/hooks/useOrganizationCategories.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/[frameworkId]/hooks/useOrganizationCategories.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/[frameworkId]/hooks/useOrganizationCategories.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/[frameworkId]/hooks/useOrganizationFramework.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/[frameworkId]/hooks/useOrganizationFramework.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/[frameworkId]/hooks/useOrganizationFramework.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/[frameworkId]/hooks/useOrganizationFramework.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/[frameworkId]/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/[frameworkId]/page.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/[frameworkId]/page.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/[frameworkId]/page.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/controls/[id]/actions/getOrganizationControl.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/controls/[id]/actions/getOrganizationControl.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/controls/[id]/actions/getOrganizationControl.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/controls/[id]/actions/getOrganizationControl.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/controls/[id]/actions/getOrganizationControlProgress.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/controls/[id]/actions/getOrganizationControlProgress.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/controls/[id]/actions/getOrganizationControlProgress.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/controls/[id]/actions/getOrganizationControlProgress.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/controls/[id]/actions/getOrganizationControlRequirements.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/controls/[id]/actions/getOrganizationControlRequirements.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/controls/[id]/actions/getOrganizationControlRequirements.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/controls/[id]/actions/getOrganizationControlRequirements.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/controls/[id]/components/SingleControl.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/controls/[id]/components/SingleControl.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/controls/[id]/components/SingleControl.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/controls/[id]/components/SingleControl.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/controls/[id]/components/SingleControlSkeleton.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/controls/[id]/components/SingleControlSkeleton.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/controls/[id]/components/SingleControlSkeleton.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/controls/[id]/components/SingleControlSkeleton.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/controls/[id]/components/table/ControlRequirementsTable.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/controls/[id]/components/table/ControlRequirementsTable.tsx
similarity index 88%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/controls/[id]/components/table/ControlRequirementsTable.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/controls/[id]/components/table/ControlRequirementsTable.tsx
index 660ffaa0ef..8b6972d6b9 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/controls/[id]/components/table/ControlRequirementsTable.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/controls/[id]/components/table/ControlRequirementsTable.tsx
@@ -9,7 +9,7 @@ import {
 import { Table, TableBody, TableCell, TableRow } from "@bubba/ui/table";
 import { ControlRequirementsTableColumns } from "./ControlRequirementsTableColumns";
 import { ControlRequirementsTableHeader } from "./ControlRequirementsTableHeader";
-import { useRouter } from "next/navigation";
+import { useParams, useRouter } from "next/navigation";
 import type {
 	OrganizationControlRequirement,
 	OrganizationEvidence,
@@ -28,6 +28,7 @@ interface DataTableProps {
 
 export function ControlRequirementsTable({ data }: DataTableProps) {
 	const router = useRouter();
+	const { orgId } = useParams<{ orgId: string }>();
 
 	const table = useReactTable({
 		data,
@@ -42,12 +43,16 @@ export function ControlRequirementsTable({ data }: DataTableProps) {
 		switch (requirement.type) {
 			case "policy":
 				if (requirement.organizationPolicyId) {
-					router.push(`/policies/all/${requirement.organizationPolicyId}`);
+					router.push(
+						`/${orgId}/policies/all/${requirement.organizationPolicyId}`,
+					);
 				}
 				break;
 			case "evidence":
 				if (requirement.organizationEvidenceId) {
-					router.push(`/evidence/${requirement.organizationEvidenceId}`);
+					router.push(
+						`/${orgId}/evidence/${requirement.organizationEvidenceId}`,
+					);
 				}
 				break;
 			default:
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/controls/[id]/components/table/ControlRequirementsTableColumns.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/controls/[id]/components/table/ControlRequirementsTableColumns.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/controls/[id]/components/table/ControlRequirementsTableColumns.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/controls/[id]/components/table/ControlRequirementsTableColumns.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/controls/[id]/components/table/ControlRequirementsTableHeader.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/controls/[id]/components/table/ControlRequirementsTableHeader.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/controls/[id]/components/table/ControlRequirementsTableHeader.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/controls/[id]/components/table/ControlRequirementsTableHeader.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/controls/[id]/components/table/types.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/controls/[id]/components/table/types.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/controls/[id]/components/table/types.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/controls/[id]/components/table/types.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/controls/[id]/hooks/useOrganizationControl.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/controls/[id]/hooks/useOrganizationControl.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/controls/[id]/hooks/useOrganizationControl.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/controls/[id]/hooks/useOrganizationControl.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/controls/[id]/hooks/useOrganizationControlProgress.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/controls/[id]/hooks/useOrganizationControlProgress.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/controls/[id]/hooks/useOrganizationControlProgress.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/controls/[id]/hooks/useOrganizationControlProgress.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/controls/[id]/hooks/useOrganizationControlRequirements.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/controls/[id]/hooks/useOrganizationControlRequirements.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/controls/[id]/hooks/useOrganizationControlRequirements.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/controls/[id]/hooks/useOrganizationControlRequirements.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/controls/[id]/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/controls/[id]/page.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/(home)/overview/frameworks/controls/[id]/page.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/overview/frameworks/controls/[id]/page.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/(home)/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/page.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/(home)/page.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/(home)/page.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/error.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/error.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/error.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/error.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/PathProvider.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/PathProvider.tsx
new file mode 100644
index 0000000000..aebd8d008e
--- /dev/null
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/PathProvider.tsx
@@ -0,0 +1,62 @@
+"use client";
+
+import { usePathname } from "next/navigation";
+import { SecondaryMenu } from "@bubba/ui/secondary-menu";
+import { useEffect, useState } from "react";
+
+interface PathProviderProps {
+	organizationId: string;
+	translationBackButton: string;
+	translationOverview: string;
+	translationEdit: string;
+}
+
+export function PathProvider({
+	organizationId,
+	translationBackButton,
+	translationOverview,
+	translationEdit,
+}: PathProviderProps) {
+	const pathname = usePathname();
+	const [evidenceId, setEvidenceId] = useState<string>("");
+
+	useEffect(() => {
+		const pathParts = pathname.split("/");
+		const evidenceIndex = pathParts.findIndex((part) => part === "evidence");
+		const id =
+			evidenceIndex >= 0 && pathParts.length > evidenceIndex + 1
+				? pathParts[evidenceIndex + 1]
+				: "";
+
+		// Only update if we've got a valid ID
+		if (id && id !== "list") {
+			setEvidenceId(id);
+		}
+	}, [pathname]);
+
+	// The back button should always be visible when we're in any evidence detail page
+	// This is when we have an evidence ID in the URL that's not "list"
+	const showBackButton = evidenceId !== "";
+
+	// Format paths exactly as they would appear in the URL to ensure matching works correctly
+	const overviewPath = `/${organizationId}/evidence/${evidenceId}`;
+	const editPath = `/${organizationId}/evidence/${evidenceId}/edit`;
+
+	return (
+		<SecondaryMenu
+			items={[
+				{
+					path: overviewPath,
+					label: translationOverview,
+				},
+				{
+					path: editPath,
+					label: translationEdit,
+				},
+			]}
+			showBackButton={showBackButton}
+			backButtonHref={`/${organizationId}/evidence/list`}
+			backButtonLabel={translationBackButton}
+		/>
+	);
+}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/actions/assignEvidence.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/actions/assignEvidence.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/actions/assignEvidence.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/actions/assignEvidence.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/actions/deleteEvidenceFile.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/actions/deleteEvidenceFile.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/actions/deleteEvidenceFile.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/actions/deleteEvidenceFile.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/actions/getEvidenceFileUrl.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/actions/getEvidenceFileUrl.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/actions/getEvidenceFileUrl.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/actions/getEvidenceFileUrl.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/actions/publishEvidence.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/actions/publishEvidence.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/actions/publishEvidence.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/actions/publishEvidence.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/actions/toggleRelevance.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/actions/toggleRelevance.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/actions/toggleRelevance.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/actions/toggleRelevance.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/actions/updateEvidenceDepartment.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/actions/updateEvidenceDepartment.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/actions/updateEvidenceDepartment.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/actions/updateEvidenceDepartment.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/actions/updateEvidenceFrequency.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/actions/updateEvidenceFrequency.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/actions/updateEvidenceFrequency.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/actions/updateEvidenceFrequency.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/actions/updateEvidenceUrls.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/actions/updateEvidenceUrls.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/actions/updateEvidenceUrls.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/actions/updateEvidenceUrls.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/actions/uploadEvidenceFile.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/actions/uploadEvidenceFile.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/actions/uploadEvidenceFile.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/actions/uploadEvidenceFile.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/components/AssigneeSection.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/components/AssigneeSection.tsx
new file mode 100644
index 0000000000..b2ac857217
--- /dev/null
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/components/AssigneeSection.tsx
@@ -0,0 +1,136 @@
+"use client";
+
+import { useState, useEffect } from "react";
+import {
+	Select,
+	SelectContent,
+	SelectItem,
+	SelectTrigger,
+	SelectValue,
+} from "@bubba/ui/select";
+import { Avatar, AvatarFallback, AvatarImage } from "@bubba/ui/avatar";
+import { useAction } from "next-safe-action/hooks";
+import { toast } from "sonner";
+import { assignEvidence } from "../actions/assignEvidence";
+import { useOrganizationAdmins } from "../../../hooks/useOrganizationAdmins";
+import type { Admin } from "../../../hooks/useOrganizationAdmins";
+
+interface AssigneeSectionProps {
+	evidenceId: string;
+	currentAssigneeId: string | null | undefined;
+	onSuccess: () => Promise<void>;
+}
+
+export function AssigneeSection({
+	evidenceId,
+	currentAssigneeId,
+	onSuccess,
+}: AssigneeSectionProps) {
+	const [assigneeId, setAssigneeId] = useState<string | null>(
+		currentAssigneeId || null,
+	);
+	const { data: admins, isLoading, error } = useOrganizationAdmins();
+	const [selectedAdmin, setSelectedAdmin] = useState<Admin | null>(null);
+
+	const { execute: updateAssignee, isExecuting } = useAction(assignEvidence, {
+		onSuccess: async () => {
+			toast.success("Assignee updated successfully");
+			await onSuccess();
+		},
+		onError: () => {
+			toast.error("Failed to update assignee");
+		},
+	});
+
+	useEffect(() => {
+		setAssigneeId(currentAssigneeId || null);
+	}, [currentAssigneeId]);
+
+	useEffect(() => {
+		if (admins && assigneeId) {
+			const admin = admins.find((a) => a.id === assigneeId);
+			setSelectedAdmin(admin || null);
+		} else {
+			setSelectedAdmin(null);
+		}
+	}, [admins, assigneeId]);
+
+	const handleAssigneeChange = (value: string) => {
+		const newAssigneeId = value === "none" ? null : value;
+		setAssigneeId(newAssigneeId);
+
+		if (newAssigneeId && admins) {
+			const admin = admins.find((a) => a.id === newAssigneeId);
+			setSelectedAdmin(admin || null);
+		} else {
+			setSelectedAdmin(null);
+		}
+
+		updateAssignee({ id: evidenceId, assigneeId: newAssigneeId });
+	};
+
+	if (isLoading) {
+		return <div className="h-9 w-full animate-pulse rounded-md bg-muted" />;
+	}
+
+	if (error || !admins) {
+		return <p className="text-sm text-red-500">Failed to load</p>;
+	}
+
+	return (
+		<div className="w-full">
+			<Select
+				value={assigneeId || "none"}
+				onValueChange={handleAssigneeChange}
+				disabled={isExecuting}
+			>
+				<SelectTrigger className="w-full">
+					{selectedAdmin ? (
+						<div className="flex items-center gap-2">
+							<Avatar className="h-5 w-5 shrink-0">
+								<AvatarImage
+									src={selectedAdmin.image || undefined}
+									alt={selectedAdmin.name}
+								/>
+								<AvatarFallback>{selectedAdmin.name.charAt(0)}</AvatarFallback>
+							</Avatar>
+							<span className="truncate">{selectedAdmin.name}</span>
+						</div>
+					) : (
+						<SelectValue placeholder="Assign to..." />
+					)}
+				</SelectTrigger>
+				<SelectContent
+					className="min-w-[var(--radix-select-trigger-width)] w-auto max-w-[250px] z-50"
+					position="popper"
+					sideOffset={5}
+					align="start"
+				>
+					<SelectItem value="none" className="w-full p-0 overflow-hidden">
+						<div className="py-1.5 px-3 w-full">
+							<span className="pl-7">None</span>
+						</div>
+					</SelectItem>
+					{admins.map((admin) => (
+						<SelectItem
+							key={admin.id}
+							value={admin.id}
+							className="w-full p-0 overflow-hidden"
+						>
+							<div className="flex items-center gap-2 py-1.5 px-3 w-full">
+								<Avatar className="h-5 w-5 shrink-0">
+									<AvatarImage
+										src={admin.image || undefined}
+										alt={admin.name}
+									/>
+									<AvatarFallback>{admin.name.charAt(0)}</AvatarFallback>
+								</Avatar>
+								<span className="truncate">{admin.name}</span>
+							</div>
+						</SelectItem>
+					))}
+				</SelectContent>
+			</Select>
+		</div>
+	);
+}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/components/DepartmentSection.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/components/DepartmentSection.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/components/DepartmentSection.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/components/DepartmentSection.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/components/EvidenceDetails.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/components/EvidenceDetails.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/components/EvidenceDetails.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/components/EvidenceDetails.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/components/FileCard.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/components/FileCard.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/components/FileCard.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/components/FileCard.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/components/FileIcon.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/components/FileIcon.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/components/FileIcon.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/components/FileIcon.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/components/FileSection.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/components/FileSection.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/components/FileSection.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/components/FileSection.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/components/FileUpload.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/components/FileUpload.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/components/FileUpload.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/components/FileUpload.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/components/FrequencySection.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/components/FrequencySection.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/components/FrequencySection.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/components/FrequencySection.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/components/ReviewDateCard.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/components/ReviewDateCard.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/components/ReviewDateCard.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/components/ReviewDateCard.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/components/ReviewSection.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/components/ReviewSection.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/components/ReviewSection.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/components/ReviewSection.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/components/UrlSection.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/components/UrlSection.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/components/UrlSection.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/components/UrlSection.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/edit/components/EditEvidenceForm.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/edit/components/EditEvidenceForm.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/edit/components/EditEvidenceForm.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/edit/components/EditEvidenceForm.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/edit/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/edit/page.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/edit/page.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/edit/page.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/hooks/useFileDelete.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/hooks/useFileDelete.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/hooks/useFileDelete.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/hooks/useFileDelete.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/hooks/useFilePreview.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/hooks/useFilePreview.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/hooks/useFilePreview.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/hooks/useFilePreview.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/hooks/useFileUpload.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/hooks/useFileUpload.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/hooks/useFileUpload.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/hooks/useFileUpload.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/hooks/useOrganizationEvidence.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/hooks/useOrganizationEvidence.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/hooks/useOrganizationEvidence.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/hooks/useOrganizationEvidence.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/hooks/useUrlManagement.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/hooks/useUrlManagement.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/hooks/useUrlManagement.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/hooks/useUrlManagement.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/layout.tsx
new file mode 100644
index 0000000000..5b3c097905
--- /dev/null
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/layout.tsx
@@ -0,0 +1,26 @@
+import { auth } from "@/auth";
+import { getI18n } from "@/locales/server";
+import { PathProvider } from "./PathProvider";
+
+export default async function Layout({
+	children,
+}: {
+	children: React.ReactNode;
+}) {
+	const t = await getI18n();
+	const session = await auth();
+	const user = session?.user;
+	const organizationId = user?.organizationId;
+
+	return (
+		<div className="max-w-[1200px] m-auto">
+			<PathProvider
+				organizationId={organizationId ?? ""}
+				translationBackButton={t("evidence.dashboard.layout_back_button")}
+				translationOverview={t("evidence.overview")}
+				translationEdit={t("evidence.edit")}
+			/>
+			<main className="py-4">{children}</main>
+		</div>
+	);
+}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/page.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/page.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/page.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/types.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/types.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/types.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/[id]/types.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/actions/getAllOrganizationControlRequirements.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/actions/getAllOrganizationControlRequirements.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/actions/getAllOrganizationControlRequirements.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/actions/getAllOrganizationControlRequirements.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/actions/getEvidence.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/actions/getEvidence.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/actions/getEvidence.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/actions/getEvidence.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/actions/getEvidenceTasksStats.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/actions/getEvidenceTasksStats.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/actions/getEvidenceTasksStats.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/actions/getEvidenceTasksStats.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/actions/getOrganizationAdmins.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/actions/getOrganizationAdmins.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/actions/getOrganizationAdmins.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/actions/getOrganizationAdmins.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/actions/getOrganizationEmployees.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/actions/getOrganizationEmployees.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/actions/getOrganizationEmployees.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/actions/getOrganizationEmployees.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/actions/getOrganizationEvidence.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/actions/getOrganizationEvidence.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/actions/getOrganizationEvidence.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/actions/getOrganizationEvidence.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/actions/getOrganizationEvidenceTasks.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/actions/getOrganizationEvidenceTasks.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/actions/getOrganizationEvidenceTasks.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/actions/getOrganizationEvidenceTasks.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/constants.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/constants.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/constants.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/constants.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/hooks/useEvidenceTasks.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/hooks/useEvidenceTasks.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/hooks/useEvidenceTasks.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/hooks/useEvidenceTasks.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/hooks/useEvidenceTasksStats.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/hooks/useEvidenceTasksStats.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/hooks/useEvidenceTasksStats.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/hooks/useEvidenceTasksStats.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/list/components/EvidenceList.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/list/components/EvidenceList.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/list/components/EvidenceList.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/list/components/EvidenceList.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/list/components/EvidenceListUIStates.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/list/components/EvidenceListUIStates.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/list/components/EvidenceListUIStates.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/list/components/EvidenceListUIStates.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/list/components/EvidenceSummaryCards.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/list/components/EvidenceSummaryCards.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/list/components/EvidenceSummaryCards.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/list/components/EvidenceSummaryCards.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/list/components/index.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/list/components/index.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/list/components/index.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/list/components/index.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/list/components/table/EvidenceFilters/ActiveFilterBadges.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/list/components/table/EvidenceFilters/ActiveFilterBadges.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/list/components/table/EvidenceFilters/ActiveFilterBadges.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/list/components/table/EvidenceFilters/ActiveFilterBadges.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/list/components/table/EvidenceFilters/index.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/list/components/table/EvidenceFilters/index.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/list/components/table/EvidenceFilters/index.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/list/components/table/EvidenceFilters/index.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/list/components/table/EvidenceListColumns.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/list/components/table/EvidenceListColumns.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/list/components/table/EvidenceListColumns.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/list/components/table/EvidenceListColumns.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/list/components/table/EvidenceListHeader.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/list/components/table/EvidenceListHeader.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/list/components/table/EvidenceListHeader.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/list/components/table/EvidenceListHeader.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/list/components/table/EvidenceListTable.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/list/components/table/EvidenceListTable.tsx
similarity index 92%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/list/components/table/EvidenceListTable.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/list/components/table/EvidenceListTable.tsx
index fdbe556334..685905dd6d 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/list/components/table/EvidenceListTable.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/list/components/table/EvidenceListTable.tsx
@@ -3,12 +3,14 @@
 import { DataTable } from "@/components/ui/data-table";
 import { EvidenceListColumns } from "./EvidenceListColumns";
 import type { EvidenceTaskRow } from "../../types";
-import { useRouter } from "next/navigation";
+import { useParams, useRouter } from "next/navigation";
 import { useEvidenceTable } from "../../hooks/useEvidenceTableContext";
 import { getFilterCategories } from "./components/filterCategories";
 
 export function EvidenceListTable({ data }: { data: EvidenceTaskRow[] }) {
 	const router = useRouter();
+	const { orgId } = useParams<{ orgId: string }>();
+
 	const {
 		page,
 		setPage,
@@ -37,7 +39,7 @@ export function EvidenceListTable({ data }: { data: EvidenceTaskRow[] }) {
 	} = useEvidenceTable();
 
 	const handleRowClick = (evidenceId: string) => {
-		router.push(`/evidence/${evidenceId}`);
+		router.push(`/${orgId}/evidence/${evidenceId}`);
 	};
 
 	const activeFilterCount = [
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/list/components/table/components/AssigneeAvatar.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/list/components/table/components/AssigneeAvatar.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/list/components/table/components/AssigneeAvatar.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/list/components/table/components/AssigneeAvatar.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/list/components/table/components/filterCategories.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/list/components/table/components/filterCategories.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/list/components/table/components/filterCategories.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/list/components/table/components/filterCategories.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/list/components/table/components/filterConfigs.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/list/components/table/components/filterConfigs.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/list/components/table/components/filterConfigs.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/list/components/table/components/filterConfigs.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/list/components/table/index.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/list/components/table/index.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/list/components/table/index.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/list/components/table/index.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/list/hooks/useEvidenceTableContext.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/list/hooks/useEvidenceTableContext.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/list/hooks/useEvidenceTableContext.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/list/hooks/useEvidenceTableContext.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/list/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/list/layout.tsx
new file mode 100644
index 0000000000..12a3e9d9cb
--- /dev/null
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/list/layout.tsx
@@ -0,0 +1,33 @@
+import { auth } from "@/auth";
+import { getI18n } from "@/locales/server";
+import { SecondaryMenu } from "@bubba/ui/secondary-menu";
+
+export default async function Layout({
+	children,
+}: {
+	children: React.ReactNode;
+}) {
+	const t = await getI18n();
+	const session = await auth();
+	const user = session?.user;
+	const organizationId = user?.organizationId;
+
+	return (
+		<div className="max-w-[1200px] m-auto">
+			<SecondaryMenu
+				items={[
+					{
+						path: `/${organizationId}/evidence/overview`,
+						label: t("evidence.dashboard.layout"),
+					},
+					{
+						path: `/${organizationId}/evidence/list`,
+						label: t("evidence.list"),
+					},
+				]}
+			/>
+
+			<main className="py-8">{children}</main>
+		</div>
+	);
+}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/list/loading.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/list/loading.tsx
new file mode 100644
index 0000000000..a683eafd55
--- /dev/null
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/list/loading.tsx
@@ -0,0 +1,16 @@
+import { DataTableSkeleton } from "@/components/ui/data-table";
+import { Card } from "@bubba/ui/card";
+
+export default function EvidenceListLoading() {
+	return (
+		<Card className="p-6">
+			<DataTableSkeleton
+				columns={6}
+				rows={10}
+				showFilters={true}
+				showSearch={true}
+				showPagination={true}
+			/>
+		</Card>
+	);
+}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/list/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/list/page.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/list/page.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/list/page.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/list/types.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/list/types.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/list/types.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/list/types.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/components/AnimatedBar.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/overview/components/AnimatedBar.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/components/AnimatedBar.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/overview/components/AnimatedBar.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/components/AssigneeChart/AssigneeBarChart.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/overview/components/AssigneeChart/AssigneeBarChart.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/components/AssigneeChart/AssigneeBarChart.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/overview/components/AssigneeChart/AssigneeBarChart.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/components/AssigneeChart/AssigneeChartRow.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/overview/components/AssigneeChart/AssigneeChartRow.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/components/AssigneeChart/AssigneeChartRow.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/overview/components/AssigneeChart/AssigneeChartRow.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/components/DepartmentChart/DepartmentBarChart.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/overview/components/DepartmentChart/DepartmentBarChart.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/components/DepartmentChart/DepartmentBarChart.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/overview/components/DepartmentChart/DepartmentBarChart.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/components/DepartmentChart/DepartmentChartRow.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/overview/components/DepartmentChart/DepartmentChartRow.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/components/DepartmentChart/DepartmentChartRow.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/overview/components/DepartmentChart/DepartmentChartRow.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/components/EvidenceOverview.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/overview/components/EvidenceOverview.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/components/EvidenceOverview.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/overview/components/EvidenceOverview.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/components/EvidenceUIStates.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/overview/components/EvidenceUIStates.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/components/EvidenceUIStates.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/overview/components/EvidenceUIStates.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/components/FrameworkChart/FrameworkBarChart.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/overview/components/FrameworkChart/FrameworkBarChart.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/components/FrameworkChart/FrameworkBarChart.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/overview/components/FrameworkChart/FrameworkBarChart.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/components/FrameworkChart/FrameworkChartRow.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/overview/components/FrameworkChart/FrameworkChartRow.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/components/FrameworkChart/FrameworkChartRow.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/overview/components/FrameworkChart/FrameworkChartRow.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/components/HorizontalBarChart.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/overview/components/HorizontalBarChart.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/components/HorizontalBarChart.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/overview/components/HorizontalBarChart.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/constants/departments.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/overview/constants/departments.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/constants/departments.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/overview/constants/departments.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/constants/evidence-status.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/overview/constants/evidence-status.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/constants/evidence-status.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/overview/constants/evidence-status.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/data/getEvidenceDashboard.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/overview/data/getEvidenceDashboard.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/data/getEvidenceDashboard.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/overview/data/getEvidenceDashboard.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/hooks/useAssigneeData.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/overview/hooks/useAssigneeData.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/hooks/useAssigneeData.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/overview/hooks/useAssigneeData.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/hooks/useEvidenceData.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/overview/hooks/useEvidenceData.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/hooks/useEvidenceData.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/overview/hooks/useEvidenceData.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/hooks/useFrameworkData.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/overview/hooks/useFrameworkData.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/hooks/useFrameworkData.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/overview/hooks/useFrameworkData.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/hooks/useScrollPosition.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/overview/hooks/useScrollPosition.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/hooks/useScrollPosition.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/overview/hooks/useScrollPosition.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/hooks/useStatusTranslation.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/overview/hooks/useStatusTranslation.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/hooks/useStatusTranslation.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/overview/hooks/useStatusTranslation.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/overview/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/overview/layout.tsx
new file mode 100644
index 0000000000..12a3e9d9cb
--- /dev/null
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/overview/layout.tsx
@@ -0,0 +1,33 @@
+import { auth } from "@/auth";
+import { getI18n } from "@/locales/server";
+import { SecondaryMenu } from "@bubba/ui/secondary-menu";
+
+export default async function Layout({
+	children,
+}: {
+	children: React.ReactNode;
+}) {
+	const t = await getI18n();
+	const session = await auth();
+	const user = session?.user;
+	const organizationId = user?.organizationId;
+
+	return (
+		<div className="max-w-[1200px] m-auto">
+			<SecondaryMenu
+				items={[
+					{
+						path: `/${organizationId}/evidence/overview`,
+						label: t("evidence.dashboard.layout"),
+					},
+					{
+						path: `/${organizationId}/evidence/list`,
+						label: t("evidence.list"),
+					},
+				]}
+			/>
+
+			<main className="py-8">{children}</main>
+		</div>
+	);
+}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/loading.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/overview/loading.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/loading.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/overview/loading.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/overview/page.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/page.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/overview/page.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/page.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/page.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/evidence/page.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/[testId]/hooks/useOrganizationAdmins.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/hooks/useOrganizationAdmins.ts
similarity index 90%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/[testId]/hooks/useOrganizationAdmins.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/hooks/useOrganizationAdmins.ts
index 66d94fbc7a..b1712d344b 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/[testId]/hooks/useOrganizationAdmins.ts
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/hooks/useOrganizationAdmins.ts
@@ -1,7 +1,7 @@
 "use client";
 
 import useSWR from "swr";
-import { getOrganizationAdmins } from "../../actions/getOrganizationAdmins";
+import { getOrganizationAdmins } from "../evidence/actions/getOrganizationAdmins";
 
 export interface Admin {
   id: string;
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/integrations/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/integrations/page.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/integrations/page.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/integrations/page.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/layout.tsx
new file mode 100644
index 0000000000..b14581486d
--- /dev/null
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/layout.tsx
@@ -0,0 +1,46 @@
+import { auth } from "@/auth";
+import { Header } from "@/components/header";
+import { Sidebar } from "@/components/sidebar";
+import { db } from "@bubba/db";
+import dynamic from "next/dynamic";
+import { redirect } from "next/navigation";
+import { cache } from "react";
+
+const HotKeys = dynamic(
+	() => import("@/components/hot-keys").then((mod) => mod.HotKeys),
+	{
+		ssr: true,
+	},
+);
+
+export default async function Layout({
+	children,
+	params,
+}: {
+	children: React.ReactNode;
+	params: Promise<{ orgId: string }>;
+}) {
+	const session = await auth();
+	const orgId = (await params).orgId;
+
+	if (!session) {
+		redirect("/auth");
+	}
+
+	if (!orgId) {
+		redirect("/");
+	}
+
+	return (
+		<div className="relative">
+			<Sidebar />
+
+			<div className="mx-4 md:ml-[95px] md:mr-10 pb-8">
+				<Header />
+				<main>{children}</main>
+			</div>
+
+			<HotKeys />
+		</div>
+	);
+}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/people/[employeeId]/actions/get-employee-details.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/[employeeId]/actions/get-employee-details.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/people/[employeeId]/actions/get-employee-details.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/[employeeId]/actions/get-employee-details.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/people/[employeeId]/actions/update-department.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/[employeeId]/actions/update-department.ts
similarity index 94%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/people/[employeeId]/actions/update-department.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/[employeeId]/actions/update-department.ts
index b9d9a7dee0..0621492e89 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/people/[employeeId]/actions/update-department.ts
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/[employeeId]/actions/update-department.ts
@@ -63,8 +63,8 @@ export const updateEmployeeDepartment = authActionClient
       });
 
       // Revalidate related paths
-      revalidatePath(`/people/${employeeId}`);
-      revalidatePath("/people");
+      revalidatePath(`/${organizationId}/people/${employeeId}`);
+      revalidatePath(`/${organizationId}/people`);
 
       return {
         success: true,
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/people/[employeeId]/components/EditableDepartment.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/[employeeId]/components/EditableDepartment.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/people/[employeeId]/components/EditableDepartment.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/[employeeId]/components/EditableDepartment.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/people/[employeeId]/components/EmployeeDetails.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/[employeeId]/components/EmployeeDetails.tsx
similarity index 95%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/people/[employeeId]/components/EmployeeDetails.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/[employeeId]/components/EmployeeDetails.tsx
index d68e9fa6e3..010309b3b3 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/people/[employeeId]/components/EmployeeDetails.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/[employeeId]/components/EmployeeDetails.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { redirect } from "next/navigation";
+import { redirect, useParams } from "next/navigation";
 import { Card, CardContent, CardHeader, CardTitle } from "@bubba/ui/card";
 import { useI18n } from "@/locales/client";
 import { useEmployeeDetails } from "../../hooks/useEmployee";
@@ -18,12 +18,12 @@ interface EmployeeDetailsProps {
 }
 
 export function EmployeeDetails({ employeeId }: EmployeeDetailsProps) {
-	const t = useI18n();
 	const { employee, isLoading, error, mutate } = useEmployeeDetails(employeeId);
+	const { orgId } = useParams<{ orgId: string }>();
 
 	if (error) {
 		if (error.code === "NOT_FOUND") {
-			redirect("/people");
+			redirect(`/${orgId}/people`);
 		}
 
 		return (
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/people/[employeeId]/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/[employeeId]/page.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/people/[employeeId]/page.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/[employeeId]/page.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/people/[employeeId]/types/index.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/[employeeId]/types/index.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/people/[employeeId]/types/index.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/[employeeId]/types/index.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/people/actions/get-employees.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/actions/get-employees.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/people/actions/get-employees.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/actions/get-employees.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/people/components/EmployeesList.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/components/EmployeesList.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/people/components/EmployeesList.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/components/EmployeesList.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/people/components/EmployeesListSkeleton.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/components/EmployeesListSkeleton.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/people/components/EmployeesListSkeleton.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/components/EmployeesListSkeleton.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/people/components/table/EmployeesTable.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/components/table/EmployeesTable.tsx
similarity index 91%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/people/components/table/EmployeesTable.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/components/table/EmployeesTable.tsx
index 0cb71c46c8..f6c0c21e4c 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/people/components/table/EmployeesTable.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/components/table/EmployeesTable.tsx
@@ -3,7 +3,7 @@
 import { EmployeeInviteSheet } from "@/components/sheets/invite-user-sheet";
 import { DataTable } from "@/components/ui/data-table";
 import { Plus } from "lucide-react";
-import { useRouter } from "next/navigation";
+import { useParams, useRouter } from "next/navigation";
 import { useQueryState } from "nuqs";
 import { getColumns } from "./columns";
 import { useEmployeesTable } from "./hooks/useEmployeesTableContext";
@@ -11,6 +11,8 @@ import { useEmployeesTable } from "./hooks/useEmployeesTableContext";
 export function EmployeesTable() {
 	const router = useRouter();
 	const [, setInviteSheetOpen] = useQueryState("invite-user-sheet");
+	const { orgId } = useParams<{ orgId: string }>();
+
 	const {
 		page,
 		setPage,
@@ -25,7 +27,7 @@ export function EmployeesTable() {
 	} = useEmployeesTable();
 
 	const handleRowClick = (employeeId: string) => {
-		router.push(`/people/${employeeId}`);
+		router.push(`/${orgId}/people/${employeeId}`);
 	};
 
 	// Calculate pagination values only when total is defined
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/people/components/table/columns.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/components/table/columns.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/people/components/table/columns.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/components/table/columns.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/people/components/table/components/filterCategories.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/components/table/components/filterCategories.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/people/components/table/components/filterCategories.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/components/table/components/filterCategories.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/people/components/table/hooks/useEmployeesTableContext.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/components/table/hooks/useEmployeesTableContext.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/people/components/table/hooks/useEmployeesTableContext.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/components/table/hooks/useEmployeesTableContext.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/people/components/table/types.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/components/table/types.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/people/components/table/types.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/components/table/types.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/people/hooks/useEmployee.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/hooks/useEmployee.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/people/hooks/useEmployee.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/hooks/useEmployee.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/people/hooks/useEmployees.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/hooks/useEmployees.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/people/hooks/useEmployees.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/hooks/useEmployees.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/layout.tsx
similarity index 56%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/layout.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/layout.tsx
index 5b647fae1f..b101e64580 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/layout.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/layout.tsx
@@ -1,3 +1,4 @@
+import { auth } from "@/auth";
 import { getI18n } from "@/locales/server";
 import { SecondaryMenu } from "@bubba/ui/secondary-menu";
 
@@ -7,15 +8,16 @@ export default async function Layout({
 	children: React.ReactNode;
 }) {
 	const t = await getI18n();
+	const session = await auth();
+	const user = session?.user;
+	const orgId = user?.organizationId;
 
 	return (
-		<div className="max-w-[1200px] mx-auto">
+		<div className="max-w-[1200px] m-auto">
 			<SecondaryMenu
-				items={[
-				{ path: "/tests", label: t("tests.dashboard.overview") },
-				{ path: "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/tests/all", label: t("tests.dashboard.all") },
-				]}
+				items={[{ path: `/${orgId}/people`, label: t("people.title") }]}
 			/>
+
 			<main className="mt-8">{children}</main>
 		</div>
 	);
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/people/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/page.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/people/page.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/page.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/people/types.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/types.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/people/types.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/types.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/people/types/index.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/types/index.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/people/types/index.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/types/index.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/people/types/search-params.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/types/search-params.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/people/types/search-params.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/types/search-params.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/(overview)/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/(overview)/layout.tsx
new file mode 100644
index 0000000000..ed7c769148
--- /dev/null
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/(overview)/layout.tsx
@@ -0,0 +1,33 @@
+import { auth } from "@/auth";
+import { getI18n } from "@/locales/server";
+import { SecondaryMenu } from "@bubba/ui/secondary-menu";
+
+export default async function Layout({
+	children,
+}: {
+	children: React.ReactNode;
+}) {
+	const t = await getI18n();
+	const session = await auth();
+	const user = session?.user;
+	const organizationId = user?.organizationId;
+
+	return (
+		<div className="max-w-[1200px] m-auto">
+			<SecondaryMenu
+				items={[
+					{
+						path: `/${organizationId}/policies`,
+						label: t("policies.dashboard.title"),
+					},
+					{
+						path: `/${organizationId}/policies/all`,
+						label: t("policies.dashboard.all"),
+					},
+				]}
+			/>
+
+			<main className="mt-8">{children}</main>
+		</div>
+	);
+}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/(overview)/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/(overview)/page.tsx
new file mode 100644
index 0000000000..662593c842
--- /dev/null
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/(overview)/page.tsx
@@ -0,0 +1,111 @@
+import { auth } from "@/auth";
+import { PoliciesStatus } from "@/components/policies/charts/policies-status";
+import { PoliciesByAssignee } from "@/components/policies/charts/policies-by-assignee";
+import { getI18n } from "@/locales/server";
+import { db } from "@bubba/db";
+import type { Metadata } from "next";
+import { setStaticParamsLocale } from "next-international/server";
+import { unstable_cache } from "next/cache";
+import { redirect } from "next/navigation";
+
+export default async function PoliciesOverview({
+	params,
+}: {
+	params: Promise<{ locale: string }>;
+}) {
+	const { locale } = await params;
+	setStaticParamsLocale(locale);
+
+	const session = await auth();
+
+	if (!session?.user?.organizationId) {
+		redirect("/onboarding");
+	}
+
+	const overview = await getPoliciesOverview(session.user.organizationId);
+
+	if (overview?.totalPolicies === 0) {
+		redirect(`/${session.user.organizationId}/policies/all`);
+	}
+
+	return (
+		<div className="space-y-4 sm:space-y-8">
+			<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+				<PoliciesStatus
+					totalPolicies={overview.totalPolicies}
+					publishedPolicies={overview.publishedPolicies}
+					draftPolicies={overview.draftPolicies}
+					archivedPolicies={overview.archivedPolicies}
+					needsReviewPolicies={overview.needsReviewPolicies}
+				/>
+				<PoliciesByAssignee organizationId={session.user.organizationId} />
+			</div>
+		</div>
+	);
+}
+const getPoliciesOverview = unstable_cache(
+	async (organizationId: string) => {
+		return await db.$transaction(async (tx) => {
+			const [
+				totalPolicies,
+				publishedPolicies,
+				draftPolicies,
+				archivedPolicies,
+				needsReviewPolicies,
+			] = await Promise.all([
+				tx.organizationPolicy.count({
+					where: {
+						organizationId,
+					},
+				}),
+				tx.organizationPolicy.count({
+					where: {
+						organizationId,
+						status: "published",
+					},
+				}),
+				tx.organizationPolicy.count({
+					where: {
+						organizationId,
+						status: "draft",
+					},
+				}),
+				tx.organizationPolicy.count({
+					where: {
+						organizationId,
+						status: "archived",
+					},
+				}),
+				tx.organizationPolicy.count({
+					where: {
+						organizationId,
+						status: "needs_review",
+					},
+				}),
+			]);
+
+			return {
+				totalPolicies,
+				publishedPolicies,
+				draftPolicies,
+				archivedPolicies,
+				needsReviewPolicies,
+			};
+		});
+	},
+	["policies-overview-cache"],
+);
+
+export async function generateMetadata({
+	params,
+}: {
+	params: Promise<{ locale: string }>;
+}): Promise<Metadata> {
+	const { locale } = await params;
+	setStaticParamsLocale(locale);
+	const t = await getI18n();
+
+	return {
+		title: t("sidebar.policies"),
+	};
+}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/(overview)/actions/get-policies.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/(overview)/actions/get-policies.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/(overview)/actions/get-policies.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/(overview)/actions/get-policies.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/(overview)/components/PoliciesList.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/(overview)/components/PoliciesList.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/(overview)/components/PoliciesList.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/(overview)/components/PoliciesList.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/(overview)/components/PoliciesListSkeleton.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/(overview)/components/PoliciesListSkeleton.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/(overview)/components/PoliciesListSkeleton.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/(overview)/components/PoliciesListSkeleton.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/(overview)/components/table/PoliciesTable.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/(overview)/components/table/PoliciesTable.tsx
similarity index 85%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/(overview)/components/table/PoliciesTable.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/(overview)/components/table/PoliciesTable.tsx
index 6c87823857..42a1e911eb 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/(overview)/components/table/PoliciesTable.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/(overview)/components/table/PoliciesTable.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { DataTable } from "@/components/ui/data-table";
-import { useRouter } from "next/navigation";
+import { useParams, useRouter } from "next/navigation";
 import { Plus } from "lucide-react";
 import { getFilterCategories } from "./components/filterCategories";
 import { getColumns } from "./columns";
@@ -10,6 +10,7 @@ import { usePoliciesTable } from "./hooks/usePoliciesTableContext";
 
 export function PoliciesTable({ users }: PoliciesTableProps) {
 	const router = useRouter();
+	const { orgId } = useParams<{ orgId: string }>();
 	const {
 		page,
 		setPage,
@@ -30,7 +31,7 @@ export function PoliciesTable({ users }: PoliciesTableProps) {
 	} = usePoliciesTable();
 
 	const handleRowClick = (policyId: string) => {
-		router.push(`/policies/all/${policyId}`);
+		router.replace(`/${orgId}/policies/all/${policyId}`);
 	};
 
 	const activeFilterCount = [status, ownerId].filter(Boolean).length;
@@ -78,11 +79,11 @@ export function PoliciesTable({ users }: PoliciesTableProps) {
 				onClearFilters: clearFilters,
 				activeFilterCount,
 			}}
-			ctaButton={{
-				label: "Create Policy",
-				onClick: () => router.push("/policies/all/new"),
-				icon: <Plus className="h-4 w-4" />,
-			}}
+			// ctaButton={{
+			// 	label: "Create Policy",
+			// 	onClick: () => router.push(`/${orgId}/policies/all/new`),
+			// 	icon: <Plus className="h-4 w-4" />,
+			// }}
 		/>
 	);
 }
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/(overview)/components/table/columns.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/(overview)/components/table/columns.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/(overview)/components/table/columns.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/(overview)/components/table/columns.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/(overview)/components/table/components/filterCategories.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/(overview)/components/table/components/filterCategories.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/(overview)/components/table/components/filterCategories.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/(overview)/components/table/components/filterCategories.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/(overview)/components/table/components/filterConfigs.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/(overview)/components/table/components/filterConfigs.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/(overview)/components/table/components/filterConfigs.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/(overview)/components/table/components/filterConfigs.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/(overview)/components/table/hooks/usePoliciesTableContext.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/(overview)/components/table/hooks/usePoliciesTableContext.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/(overview)/components/table/hooks/usePoliciesTableContext.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/(overview)/components/table/hooks/usePoliciesTableContext.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/(overview)/components/table/types.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/(overview)/components/table/types.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/(overview)/components/table/types.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/(overview)/components/table/types.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/(overview)/components/table/utils.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/(overview)/components/table/utils.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/(overview)/components/table/utils.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/(overview)/components/table/utils.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/(overview)/hooks/usePolicies.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/(overview)/hooks/usePolicies.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/(overview)/hooks/usePolicies.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/(overview)/hooks/usePolicies.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/(overview)/hooks/usePolicy.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/(overview)/hooks/usePolicy.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/(overview)/hooks/usePolicy.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/(overview)/hooks/usePolicy.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/(overview)/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/(overview)/layout.tsx
new file mode 100644
index 0000000000..ed7c769148
--- /dev/null
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/(overview)/layout.tsx
@@ -0,0 +1,33 @@
+import { auth } from "@/auth";
+import { getI18n } from "@/locales/server";
+import { SecondaryMenu } from "@bubba/ui/secondary-menu";
+
+export default async function Layout({
+	children,
+}: {
+	children: React.ReactNode;
+}) {
+	const t = await getI18n();
+	const session = await auth();
+	const user = session?.user;
+	const organizationId = user?.organizationId;
+
+	return (
+		<div className="max-w-[1200px] m-auto">
+			<SecondaryMenu
+				items={[
+					{
+						path: `/${organizationId}/policies`,
+						label: t("policies.dashboard.title"),
+					},
+					{
+						path: `/${organizationId}/policies/all`,
+						label: t("policies.dashboard.all"),
+					},
+				]}
+			/>
+
+			<main className="mt-8">{children}</main>
+		</div>
+	);
+}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/(overview)/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/(overview)/page.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/(overview)/page.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/(overview)/page.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/(overview)/types/index.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/(overview)/types/index.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/(overview)/types/index.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/(overview)/types/index.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/(overview)/types/search-params.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/(overview)/types/search-params.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/(overview)/types/search-params.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/(overview)/types/search-params.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/[policyId]/editor/actions/get-policy-details.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/[policyId]/editor/actions/get-policy-details.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/[policyId]/editor/actions/get-policy-details.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/[policyId]/editor/actions/get-policy-details.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/[policyId]/editor/actions/update-policy.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/[policyId]/editor/actions/update-policy.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/[policyId]/editor/actions/update-policy.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/[policyId]/editor/actions/update-policy.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/[policyId]/editor/components/PolicyDetails.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/[policyId]/editor/components/PolicyDetails.tsx
new file mode 100644
index 0000000000..a80bd88f09
--- /dev/null
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/[policyId]/editor/components/PolicyDetails.tsx
@@ -0,0 +1,69 @@
+"use client";
+
+import { Card, CardContent, CardHeader } from "@bubba/ui/card";
+import { Skeleton } from "@bubba/ui/skeleton";
+import { redirect, useParams } from "next/navigation";
+import { PolicyEditor } from "@/components/editor/policy-editor";
+import { usePolicyDetails } from "../../../(overview)/hooks/usePolicy";
+import type { JSONContent } from "@tiptap/react";
+import "@bubba/ui/editor.css";
+
+interface PolicyDetailsProps {
+	policyId: string;
+}
+
+export function PolicyDetails({ policyId }: PolicyDetailsProps) {
+	const { policy, isLoading, updatePolicy } = usePolicyDetails(policyId);
+	const { orgId } = useParams();
+
+	if (isLoading) {
+		return (
+			<div className="space-y-4">
+				<div className="flex flex-col space-y-4">
+					<Skeleton className="h-8 w-48" />
+					<Skeleton className="h-4 w-32" />
+				</div>
+				<Card>
+					<CardHeader>
+						<Skeleton className="h-6 w-32" />
+					</CardHeader>
+					<CardContent>
+						<div className="space-y-2">
+							<Skeleton className="h-4 w-full" />
+							<Skeleton className="h-4 w-full" />
+							<Skeleton className="h-4 w-3/4" />
+						</div>
+					</CardContent>
+				</Card>
+			</div>
+		);
+	}
+
+	if (!policy) return redirect(`/${orgId}/policies`);
+
+	const formattedContent = Array.isArray(policy.content)
+		? policy.content
+		: typeof policy.content === "object" && policy.content !== null
+			? [policy.content as JSONContent]
+			: [];
+
+	const handleSavePolicy = async (content: JSONContent[]): Promise<void> => {
+		if (!policy) return;
+
+		try {
+			await updatePolicy({
+				...policy,
+				content,
+			});
+		} catch (error) {
+			console.error("Error saving policy:", error);
+			throw error;
+		}
+	};
+
+	return (
+		<div className="flex flex-col h-full mx-auto">
+			<PolicyEditor content={formattedContent} onSave={handleSavePolicy} />
+		</div>
+	);
+}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/[policyId]/editor/components/PolicyHeader.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/[policyId]/editor/components/PolicyHeader.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/[policyId]/editor/components/PolicyHeader.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/[policyId]/editor/components/PolicyHeader.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/[policyId]/editor/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/[policyId]/editor/page.tsx
new file mode 100644
index 0000000000..dd96ab394d
--- /dev/null
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/[policyId]/editor/page.tsx
@@ -0,0 +1,30 @@
+import { getI18n } from "@/locales/server";
+import type { Metadata } from "next";
+import { setStaticParamsLocale } from "next-international/server";
+import { PolicyDetails } from "./components/PolicyDetails";
+
+export default async function PolicyEditor({
+	params,
+}: {
+	params: Promise<{ locale: string; policyId: string }>;
+}) {
+	const { locale, policyId } = await params;
+	setStaticParamsLocale(locale);
+
+	return <PolicyDetails policyId={policyId} />;
+}
+
+export async function generateMetadata({
+	params,
+}: {
+	params: Promise<{ locale: string; policyId: string }>;
+}): Promise<Metadata> {
+	const { locale } = await params;
+
+	setStaticParamsLocale(locale);
+	const t = await getI18n();
+
+	return {
+		title: t("sub_pages.policies.policy_details"),
+	};
+}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/[policyId]/editor/types/index.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/[policyId]/editor/types/index.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/[policyId]/editor/types/index.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/[policyId]/editor/types/index.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/[policyId]/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/[policyId]/layout.tsx
new file mode 100644
index 0000000000..90e98cfa72
--- /dev/null
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/[policyId]/layout.tsx
@@ -0,0 +1,64 @@
+import { auth } from "@/auth";
+import { getI18n } from "@/locales/server";
+import { db } from "@bubba/db";
+import { SecondaryMenu } from "@bubba/ui/secondary-menu";
+import { redirect } from "next/navigation";
+import { cache } from "react";
+
+interface LayoutProps {
+	children: React.ReactNode;
+	params: Promise<{ policyId: string; orgId: string }>;
+}
+
+export default async function Layout({ children, params }: LayoutProps) {
+	const t = await getI18n();
+	const { policyId, orgId } = await params;
+
+	const session = await auth();
+	const organizationId = session?.user.organizationId;
+
+	if (!organizationId) {
+		redirect("/");
+	}
+
+	const policy = await getPolicy(policyId, organizationId);
+
+	if (!policy) {
+		redirect("/");
+	}
+
+	return (
+		<div className="max-w-[1200px] space-y-4 m-auto">
+			<SecondaryMenu
+				showBackButton
+				backButtonHref={`/${orgId}/policies/all`}
+				items={[
+					{
+						path: `/${orgId}/policies/all/${policyId}`,
+						label: t("policies.dashboard.sub_pages.overview"),
+					},
+					{
+						path: `/${orgId}/policies/all/${policyId}/editor`,
+						label: t("policies.dashboard.sub_pages.edit_policy"),
+					},
+				]}
+			/>
+
+			<main className="mt-8">{children}</main>
+		</div>
+	);
+}
+
+const getPolicy = cache(async (policyId: string, organizationId: string) => {
+	const policy = await db.organizationPolicy.findUnique({
+		where: {
+			id: policyId,
+			organizationId: organizationId,
+		},
+		include: {
+			policy: true,
+		},
+	});
+
+	return policy;
+});
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/[policyId]/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/[policyId]/page.tsx
new file mode 100644
index 0000000000..f07a4063d4
--- /dev/null
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/[policyId]/page.tsx
@@ -0,0 +1,70 @@
+import { PolicyComment } from "@/components/policies/policy-comments";
+import { PolicyOverview } from "@/components/policies/policy-overview";
+import { getI18n } from "@/locales/server";
+import { db } from "@bubba/db";
+import type { Metadata } from "next";
+import { setStaticParamsLocale } from "next-international/server";
+import { redirect } from "next/navigation";
+import { cache } from "react";
+
+export default async function PolicyDetails({
+	params,
+}: {
+	params: Promise<{ locale: string; policyId: string; orgId: string }>;
+}) {
+	const { locale, policyId, orgId } = await params;
+	setStaticParamsLocale(locale);
+
+	const policy = await getPolicy(policyId, orgId);
+	const users = await getUsers(orgId);
+
+	if (!policy) {
+		redirect(`/${orgId}/policies/all`);
+	}
+
+	return (
+		<div className="flex flex-col gap-4">
+			<PolicyOverview policy={policy} users={users} />
+			<PolicyComment policy={policy} users={users} />
+		</div>
+	);
+}
+
+export async function generateMetadata({
+	params,
+}: {
+	params: Promise<{ locale: string; policyId: string }>;
+}): Promise<Metadata> {
+	const { locale } = await params;
+
+	setStaticParamsLocale(locale);
+	const t = await getI18n();
+
+	return {
+		title: t("sub_pages.policies.policy_details"),
+	};
+}
+
+const getPolicy = cache(async (policyId: string, organizationId: string) => {
+	const policy = await db.organizationPolicy.findUnique({
+		where: { id: policyId, organizationId },
+		include: {
+			policy: true,
+			PolicyComments: true,
+		},
+	});
+	return policy;
+});
+
+const getUsers = async (organizationId: string) => {
+	const orgMembers = await db.organizationMember.findMany({
+		where: { organizationId: organizationId },
+		include: {
+			user: true,
+		},
+	});
+
+	const users = orgMembers.map((member) => member.user);
+
+	return users;
+};
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/(overview)/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/(overview)/layout.tsx
new file mode 100644
index 0000000000..a4050bd3a9
--- /dev/null
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/(overview)/layout.tsx
@@ -0,0 +1,27 @@
+import { getI18n } from "@/locales/server";
+import { SecondaryMenu } from "@bubba/ui/secondary-menu";
+import { auth } from "@/auth";
+
+export default async function Layout({
+	children,
+}: {
+	children: React.ReactNode;
+}) {
+	const t = await getI18n();
+	const session = await auth();
+	const user = session?.user;
+	const orgId = user?.organizationId;
+
+	return (
+		<div className="max-w-[1200px] m-auto">
+			<SecondaryMenu
+				items={[
+					{ path: `/${orgId}/risk`, label: t("risk.dashboard.title") },
+					{ path: `/${orgId}/risk/register`, label: t("risk.register.title") },
+				]}
+			/>
+
+			<main className="mt-8">{children}</main>
+		</div>
+	);
+}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/(overview)/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/(overview)/page.tsx
new file mode 100644
index 0000000000..16c79a8a47
--- /dev/null
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/(overview)/page.tsx
@@ -0,0 +1,74 @@
+import { auth } from "@/auth";
+import { RiskOverview } from "@/components/risks/charts/risk-overview";
+import { RisksAssignee } from "@/components/risks/charts/risks-assignee";
+import { getI18n } from "@/locales/server";
+import { db } from "@bubba/db";
+import type { Metadata } from "next";
+import { setStaticParamsLocale } from "next-international/server";
+import { unstable_cache } from "next/cache";
+import { redirect } from "next/navigation";
+
+export default async function RiskManagement({
+	params,
+}: {
+	params: Promise<{ locale: string }>;
+}) {
+	const { locale } = await params;
+	setStaticParamsLocale(locale);
+
+	const session = await auth();
+
+	if (!session?.user?.organizationId) {
+		redirect("/onboarding");
+	}
+
+	const overview = await getRiskOverview(session.user.organizationId);
+	const orgId = session.user.organizationId;
+
+	if (overview?.risks === 0) {
+		redirect(`/${orgId}/risk/register`);
+	}
+
+	return (
+		<div className="space-y-4 sm:space-y-8">
+			<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+				<RiskOverview organizationId={orgId} />
+			</div>
+
+			<div className="grid gap-4 grid-cols-1 md:grid-cols-2">
+				<RisksAssignee organizationId={orgId} />
+			</div>
+		</div>
+	);
+}
+
+const getRiskOverview = unstable_cache(
+	async (organizationId: string) => {
+		return await db.$transaction(async (tx) => {
+			const [risks] = await Promise.all([
+				tx.risk.count({
+					where: { organizationId },
+				}),
+			]);
+
+			return {
+				risks,
+			};
+		});
+	},
+	["risk-overview-cache"],
+);
+
+export async function generateMetadata({
+	params,
+}: {
+	params: Promise<{ locale: string }>;
+}): Promise<Metadata> {
+	const { locale } = await params;
+	setStaticParamsLocale(locale);
+	const t = await getI18n();
+
+	return {
+		title: t("sidebar.risk"),
+	};
+}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/risk/[riskId]/comments/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/[riskId]/comments/page.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/risk/[riskId]/comments/page.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/[riskId]/comments/page.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/[riskId]/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/[riskId]/layout.tsx
new file mode 100644
index 0000000000..bf9900e16a
--- /dev/null
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/[riskId]/layout.tsx
@@ -0,0 +1,65 @@
+import { auth } from "@/auth";
+import { Title } from "@/components/title";
+import { getI18n } from "@/locales/server";
+import { db } from "@bubba/db";
+import { SecondaryMenu } from "@bubba/ui/secondary-menu";
+import { unstable_cache } from "next/cache";
+import { redirect } from "next/navigation";
+
+interface LayoutProps {
+	children: React.ReactNode;
+	params: Promise<{ riskId: string }>;
+}
+
+export default async function Layout({ children, params }: LayoutProps) {
+	const t = await getI18n();
+	const session = await auth();
+
+	if (!session || !session.user.organizationId) {
+		redirect("/");
+	}
+
+	const riskId = await params;
+	const risk = await getRisk(riskId.riskId, session.user.organizationId);
+
+	if (!risk) {
+		redirect("/risk");
+	}
+
+	const orgId = session.user.organizationId;
+
+	return (
+		<div className="max-w-[1200px] space-y-4 m-auto">
+			<SecondaryMenu
+				showBackButton
+				backButtonHref={`/${orgId}/risk/register`}
+				items={[
+					{
+						path: `/${orgId}/risk/${riskId.riskId}`,
+						label: t("risk.overview"),
+					},
+					{
+						path: `/${orgId}/risk/${riskId.riskId}/comments`,
+						label: t("common.comments.title"),
+					},
+				]}
+			/>
+
+			<main className="mt-8">{children}</main>
+		</div>
+	);
+}
+
+const getRisk = unstable_cache(
+	async (riskId: string, organizationId: string) => {
+		const risk = await db.risk.findUnique({
+			where: {
+				id: riskId,
+				organizationId: organizationId,
+			},
+		});
+
+		return risk;
+	},
+	["risk-cache"],
+);
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/risk/[riskId]/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/[riskId]/page.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/risk/[riskId]/page.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/[riskId]/page.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/risk/[riskId]/tasks/[taskId]/actions/getTaskAttachments.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/[riskId]/tasks/[taskId]/actions/getTaskAttachments.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/risk/[riskId]/tasks/[taskId]/actions/getTaskAttachments.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/[riskId]/tasks/[taskId]/actions/getTaskAttachments.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/risk/[riskId]/tasks/[taskId]/hooks/useTaskAttachments.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/[riskId]/tasks/[taskId]/hooks/useTaskAttachments.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/risk/[riskId]/tasks/[taskId]/hooks/useTaskAttachments.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/[riskId]/tasks/[taskId]/hooks/useTaskAttachments.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/risk/[riskId]/tasks/[taskId]/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/[riskId]/tasks/[taskId]/page.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/risk/[riskId]/tasks/[taskId]/page.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/[riskId]/tasks/[taskId]/page.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/risk/[riskId]/tasks/search-params.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/[riskId]/tasks/search-params.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/risk/[riskId]/tasks/search-params.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/[riskId]/tasks/search-params.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/risk/register/RiskRegisterTable.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/register/RiskRegisterTable.tsx
similarity index 94%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/risk/register/RiskRegisterTable.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/register/RiskRegisterTable.tsx
index 1b044a91fc..d409458dd1 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/risk/register/RiskRegisterTable.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/register/RiskRegisterTable.tsx
@@ -5,9 +5,10 @@ import { DataTable } from "@/components/ui/data-table";
 import { useI18n } from "@/locales/client";
 import type { Departments, Risk, RiskStatus, User } from "@bubba/db/types";
 import { Plus } from "lucide-react";
+import { useParams } from "next/navigation";
 import { useQueryState } from "nuqs";
 import { useState } from "react";
-import { useOrganizationAdmins } from "../../evidence/[id]/hooks/useOrganizationAdmins";
+import { useOrganizationAdmins } from "../../hooks/useOrganizationAdmins";
 import { columns } from "./components/table/RiskRegisterColumns";
 import { RiskRegisterFilters } from "./components/table/RiskRegisterFilters";
 import { useRisks } from "./hooks/useRisks";
@@ -16,6 +17,8 @@ type RiskRegisterTableRow = Risk & { owner: User | null };
 
 export const RiskRegisterTable = () => {
 	const t = useI18n();
+	const { orgId } = useParams<{ orgId: string }>();
+
 	// State
 	const [search, setSearch] = useState("");
 	const [open, setOpen] = useQueryState("create-risk-sheet");
@@ -92,7 +95,7 @@ export const RiskRegisterTable = () => {
 	return (
 		<>
 			<DataTable<RiskRegisterTableRow>
-				columns={columns}
+				columns={columns(orgId)}
 				data={data}
 				isLoading={isLoading}
 				search={{
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/risk/register/actions/getRisks.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/register/actions/getRisks.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/risk/register/actions/getRisks.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/register/actions/getRisks.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/risk/register/components/table/RiskRegisterColumns.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/register/components/table/RiskRegisterColumns.tsx
similarity index 87%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/risk/register/components/table/RiskRegisterColumns.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/register/components/table/RiskRegisterColumns.tsx
index 52fd8129b8..73de780daa 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/risk/register/components/table/RiskRegisterColumns.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/register/components/table/RiskRegisterColumns.tsx
@@ -5,13 +5,17 @@ import Link from "next/link";
 import { Avatar, AvatarFallback, AvatarImage } from "@bubba/ui/avatar";
 import { Status } from "@/components/status";
 
-export const columns: ColumnDef<Risk & { owner: User | null }>[] = [
+export const columns = (
+	orgId: string,
+): ColumnDef<Risk & { owner: User | null }>[] => [
 	{
 		header: "Risk",
 		accessorKey: "title",
 		cell: ({ row }) => {
 			return (
-				<Link href={`/risk/${row.original.id}`}>{row.original.title}</Link>
+				<Link href={`/${orgId}/risk/${row.original.id}`}>
+					{row.original.title}
+				</Link>
 			);
 		},
 	},
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/risk/register/components/table/RiskRegisterFilters.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/register/components/table/RiskRegisterFilters.tsx
similarity index 95%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/risk/register/components/table/RiskRegisterFilters.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/register/components/table/RiskRegisterFilters.tsx
index 33a9ad3c22..7d7f7b99d2 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/risk/register/components/table/RiskRegisterFilters.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/register/components/table/RiskRegisterFilters.tsx
@@ -1,6 +1,6 @@
 import { Status } from "@/components/status";
 import { type Departments, RiskStatus } from "@bubba/db/types";
-import type { Admin } from "../../../../evidence/[id]/hooks/useOrganizationAdmins";
+import type { Admin } from "../../../../hooks/useOrganizationAdmins";
 import { AssigneeAvatar } from "../../../../evidence/list/components/table/components/AssigneeAvatar";
 
 export const RiskRegisterFilters = ({
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/risk/register/hooks/useRisks.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/register/hooks/useRisks.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/risk/register/hooks/useRisks.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/register/hooks/useRisks.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/register/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/register/layout.tsx
new file mode 100644
index 0000000000..cec65b4622
--- /dev/null
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/register/layout.tsx
@@ -0,0 +1,27 @@
+import { auth } from "@/auth";
+import { getI18n } from "@/locales/server";
+import { SecondaryMenu } from "@bubba/ui/secondary-menu";
+
+export default async function Layout({
+	children,
+}: {
+	children: React.ReactNode;
+}) {
+	const t = await getI18n();
+	const session = await auth();
+	const user = session?.user;
+	const orgId = user?.organizationId;
+
+	return (
+		<div className="max-w-[1200px] m-auto">
+			<SecondaryMenu
+				items={[
+					{ path: `/${orgId}/risk`, label: t("risk.dashboard.title") },
+					{ path: `/${orgId}/risk/register`, label: t("risk.register.title") },
+				]}
+			/>
+
+			<main className="mt-8">{children}</main>
+		</div>
+	);
+}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/risk/register/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/register/page.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/risk/register/page.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/register/page.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/risk/register/search-params.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/register/search-params.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/risk/register/search-params.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/register/search-params.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/settings/api-keys/loading.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/settings/api-keys/loading.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/settings/api-keys/loading.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/settings/api-keys/loading.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/settings/api-keys/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/settings/api-keys/page.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/settings/api-keys/page.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/settings/api-keys/page.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/settings/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/settings/layout.tsx
similarity index 55%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/settings/layout.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/settings/layout.tsx
index 8e70f1159c..56b4226399 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/settings/layout.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/settings/layout.tsx
@@ -1,3 +1,4 @@
+import { auth } from "@/auth";
 import { getI18n } from "@/locales/server";
 import { SecondaryMenu } from "@bubba/ui/secondary-menu";
 import { Suspense } from "react";
@@ -8,17 +9,26 @@ export default async function Layout({
 	children: React.ReactNode;
 }) {
 	const t = await getI18n();
+	const session = await auth();
+	const user = session?.user;
+	const orgId = user?.organizationId;
 
 	return (
 		<div className="max-w-[1200px] m-auto">
 			<Suspense fallback={<div>Loading...</div>}>
 				<SecondaryMenu
 					items={[
-						{ path: "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/settings", label: t("settings.general.title") },
-						{ path: "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/settings/members", label: t("settings.members.title") },
-						{ path: "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/settings/api-keys", label: t("settings.api_keys.title") },
+						{ path: `/${orgId}/settings`, label: t("settings.general.title") },
 						{
-							path: "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/settings/billing",
+							path: `/${orgId}/settings/members`,
+							label: t("settings.members.title"),
+						},
+						{
+							path: `/${orgId}/settings/api-keys`,
+							label: t("settings.api_keys.title"),
+						},
+						{
+							path: `/${orgId}/settings/billing`,
 							label: t("settings.billing.title"),
 							enabled: false,
 						},
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/settings/loading.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/settings/loading.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/settings/loading.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/settings/loading.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/settings/members/loading.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/settings/members/loading.tsx
new file mode 100644
index 0000000000..5d1632eb9b
--- /dev/null
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/settings/members/loading.tsx
@@ -0,0 +1,60 @@
+import { LogoSpinner } from "@/components/logo-spinner";
+import { getI18n } from "@/locales/server";
+import {
+	Card,
+	CardContent,
+	CardDescription,
+	CardHeader,
+	CardTitle,
+} from "@bubba/ui/card";
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "@bubba/ui/tabs";
+
+export default async function Loading() {
+	const t = await getI18n();
+
+	return (
+		<div className="space-y-4 sm:space-y-8">
+			<Tabs defaultValue="members">
+				<TabsList className="bg-transparent border-b-[1px] w-full justify-start rounded-none mb-1 p-0 h-auto pb-4">
+					<TabsTrigger value="members" className="p-0 m-0 mr-4">
+						{t("settings.team.tabs.members")}
+					</TabsTrigger>
+					<TabsTrigger value="invite" className="p-0 m-0">
+						{t("settings.team.tabs.invite")}
+					</TabsTrigger>
+				</TabsList>
+
+				<TabsContent value="members">
+					<Card>
+						<CardHeader>
+							<CardTitle>{t("settings.team.members.title")}</CardTitle>
+							<CardDescription />
+						</CardHeader>
+						<CardContent>
+							<LogoSpinner />
+						</CardContent>
+					</Card>
+				</TabsContent>
+
+				<TabsContent value="invite">
+					<div className="flex flex-col gap-4">
+						<Card>
+							<CardHeader className="blur-sm">
+								<CardTitle>{t("settings.team.invite.title")}</CardTitle>
+								<CardDescription>
+									{t("settings.team.invite.description")}
+								</CardDescription>
+							</CardHeader>
+							<CardContent className="space-y-4">
+								<LogoSpinner />
+							</CardContent>
+							<div className="p-4 flex justify-end">
+								<div className="h-10 w-24 bg-muted rounded blur-sm" />
+							</div>
+						</Card>
+					</div>
+				</TabsContent>
+			</Tabs>
+		</div>
+	);
+}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/settings/members/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/settings/members/page.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/settings/members/page.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/settings/members/page.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/settings/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/settings/page.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/settings/page.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/settings/page.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/(overview)/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/(overview)/layout.tsx
new file mode 100644
index 0000000000..dc0ffbb307
--- /dev/null
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/(overview)/layout.tsx
@@ -0,0 +1,32 @@
+import { getI18n } from "@/locales/server";
+import { SecondaryMenu } from "@bubba/ui/secondary-menu";
+import { auth } from "@/auth";
+export default async function Layout({
+	children,
+}: {
+	children: React.ReactNode;
+}) {
+	const t = await getI18n();
+	const session = await auth();
+	const user = session?.user;
+	const organizationId = user?.organizationId;
+
+	return (
+		<div className="max-w-[1200px] m-auto">
+			<SecondaryMenu
+				items={[
+					{
+						path: `/${organizationId}/tests`,
+						label: t("tests.dashboard.overview"),
+					},
+					{
+						path: `/${organizationId}/tests/all`,
+						label: t("tests.dashboard.all"),
+					},
+				]}
+			/>
+
+			<main className="mt-8">{children}</main>
+		</div>
+	);
+}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/(overview)/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/(overview)/page.tsx
new file mode 100644
index 0000000000..53fce7bab4
--- /dev/null
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/(overview)/page.tsx
@@ -0,0 +1,113 @@
+import { auth } from "@/auth";
+import { TestsSeverity } from "@/components/tests/charts/tests-severity";
+import { TestsByAssignee } from "@/components/tests/charts/tests-by-assignee";
+import { getI18n } from "@/locales/server";
+import { db } from "@bubba/db";
+import type { Metadata } from "next";
+import { setStaticParamsLocale } from "next-international/server";
+import { unstable_cache } from "next/cache";
+import { redirect } from "next/navigation";
+
+export default async function TestsOverview({
+	params,
+}: {
+	params: Promise<{ locale: string }>;
+}) {
+	const { locale } = await params;
+	setStaticParamsLocale(locale);
+
+	const session = await auth();
+
+	if (!session?.user?.organizationId) {
+		redirect("/onboarding");
+	}
+
+	const overview = await getTestsOverview(session.user.organizationId);
+	const organizationId = session.user.organizationId;
+
+	if (overview?.totalTests === 0) {
+		redirect(`/${organizationId}/tests/all`);
+	}
+
+	return (
+		<div className="space-y-4 sm:space-y-8">
+			<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+				<TestsSeverity
+					totalTests={overview.totalTests}
+					lowSeverityTests={overview.lowSeverityTests}
+					mediumSeverityTests={overview.mediumSeverityTests}
+					highSeverityTests={overview.highSeverityTests}
+					criticalSeverityTests={overview.criticalSeverityTests}
+				/>
+				<TestsByAssignee organizationId={organizationId} />
+			</div>
+		</div>
+	);
+}
+
+const getTestsOverview = unstable_cache(
+	async (organizationId: string) => {
+		return await db.$transaction(async (tx) => {
+			const [
+				totalTests,
+				lowSeverityTests,
+				mediumSeverityTests,
+				highSeverityTests,
+				criticalSeverityTests,
+			] = await Promise.all([
+				tx.organizationIntegrationResults.count({
+					where: {
+						organizationId,
+					},
+				}),
+				tx.organizationIntegrationResults.count({
+					where: {
+						organizationId,
+						label: "LOW",
+					},
+				}),
+				tx.organizationIntegrationResults.count({
+					where: {
+						organizationId,
+						label: "MEDIUM",
+					},
+				}),
+				tx.organizationIntegrationResults.count({
+					where: {
+						organizationId,
+						label: "HIGH",
+					},
+				}),
+				tx.organizationIntegrationResults.count({
+					where: {
+						organizationId,
+						label: "CRITICAL",
+					},
+				}),
+			]);
+
+			return {
+				totalTests,
+				lowSeverityTests,
+				mediumSeverityTests,
+				highSeverityTests,
+				criticalSeverityTests,
+			};
+		});
+	},
+	["tests-overview-cache"],
+);
+
+export async function generateMetadata({
+	params,
+}: {
+	params: Promise<{ locale: string }>;
+}): Promise<Metadata> {
+	const { locale } = await params;
+	setStaticParamsLocale(locale);
+	const t = await getI18n();
+
+	return {
+		title: t("sidebar.tests"),
+	};
+}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/[testId]/actions/assignTest.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/[testId]/actions/assignTest.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/[testId]/actions/assignTest.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/[testId]/actions/assignTest.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/[testId]/actions/createTestComment.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/[testId]/actions/createTestComment.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/[testId]/actions/createTestComment.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/[testId]/actions/createTestComment.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/[testId]/actions/getTest.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/[testId]/actions/getTest.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/[testId]/actions/getTest.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/[testId]/actions/getTest.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/[testId]/actions/types.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/[testId]/actions/types.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/[testId]/actions/types.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/[testId]/actions/types.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/[testId]/components/AssigneeSection.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/[testId]/components/AssigneeSection.tsx
new file mode 100644
index 0000000000..7a03b5680d
--- /dev/null
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/[testId]/components/AssigneeSection.tsx
@@ -0,0 +1,139 @@
+"use client";
+
+import { useState, useEffect } from "react";
+import {
+	Select,
+	SelectContent,
+	SelectItem,
+	SelectTrigger,
+	SelectValue,
+} from "@bubba/ui/select";
+import { Avatar, AvatarFallback, AvatarImage } from "@bubba/ui/avatar";
+import { useAction } from "next-safe-action/hooks";
+import { toast } from "sonner";
+import { assignTest } from "../actions/assignTest";
+import {
+	type Admin,
+	useOrganizationAdmins,
+} from "@/app/[locale]/(app)/(dashboard)/[orgId]/hooks/useOrganizationAdmins";
+
+interface AssigneeSectionProps {
+	testId: string;
+	currentAssigneeId: string | null | undefined;
+	onSuccess: () => Promise<void>;
+}
+
+export function AssigneeSection({
+	testId,
+	currentAssigneeId,
+	onSuccess,
+}: AssigneeSectionProps) {
+	const [assigneeId, setAssigneeId] = useState<string | null>(
+		currentAssigneeId || null,
+	);
+	const { data: admins, isLoading, error } = useOrganizationAdmins();
+	const [selectedAdmin, setSelectedAdmin] = useState<Admin | null>(null);
+
+	const { execute: updateAssignee, isExecuting } = useAction(assignTest, {
+		onSuccess: async () => {
+			toast.success("Assignee updated successfully");
+			await onSuccess();
+		},
+		onError: (error) => {
+			console.log("error", error);
+			toast.error("Failed to update Assignee");
+		},
+	});
+
+	useEffect(() => {
+		setAssigneeId(currentAssigneeId || null);
+	}, [currentAssigneeId]);
+
+	useEffect(() => {
+		if (admins && assigneeId) {
+			const admin = admins.find((a) => a.id === assigneeId);
+			setSelectedAdmin(admin || null);
+		} else {
+			setSelectedAdmin(null);
+		}
+	}, [admins, assigneeId]);
+
+	const handleAssigneeChange = (value: string) => {
+		const newAssigneeId = value === "none" ? null : value;
+		setAssigneeId(newAssigneeId);
+
+		if (newAssigneeId && admins) {
+			const admin = admins.find((a) => a.id === newAssigneeId);
+			setSelectedAdmin(admin || null);
+		} else {
+			setSelectedAdmin(null);
+		}
+
+		updateAssignee({ id: testId, assigneeId: newAssigneeId });
+	};
+
+	if (isLoading) {
+		return <div className="h-9 w-full animate-pulse rounded-md bg-muted" />;
+	}
+
+	if (error || !admins) {
+		return <p className="text-sm text-red-500">Failed to load</p>;
+	}
+
+	return (
+		<div className="w-full">
+			<Select
+				value={assigneeId || "none"}
+				onValueChange={handleAssigneeChange}
+				disabled={isExecuting}
+			>
+				<SelectTrigger className="w-full">
+					{selectedAdmin ? (
+						<div className="flex items-center gap-2">
+							<Avatar className="h-5 w-5 shrink-0">
+								<AvatarImage
+									src={selectedAdmin.image || undefined}
+									alt={selectedAdmin.name}
+								/>
+								<AvatarFallback>{selectedAdmin.name.charAt(0)}</AvatarFallback>
+							</Avatar>
+							<span className="truncate">{selectedAdmin.name}</span>
+						</div>
+					) : (
+						<SelectValue placeholder="Assign to..." />
+					)}
+				</SelectTrigger>
+				<SelectContent
+					className="min-w-[var(--radix-select-trigger-width)] w-auto max-w-[250px] z-50"
+					position="popper"
+					sideOffset={5}
+					align="start"
+				>
+					<SelectItem value="none" className="w-full p-0 overflow-hidden">
+						<div className="py-1.5 px-3 w-full">
+							<span className="pl-7">None</span>
+						</div>
+					</SelectItem>
+					{admins.map((admin) => (
+						<SelectItem
+							key={admin.id}
+							value={admin.id}
+							className="w-full p-0 overflow-hidden"
+						>
+							<div className="flex items-center gap-2 py-1.5 px-3 w-full">
+								<Avatar className="h-5 w-5 shrink-0">
+									<AvatarImage
+										src={admin.image || undefined}
+										alt={admin.name}
+									/>
+									<AvatarFallback>{admin.name.charAt(0)}</AvatarFallback>
+								</Avatar>
+								<span className="truncate">{admin.name}</span>
+							</div>
+						</SelectItem>
+					))}
+				</SelectContent>
+			</Select>
+		</div>
+	);
+}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/[testId]/components/TestComments.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/[testId]/components/TestComments.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/[testId]/components/TestComments.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/[testId]/components/TestComments.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/[testId]/components/TestDetails.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/[testId]/components/TestDetails.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/[testId]/components/TestDetails.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/[testId]/components/TestDetails.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/[testId]/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/[testId]/page.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/[testId]/page.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/[testId]/page.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/actions/getTests.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/actions/getTests.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/actions/getTests.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/actions/getTests.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/actions/refreshTests.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/actions/refreshTests.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/actions/refreshTests.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/actions/refreshTests.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/components/TestsList.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/components/TestsList.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/components/TestsList.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/components/TestsList.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/components/TestsListSkeleton.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/components/TestsListSkeleton.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/components/TestsListSkeleton.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/components/TestsListSkeleton.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/hooks/useTest.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/hooks/useTest.ts
similarity index 69%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/hooks/useTest.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/hooks/useTest.ts
index 6d94481a38..bb0b6a0ff6 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/hooks/useTest.ts
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/hooks/useTest.ts
@@ -1,19 +1,22 @@
 "use client";
 import useSWR from "swr";
-import { getTest } from "@/app/[locale]/(app)/(dashboard)/tests/all/[testId]/actions/getTest";
-import type { AppError, Test } from "@/app/[locale]/(app)/(dashboard)/tests/all/types";
+import { getTest } from "@/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/[testId]/actions/getTest";
+import type {
+  AppError,
+  Test,
+} from "@/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/types";
 
 async function fetchTest(testId: string): Promise<Test> {
   try {
     const response = await getTest({ testId });
-    
+
     if (response.success) {
       return response.data;
-    } else {
-      throw response.error;
     }
+
+    throw response.error;
   } catch (error) {
-    if (error && typeof error === 'object' && 'message' in error) {
+    if (error && typeof error === "object" && "message" in error) {
       throw error as AppError;
     }
     throw { message: "An unexpected error occurred" };
@@ -36,4 +39,4 @@ export function useTest(testId: string) {
     error,
     mutate,
   };
-} 
\ No newline at end of file
+}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/hooks/useTests.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/hooks/useTests.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/hooks/useTests.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/hooks/useTests.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/layout.tsx
new file mode 100644
index 0000000000..f07a4308bf
--- /dev/null
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/layout.tsx
@@ -0,0 +1,31 @@
+import { auth } from "@/auth";
+import { getI18n } from "@/locales/server";
+import { SecondaryMenu } from "@bubba/ui/secondary-menu";
+
+export default async function Layout({
+	children,
+}: {
+	children: React.ReactNode;
+}) {
+	const t = await getI18n();
+	const session = await auth();
+	const organizationId = session?.user?.organizationId;
+
+	return (
+		<div className="max-w-[1200px] mx-auto">
+			<SecondaryMenu
+				items={[
+					{
+						path: `/${organizationId}/tests`,
+						label: t("tests.dashboard.overview"),
+					},
+					{
+						path: `/${organizationId}/tests/all`,
+						label: t("tests.dashboard.all"),
+					},
+				]}
+			/>
+			<main className="mt-8">{children}</main>
+		</div>
+	);
+}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/page.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/page.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/page.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/types/index.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/types/index.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/types/index.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/types/index.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/types/search-params.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/types/search-params.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/types/search-params.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/types/search-params.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/(overview)/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/(overview)/layout.tsx
new file mode 100644
index 0000000000..2babdff01c
--- /dev/null
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/(overview)/layout.tsx
@@ -0,0 +1,30 @@
+import { auth } from "@/auth";
+import { getI18n } from "@/locales/server";
+import { SecondaryMenu } from "@bubba/ui/secondary-menu";
+
+export default async function Layout({
+	children,
+}: {
+	children: React.ReactNode;
+}) {
+	const t = await getI18n();
+	const session = await auth();
+	const user = session?.user;
+	const orgId = user?.organizationId;
+
+	return (
+		<div className="max-w-[1200px] m-auto">
+			<SecondaryMenu
+				items={[
+					{ path: `/${orgId}/vendors`, label: t("vendors.dashboard.title") },
+					// {
+					// 	path: `/${orgId}/vendors/register`,
+					// 	label: t("vendors.register.title"),
+					// },
+				]}
+			/>
+
+			<main className="mt-8">{children}</main>
+		</div>
+	);
+}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/(overview)/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/(overview)/page.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/(overview)/page.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/(overview)/page.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/components/AssigneeSection.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/components/AssigneeSection.tsx
deleted file mode 100644
index b83f66ddba..0000000000
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/components/AssigneeSection.tsx
+++ /dev/null
@@ -1,136 +0,0 @@
-"use client";
-
-import { useState, useEffect } from "react";
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from "@bubba/ui/select";
-import { Avatar, AvatarFallback, AvatarImage } from "@bubba/ui/avatar";
-import { useAction } from "next-safe-action/hooks";
-import { toast } from "sonner";
-import { assignEvidence } from "../actions/assignEvidence";
-import { useOrganizationAdmins } from "../hooks/useOrganizationAdmins";
-import type { Admin } from "../hooks/useOrganizationAdmins";
-
-interface AssigneeSectionProps {
-  evidenceId: string;
-  currentAssigneeId: string | null | undefined;
-  onSuccess: () => Promise<void>;
-}
-
-export function AssigneeSection({
-  evidenceId,
-  currentAssigneeId,
-  onSuccess,
-}: AssigneeSectionProps) {
-  const [assigneeId, setAssigneeId] = useState<string | null>(
-    currentAssigneeId || null
-  );
-  const { data: admins, isLoading, error } = useOrganizationAdmins();
-  const [selectedAdmin, setSelectedAdmin] = useState<Admin | null>(null);
-
-  const { execute: updateAssignee, isExecuting } = useAction(assignEvidence, {
-    onSuccess: async () => {
-      toast.success("Assignee updated successfully");
-      await onSuccess();
-    },
-    onError: () => {
-      toast.error("Failed to update assignee");
-    },
-  });
-
-  useEffect(() => {
-    setAssigneeId(currentAssigneeId || null);
-  }, [currentAssigneeId]);
-
-  useEffect(() => {
-    if (admins && assigneeId) {
-      const admin = admins.find((a) => a.id === assigneeId);
-      setSelectedAdmin(admin || null);
-    } else {
-      setSelectedAdmin(null);
-    }
-  }, [admins, assigneeId]);
-
-  const handleAssigneeChange = (value: string) => {
-    const newAssigneeId = value === "none" ? null : value;
-    setAssigneeId(newAssigneeId);
-
-    if (newAssigneeId && admins) {
-      const admin = admins.find((a) => a.id === newAssigneeId);
-      setSelectedAdmin(admin || null);
-    } else {
-      setSelectedAdmin(null);
-    }
-
-    updateAssignee({ id: evidenceId, assigneeId: newAssigneeId });
-  };
-
-  if (isLoading) {
-    return <div className="h-9 w-full animate-pulse rounded-md bg-muted" />;
-  }
-
-  if (error || !admins) {
-    return <p className="text-sm text-red-500">Failed to load</p>;
-  }
-
-  return (
-    <div className="w-full">
-      <Select
-        value={assigneeId || "none"}
-        onValueChange={handleAssigneeChange}
-        disabled={isExecuting}
-      >
-        <SelectTrigger className="w-full">
-          {selectedAdmin ? (
-            <div className="flex items-center gap-2">
-              <Avatar className="h-5 w-5 shrink-0">
-                <AvatarImage
-                  src={selectedAdmin.image || undefined}
-                  alt={selectedAdmin.name}
-                />
-                <AvatarFallback>{selectedAdmin.name.charAt(0)}</AvatarFallback>
-              </Avatar>
-              <span className="truncate">{selectedAdmin.name}</span>
-            </div>
-          ) : (
-            <SelectValue placeholder="Assign to..." />
-          )}
-        </SelectTrigger>
-        <SelectContent
-          className="min-w-[var(--radix-select-trigger-width)] w-auto max-w-[250px] z-50"
-          position="popper"
-          sideOffset={5}
-          align="start"
-        >
-          <SelectItem value="none" className="w-full p-0 overflow-hidden">
-            <div className="py-1.5 px-3 w-full">
-              <span className="pl-7">None</span>
-            </div>
-          </SelectItem>
-          {admins.map((admin) => (
-            <SelectItem
-              key={admin.id}
-              value={admin.id}
-              className="w-full p-0 overflow-hidden"
-            >
-              <div className="flex items-center gap-2 py-1.5 px-3 w-full">
-                <Avatar className="h-5 w-5 shrink-0">
-                  <AvatarImage
-                    src={admin.image || undefined}
-                    alt={admin.name}
-                  />
-                  <AvatarFallback>{admin.name.charAt(0)}</AvatarFallback>
-                </Avatar>
-                <span className="truncate">{admin.name}</span>
-              </div>
-            </SelectItem>
-          ))}
-        </SelectContent>
-      </Select>
-    </div>
-  );
-}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/hooks/useOrganizationAdmins.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/hooks/useOrganizationAdmins.ts
deleted file mode 100644
index 66d94fbc7a..0000000000
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/hooks/useOrganizationAdmins.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-"use client";
-
-import useSWR from "swr";
-import { getOrganizationAdmins } from "../../actions/getOrganizationAdmins";
-
-export interface Admin {
-  id: string;
-  name: string;
-  email: string;
-  image: string | null;
-  role: string;
-}
-
-async function fetchOrganizationAdmins(): Promise<Admin[]> {
-  try {
-    const result = await getOrganizationAdmins();
-
-    if (!result) {
-      throw new Error("Failed to fetch organization admins");
-    }
-
-    if ("error" in result && typeof result.error === "string") {
-      throw new Error(result.error);
-    }
-
-    return result.data?.data || [];
-  } catch (error) {
-    console.error("Error fetching admins:", error);
-    throw error;
-  }
-}
-
-export function useOrganizationAdmins() {
-  return useSWR<Admin[]>("organization-admins", fetchOrganizationAdmins, {
-    revalidateOnFocus: false,
-    revalidateOnReconnect: false,
-  });
-}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/layout.tsx
deleted file mode 100644
index 1e0bf26c89..0000000000
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/layout.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import { getI18n } from "@/locales/server";
-import { SecondaryMenu } from "@bubba/ui/secondary-menu";
-import { headers } from "next/headers";
-
-export default async function Layout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  const t = await getI18n();
-  const headersList = await headers();
-  const pathname = headersList.get("x-pathname") || "";
-  const isEvidenceDetails = /\/evidence\/[a-z0-9]+/.test(pathname);
-  const pathParts = pathname.split("/");
-  const evidenceIndex = pathParts.findIndex((part) => part === "evidence");
-  const id =
-    evidenceIndex >= 0 && pathParts.length > evidenceIndex + 1
-      ? pathParts[evidenceIndex + 1]
-      : "";
-
-  return (
-    <div className="max-w-[1200px] m-auto">
-      <SecondaryMenu
-        items={[
-          {
-            path: `/evidence/${id}`,
-            label: t("evidence.overview"),
-          },
-          { path: `/evidence/${id}/edit`, label: t("evidence.edit") },
-        ]}
-        showBackButton={isEvidenceDetails}
-        backButtonHref="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/evidence/list"
-        backButtonLabel={t("evidence.dashboard.layout_back_button")}
-      />
-
-      <main className="py-4">{children}</main>
-    </div>
-  );
-}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/list/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/list/layout.tsx
deleted file mode 100644
index 063655d889..0000000000
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/list/layout.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import { getI18n } from "@/locales/server";
-import { SecondaryMenu } from "@bubba/ui/secondary-menu";
-
-export default async function Layout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  const t = await getI18n();
-
-  return (
-    <div className="max-w-[1200px] m-auto">
-      <SecondaryMenu
-        items={[
-          {
-            path: "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/evidence/overview",
-            label: t("evidence.dashboard.layout"),
-          },
-          { path: "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/evidence/list", label: t("evidence.list") },
-        ]}
-      />
-
-      <main className="py-8">{children}</main>
-    </div>
-  );
-}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/layout.tsx
deleted file mode 100644
index 063655d889..0000000000
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/layout.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import { getI18n } from "@/locales/server";
-import { SecondaryMenu } from "@bubba/ui/secondary-menu";
-
-export default async function Layout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  const t = await getI18n();
-
-  return (
-    <div className="max-w-[1200px] m-auto">
-      <SecondaryMenu
-        items={[
-          {
-            path: "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/evidence/overview",
-            label: t("evidence.dashboard.layout"),
-          },
-          { path: "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/evidence/list", label: t("evidence.list") },
-        ]}
-      />
-
-      <main className="py-8">{children}</main>
-    </div>
-  );
-}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/layout.tsx
deleted file mode 100644
index c5be7799bc..0000000000
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/layout.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import { auth } from "@/auth";
-import { Header } from "@/components/header";
-import { Sidebar } from "@/components/sidebar";
-import { db } from "@bubba/db";
-import dynamic from "next/dynamic";
-import { redirect } from "next/navigation";
-import { cache } from "react";
-
-const HotKeys = dynamic(
-  () => import("@/components/hot-keys").then((mod) => mod.HotKeys),
-  {
-    ssr: true,
-  },
-);
-
-export default async function Layout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  const session = await auth();
-
-  if (!session?.user || !session.user.organizationId) {
-    redirect("/auth");
-  }
-
-  const isSetup = await isOrganizationSetup(session.user.organizationId);
-
-  if (!isSetup) {
-    redirect("/setup");
-  }
-
-  return (
-    <div className="relative">
-      <Sidebar />
-
-      <div className="mx-4 md:ml-[95px] md:mr-10 pb-8">
-        <Header />
-        <main>{children}</main>
-      </div>
-
-      <HotKeys />
-    </div>
-  );
-}
-
-const isOrganizationSetup = cache(async (organizationId: string) => {
-  const organization = await db.organization.findUnique({
-    where: {
-      id: organizationId,
-    },
-    select: {
-      setup: true,
-    },
-  });
-
-  return organization?.setup;
-});
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/people/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/people/layout.tsx
deleted file mode 100644
index f686ef7fd1..0000000000
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/people/layout.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { getI18n } from "@/locales/server";
-import { SecondaryMenu } from "@bubba/ui/secondary-menu";
-
-export default async function Layout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  const t = await getI18n();
-
-  return (
-    <div className="max-w-[1200px] m-auto">
-      <SecondaryMenu items={[{ path: "/people", label: t("people.title") }]} />
-
-      <main className="mt-8">{children}</main>
-    </div>
-  );
-}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/policies/(overview)/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/policies/(overview)/layout.tsx
deleted file mode 100644
index 17ae5cf486..0000000000
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/policies/(overview)/layout.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { getI18n } from "@/locales/server";
-import { SecondaryMenu } from "@bubba/ui/secondary-menu";
-
-export default async function Layout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  const t = await getI18n();
-
-  return (
-    <div className="max-w-[1200px] m-auto">
-      <SecondaryMenu
-        items={[
-          { path: "/policies", label: t("policies.dashboard.title") },
-          { path: "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/policies/all", label: t("policies.dashboard.all") },
-        ]}
-      />
-
-      <main className="mt-8">{children}</main>
-    </div>
-  );
-}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/policies/(overview)/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/policies/(overview)/page.tsx
deleted file mode 100644
index 8aef55f8f7..0000000000
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/policies/(overview)/page.tsx
+++ /dev/null
@@ -1,111 +0,0 @@
-import { auth } from "@/auth";
-import { PoliciesStatus } from "@/components/policies/charts/policies-status";
-import { PoliciesByAssignee } from "@/components/policies/charts/policies-by-assignee";
-import { getI18n } from "@/locales/server";
-import { db } from "@bubba/db";
-import type { Metadata } from "next";
-import { setStaticParamsLocale } from "next-international/server";
-import { unstable_cache } from "next/cache";
-import { redirect } from "next/navigation";
-
-export default async function PoliciesOverview({
-  params,
-}: {
-  params: Promise<{ locale: string }>;
-}) {
-  const { locale } = await params;
-  setStaticParamsLocale(locale);
-
-  const session = await auth();
-
-  if (!session?.user?.organizationId) {
-    redirect("/onboarding");
-  }
-
-  const overview = await getPoliciesOverview(session.user.organizationId);
-
-  if (overview?.totalPolicies === 0) {
-    redirect("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/policies/all");
-  }
-
-  return (
-    <div className="space-y-4 sm:space-y-8">
-      <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-        <PoliciesStatus
-          totalPolicies={overview.totalPolicies}
-          publishedPolicies={overview.publishedPolicies}
-          draftPolicies={overview.draftPolicies}
-          archivedPolicies={overview.archivedPolicies}
-          needsReviewPolicies={overview.needsReviewPolicies}
-        />
-        <PoliciesByAssignee organizationId={session.user.organizationId} />
-      </div>
-    </div>
-  );
-}
-const getPoliciesOverview = unstable_cache(
-  async (organizationId: string) => {
-    return await db.$transaction(async (tx) => {
-      const [
-        totalPolicies,
-        publishedPolicies,
-        draftPolicies,
-        archivedPolicies,
-        needsReviewPolicies,
-      ] = await Promise.all([
-        tx.organizationPolicy.count({
-          where: {
-            organizationId,
-          },
-        }),
-        tx.organizationPolicy.count({
-          where: {
-            organizationId,
-            status: "published",
-          },
-        }),
-        tx.organizationPolicy.count({
-          where: {
-            organizationId,
-            status: "draft",
-          },
-        }),
-        tx.organizationPolicy.count({
-          where: {
-            organizationId,
-            status: "archived",
-          },
-        }),
-        tx.organizationPolicy.count({
-          where: {
-            organizationId,
-            status: "needs_review",
-          },
-        }),
-      ]);
-
-      return {
-        totalPolicies,
-        publishedPolicies,
-        draftPolicies,
-        archivedPolicies,
-        needsReviewPolicies,
-      };
-    });
-  },
-  ["policies-overview-cache"],
-);
-
-export async function generateMetadata({
-  params,
-}: {
-  params: Promise<{ locale: string }>;
-}): Promise<Metadata> {
-  const { locale } = await params;
-  setStaticParamsLocale(locale);
-  const t = await getI18n();
-
-  return {
-    title: t("sidebar.policies"),
-  };
-}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/(overview)/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/(overview)/layout.tsx
deleted file mode 100644
index 17ae5cf486..0000000000
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/(overview)/layout.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { getI18n } from "@/locales/server";
-import { SecondaryMenu } from "@bubba/ui/secondary-menu";
-
-export default async function Layout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  const t = await getI18n();
-
-  return (
-    <div className="max-w-[1200px] m-auto">
-      <SecondaryMenu
-        items={[
-          { path: "/policies", label: t("policies.dashboard.title") },
-          { path: "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/policies/all", label: t("policies.dashboard.all") },
-        ]}
-      />
-
-      <main className="mt-8">{children}</main>
-    </div>
-  );
-}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/[policyId]/editor/components/PolicyDetails.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/[policyId]/editor/components/PolicyDetails.tsx
deleted file mode 100644
index 666003e60d..0000000000
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/[policyId]/editor/components/PolicyDetails.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-"use client";
-
-import { Card, CardContent, CardHeader } from "@bubba/ui/card";
-import { Skeleton } from "@bubba/ui/skeleton";
-import { redirect } from "next/navigation";
-import { PolicyEditor } from "@/components/editor/policy-editor";
-import { usePolicyDetails } from "../../../(overview)/hooks/usePolicy";
-import type { JSONContent } from "@tiptap/react";
-import "@bubba/ui/editor.css";
-
-interface PolicyDetailsProps {
-  policyId: string;
-}
-
-export function PolicyDetails({ policyId }: PolicyDetailsProps) {
-  const { policy, isLoading, updatePolicy } = usePolicyDetails(policyId);
-
-  if (isLoading) {
-    return (
-      <div className="space-y-4">
-        <div className="flex flex-col space-y-4">
-          <Skeleton className="h-8 w-48" />
-          <Skeleton className="h-4 w-32" />
-        </div>
-        <Card>
-          <CardHeader>
-            <Skeleton className="h-6 w-32" />
-          </CardHeader>
-          <CardContent>
-            <div className="space-y-2">
-              <Skeleton className="h-4 w-full" />
-              <Skeleton className="h-4 w-full" />
-              <Skeleton className="h-4 w-3/4" />
-            </div>
-          </CardContent>
-        </Card>
-      </div>
-    );
-  }
-
-  if (!policy) return redirect("/policies");
-
-  const formattedContent = Array.isArray(policy.content)
-    ? policy.content
-    : typeof policy.content === "object" && policy.content !== null
-      ? [policy.content as JSONContent]
-      : [];
-
-  const handleSavePolicy = async (content: JSONContent[]): Promise<void> => {
-    if (!policy) return;
-
-    try {
-      await updatePolicy({
-        ...policy,
-        content,
-      });
-    } catch (error) {
-      console.error("Error saving policy:", error);
-      throw error;
-    }
-  };
-
-  return (
-    <div className="flex flex-col h-full mx-auto">
-      <PolicyEditor
-        content={formattedContent}
-        onSave={handleSavePolicy}
-      />
-    </div>
-  );
-}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/[policyId]/editor/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/[policyId]/editor/page.tsx
deleted file mode 100644
index ee9818a971..0000000000
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/[policyId]/editor/page.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import { auth } from "@/auth";
-import { getI18n } from "@/locales/server";
-import type { Metadata } from "next";
-import { setStaticParamsLocale } from "next-international/server";
-import { redirect } from "next/navigation";
-import { PolicyDetails } from "./components/PolicyDetails";
-
-export default async function PolicyEditor({
-  params,
-}: {
-  params: Promise<{ locale: string; policyId: string }>;
-}) {
-  const { locale, policyId } = await params;
-  setStaticParamsLocale(locale);
-
-  const session = await auth();
-  const organizationId = session?.user.organizationId;
-
-  if (!organizationId) {
-    redirect("/");
-  }
-
-  return <PolicyDetails policyId={policyId} />;
-}
-
-export async function generateMetadata({
-  params,
-}: {
-  params: Promise<{ locale: string; policyId: string }>;
-}): Promise<Metadata> {
-  const { locale } = await params;
-
-  setStaticParamsLocale(locale);
-  const t = await getI18n();
-
-  return {
-    title: t("sub_pages.policies.policy_details"),
-  };
-}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/[policyId]/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/[policyId]/layout.tsx
deleted file mode 100644
index 0f710e56a0..0000000000
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/[policyId]/layout.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-import { auth } from "@/auth";
-import { getI18n } from "@/locales/server";
-import { db } from "@bubba/db";
-import { SecondaryMenu } from "@bubba/ui/secondary-menu";
-import { unstable_cache } from "next/cache";
-import { redirect } from "next/navigation";
-
-interface LayoutProps {
-  children: React.ReactNode;
-  params: Promise<{ policyId: string }>;
-}
-
-export default async function Layout({ children, params }: LayoutProps) {
-  const t = await getI18n();
-  const session = await auth();
-
-  if (!session || !session.user.organizationId) {
-    redirect("/");
-  }
-
-  const policyId = await params;
-  const policy = await getPolicy(
-    policyId.policyId,
-    session.user.organizationId,
-  );
-
-  if (!policy) {
-    redirect("/policies");
-  }
-
-  return (
-    <div className="max-w-[1200px] space-y-4 m-auto">
-      <SecondaryMenu
-        showBackButton
-        backButtonHref="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/policies/all"
-        items={[
-          {
-            path: `/policies/all/${policyId.policyId}`,
-            label: t("policies.dashboard.sub_pages.overview"),
-          },
-          {
-            path: `/policies/all/${policyId.policyId}/editor`,
-            label: t("policies.dashboard.sub_pages.edit_policy"),
-          },
-        ]}
-      />
-
-      <main className="mt-8">{children}</main>
-    </div>
-  );
-}
-
-const getPolicy = unstable_cache(
-  async (policyId: string, organizationId: string) => {
-    const policy = await db.organizationPolicy.findUnique({
-      where: {
-        id: policyId,
-        organizationId: organizationId,
-      },
-      include: {
-        policy: true,
-      },
-    });
-
-    return policy;
-  },
-  ["policy-cache"],
-);
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/[policyId]/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/[policyId]/page.tsx
deleted file mode 100644
index 89227fc5b3..0000000000
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/[policyId]/page.tsx
+++ /dev/null
@@ -1,81 +0,0 @@
-import { auth } from "@/auth";
-import { PolicyComment } from "@/components/policies/policy-comments";
-import { PolicyOverview } from "@/components/policies/policy-overview";
-import { getI18n } from "@/locales/server";
-import { db } from "@bubba/db";
-import type { Metadata } from "next";
-import { setStaticParamsLocale } from "next-international/server";
-import { unstable_cache } from "next/cache";
-import { redirect } from "next/navigation";
-
-export default async function PolicyDetails({
-	params,
-}: {
-	params: Promise<{ locale: string; policyId: string }>;
-}) {
-	const { locale, policyId } = await params;
-
-	setStaticParamsLocale(locale);
-
-	const session = await auth();
-	const organizationId = session?.user.organizationId;
-
-	if (!organizationId) {
-		redirect("/");
-	}
-
-	const policy = await getPolicy(policyId, organizationId);
-	const users = await getUsers(organizationId);
-
-	if (!policy) {
-		redirect("/policies");
-	}
-
-	return (
-		<div className="flex flex-col gap-4">
-			<PolicyOverview policy={policy} users={users} />
-			<PolicyComment policy={policy} users={users} />
-		</div>
-	);
-}
-
-export async function generateMetadata({
-	params,
-}: {
-	params: Promise<{ locale: string; policyId: string }>;
-}): Promise<Metadata> {
-	const { locale } = await params;
-
-	setStaticParamsLocale(locale);
-	const t = await getI18n();
-
-	return {
-		title: t("sub_pages.policies.policy_details"),
-	};
-}
-
-const getPolicy = unstable_cache(
-	async (policyId: string, organizationId: string) => {
-		const policy = await db.organizationPolicy.findUnique({
-			where: { id: policyId, organizationId },
-			include: {
-				policy: true,
-				PolicyComments: true,
-			},
-		});
-		return policy;
-	},
-	["policy-details"],
-	{ tags: ["policies", "policy-details"] },
-);
-
-const getUsers = unstable_cache(
-	async (organizationId: string) => {
-		const users = await db.user.findMany({
-			where: { organizationId: organizationId },
-		});
-
-		return users;
-	},
-	["users-cache"],
-);
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/risk/(overview)/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/risk/(overview)/layout.tsx
deleted file mode 100644
index d6a83f50a7..0000000000
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/risk/(overview)/layout.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { getI18n } from "@/locales/server";
-import { SecondaryMenu } from "@bubba/ui/secondary-menu";
-
-export default async function Layout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  const t = await getI18n();
-
-  return (
-    <div className="max-w-[1200px] m-auto">
-      <SecondaryMenu
-        items={[
-          { path: "/risk", label: t("risk.dashboard.title") },
-          { path: "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/risk/register", label: t("risk.register.title") },
-        ]}
-      />
-
-      <main className="mt-8">{children}</main>
-    </div>
-  );
-}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/risk/(overview)/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/risk/(overview)/page.tsx
deleted file mode 100644
index bd4d24bd77..0000000000
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/risk/(overview)/page.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-import { auth } from "@/auth";
-import { RiskOverview } from "@/components/risks/charts/risk-overview";
-import { RisksAssignee } from "@/components/risks/charts/risks-assignee";
-import { getI18n } from "@/locales/server";
-import { db } from "@bubba/db";
-import type { Metadata } from "next";
-import { setStaticParamsLocale } from "next-international/server";
-import { unstable_cache } from "next/cache";
-import { redirect } from "next/navigation";
-
-export default async function RiskManagement({
-  params,
-}: {
-  params: Promise<{ locale: string }>;
-}) {
-  const { locale } = await params;
-  setStaticParamsLocale(locale);
-
-  const session = await auth();
-
-  if (!session?.user?.organizationId) {
-    redirect("/onboarding");
-  }
-
-  const overview = await getRiskOverview(session.user.organizationId);
-
-  if (overview?.risks === 0) {
-    redirect("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/risk/register");
-  }
-
-  return (
-    <div className="space-y-4 sm:space-y-8">
-      <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-        <RiskOverview organizationId={session.user.organizationId} />
-      </div>
-
-      <div className="grid gap-4 grid-cols-1 md:grid-cols-2">
-        <RisksAssignee organizationId={session.user.organizationId} />
-      </div>
-    </div>
-  );
-}
-
-const getRiskOverview = unstable_cache(
-  async (organizationId: string) => {
-    return await db.$transaction(async (tx) => {
-      const [risks] = await Promise.all([
-        tx.risk.count({
-          where: { organizationId },
-        }),
-      ]);
-
-      return {
-        risks,
-      };
-    });
-  },
-  ["risk-overview-cache"],
-);
-
-export async function generateMetadata({
-  params,
-}: {
-  params: Promise<{ locale: string }>;
-}): Promise<Metadata> {
-  const { locale } = await params;
-  setStaticParamsLocale(locale);
-  const t = await getI18n();
-
-  return {
-    title: t("sidebar.risk"),
-  };
-}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/risk/[riskId]/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/risk/[riskId]/layout.tsx
deleted file mode 100644
index f69ab0e564..0000000000
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/risk/[riskId]/layout.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import { auth } from "@/auth";
-import { Title } from "@/components/title";
-import { getI18n } from "@/locales/server";
-import { db } from "@bubba/db";
-import { SecondaryMenu } from "@bubba/ui/secondary-menu";
-import { unstable_cache } from "next/cache";
-import { redirect } from "next/navigation";
-
-interface LayoutProps {
-  children: React.ReactNode;
-  params: Promise<{ riskId: string }>;
-}
-
-export default async function Layout({ children, params }: LayoutProps) {
-  const t = await getI18n();
-  const session = await auth();
-
-  if (!session || !session.user.organizationId) {
-    redirect("/");
-  }
-
-  const riskId = await params;
-  const risk = await getRisk(riskId.riskId, session.user.organizationId);
-
-  if (!risk) {
-    redirect("/risk");
-  }
-
-  return (
-    <div className="max-w-[1200px] space-y-4 m-auto">
-      <SecondaryMenu
-        showBackButton
-        backButtonHref="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/risk/register"
-        items={[
-          { path: `/risk/${riskId.riskId}`, label: t("risk.overview") },
-          {
-            path: `/risk/${riskId.riskId}/comments`,
-            label: t("common.comments.title"),
-          },
-        ]}
-      />
-
-      <main className="mt-8">{children}</main>
-    </div>
-  );
-}
-
-const getRisk = unstable_cache(
-  async (riskId: string, organizationId: string) => {
-    const risk = await db.risk.findUnique({
-      where: {
-        id: riskId,
-        organizationId: organizationId,
-      },
-    });
-
-    return risk;
-  },
-  ["risk-cache"],
-);
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/risk/register/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/risk/register/layout.tsx
deleted file mode 100644
index d6a83f50a7..0000000000
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/risk/register/layout.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { getI18n } from "@/locales/server";
-import { SecondaryMenu } from "@bubba/ui/secondary-menu";
-
-export default async function Layout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  const t = await getI18n();
-
-  return (
-    <div className="max-w-[1200px] m-auto">
-      <SecondaryMenu
-        items={[
-          { path: "/risk", label: t("risk.dashboard.title") },
-          { path: "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/risk/register", label: t("risk.register.title") },
-        ]}
-      />
-
-      <main className="mt-8">{children}</main>
-    </div>
-  );
-}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/settings/members/loading.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/settings/members/loading.tsx
deleted file mode 100644
index b9353c994c..0000000000
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/settings/members/loading.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import { Tabs, TabsContent, TabsList, TabsTrigger } from "@bubba/ui/tabs";
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@bubba/ui/card";
-import { Avatar, AvatarFallback } from "@bubba/ui/avatar";
-import { Badge } from "@bubba/ui/badge";
-import { getI18n } from "@/locales/server";
-import { LogoSpinner } from "@/components/logo-spinner";
-
-export default async function Loading() {
-  const t = await getI18n();
-
-  return (
-    <div className="space-y-4 sm:space-y-8">
-      <Tabs defaultValue="members">
-        <TabsList className="bg-transparent border-b-[1px] w-full justify-start rounded-none mb-1 p-0 h-auto pb-4">
-          <TabsTrigger value="members" className="p-0 m-0 mr-4">
-            {t("settings.team.tabs.members")}
-          </TabsTrigger>
-          <TabsTrigger value="invite" className="p-0 m-0">
-            {t("settings.team.tabs.invite")}
-          </TabsTrigger>
-        </TabsList>
-
-        <TabsContent value="members">
-          <Card>
-            <CardHeader>
-              <CardTitle>{t("settings.team.members.title")}</CardTitle>
-              <CardDescription />
-            </CardHeader>
-            <CardContent>
-              <LogoSpinner />
-            </CardContent>
-          </Card>
-        </TabsContent>
-
-        <TabsContent value="invite">
-          <div className="flex flex-col gap-4">
-            <Card>
-              <CardHeader className="blur-sm">
-                <CardTitle>{t("settings.team.invite.title")}</CardTitle>
-                <CardDescription>
-                  {t("settings.team.invite.description")}
-                </CardDescription>
-              </CardHeader>
-              <CardContent className="space-y-4">
-                <LogoSpinner />
-              </CardContent>
-              <div className="p-4 flex justify-end">
-                <div className="h-10 w-24 bg-muted rounded blur-sm" />
-              </div>
-            </Card>
-          </div>
-        </TabsContent>
-      </Tabs>
-    </div>
-  );
-}
\ No newline at end of file
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/tests/(overview)/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/tests/(overview)/layout.tsx
deleted file mode 100644
index f1fa1f2b71..0000000000
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/tests/(overview)/layout.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { getI18n } from "@/locales/server";
-import { SecondaryMenu } from "@bubba/ui/secondary-menu";
-
-export default async function Layout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  const t = await getI18n();
-
-  return (
-    <div className="max-w-[1200px] m-auto">
-      <SecondaryMenu
-        items={[
-          { path: "/tests", label: t("tests.dashboard.overview") },
-          { path: "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/tests/all", label: t("tests.dashboard.all") },
-        ]}
-      />
-
-      <main className="mt-8">{children}</main>
-    </div>
-  );
-}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/tests/(overview)/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/tests/(overview)/page.tsx
deleted file mode 100644
index c48a62a4a3..0000000000
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/tests/(overview)/page.tsx
+++ /dev/null
@@ -1,112 +0,0 @@
-import { auth } from "@/auth";
-import { TestsSeverity } from "@/components/tests/charts/tests-severity";
-import { TestsByAssignee } from "@/components/tests/charts/tests-by-assignee";
-import { getI18n } from "@/locales/server";
-import { db } from "@bubba/db";
-import type { Metadata } from "next";
-import { setStaticParamsLocale } from "next-international/server";
-import { unstable_cache } from "next/cache";
-import { redirect } from "next/navigation";
-
-export default async function TestsOverview({
-  params,
-}: {
-  params: Promise<{ locale: string }>;
-}) {
-  const { locale } = await params;
-  setStaticParamsLocale(locale);
-
-  const session = await auth();
-
-  if (!session?.user?.organizationId) {
-    redirect("/onboarding");
-  }
-
-  const overview = await getTestsOverview(session.user.organizationId);
-
-  if (overview?.totalTests === 0) {
-    redirect("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/tests/all");
-  }
-
-  return (
-    <div className="space-y-4 sm:space-y-8">
-      <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-        <TestsSeverity
-          totalTests={overview.totalTests}
-          lowSeverityTests={overview.lowSeverityTests}
-          mediumSeverityTests={overview.mediumSeverityTests}
-          highSeverityTests={overview.highSeverityTests}
-          criticalSeverityTests={overview.criticalSeverityTests}
-        />
-        <TestsByAssignee organizationId={session.user.organizationId} />
-      </div>
-    </div>
-  );
-}
-
-const getTestsOverview = unstable_cache(
-  async (organizationId: string) => {
-    return await db.$transaction(async (tx) => {
-      const [
-        totalTests,
-        lowSeverityTests,
-        mediumSeverityTests,
-        highSeverityTests,
-        criticalSeverityTests,
-      ] = await Promise.all([
-        tx.organizationIntegrationResults.count({
-          where: {
-            organizationId,
-          },
-        }),
-        tx.organizationIntegrationResults.count({
-          where: {
-            organizationId,
-            label: "LOW",
-          },
-        }),
-        tx.organizationIntegrationResults.count({
-          where: {
-            organizationId,
-            label: "MEDIUM",
-          },
-        }),
-        tx.organizationIntegrationResults.count({
-          where: {
-            organizationId,
-            label: "HIGH",
-          },
-        }),
-        tx.organizationIntegrationResults.count({
-          where: {
-            organizationId,
-            label: "CRITICAL",
-          },
-        }),
-      ]);
-
-      return {
-        totalTests,
-        lowSeverityTests,
-        mediumSeverityTests,
-        highSeverityTests,
-        criticalSeverityTests,
-      };
-    });
-  },
-  ["tests-overview-cache"],
-);
-
-export async function generateMetadata({
-  params,
-}: {
-  params: Promise<{ locale: string }>;
-}): Promise<Metadata> {
-  const { locale } = await params;
-  setStaticParamsLocale(locale);
-  const t = await getI18n();
-
-  return {
-    title: t("sidebar.tests"),
-  };
-}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/[testId]/components/AssigneeSection.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/[testId]/components/AssigneeSection.tsx
deleted file mode 100644
index f16ab4df81..0000000000
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/[testId]/components/AssigneeSection.tsx
+++ /dev/null
@@ -1,137 +0,0 @@
-"use client";
-
-import { useState, useEffect } from "react";
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from "@bubba/ui/select";
-import { Avatar, AvatarFallback, AvatarImage } from "@bubba/ui/avatar";
-import { useAction } from "next-safe-action/hooks";
-import { toast } from "sonner";
-import { assignTest } from "../actions/assignTest";
-import { useOrganizationAdmins } from "../hooks/useOrganizationAdmins";
-import type { Admin } from "../hooks/useOrganizationAdmins";
-
-interface AssigneeSectionProps {
-  testId: string;
-  currentAssigneeId: string | null | undefined;
-  onSuccess: () => Promise<void>;
-}
-
-export function AssigneeSection({
-  testId,
-  currentAssigneeId,
-  onSuccess,
-}: AssigneeSectionProps) {
-  const [assigneeId, setAssigneeId] = useState<string | null>(
-    currentAssigneeId || null
-  );
-  const { data: admins, isLoading, error } = useOrganizationAdmins();
-  const [selectedAdmin, setSelectedAdmin] = useState<Admin | null>(null);
-
-  const { execute: updateAssignee, isExecuting } = useAction(assignTest, {
-    onSuccess: async () => {
-      toast.success("Assignee updated successfully");
-      await onSuccess();
-    },
-    onError: (error) => {
-      console.log("error", error);
-      toast.error("Failed to update Assignee");
-    },
-  });
-
-  useEffect(() => {
-    setAssigneeId(currentAssigneeId || null);
-  }, [currentAssigneeId]);
-
-  useEffect(() => {
-    if (admins && assigneeId) {
-      const admin = admins.find((a) => a.id === assigneeId);
-      setSelectedAdmin(admin || null);
-    } else {
-      setSelectedAdmin(null);
-    }
-  }, [admins, assigneeId]);
-
-  const handleAssigneeChange = (value: string) => {
-    const newAssigneeId = value === "none" ? null : value;
-    setAssigneeId(newAssigneeId);
-
-    if (newAssigneeId && admins) {
-      const admin = admins.find((a) => a.id === newAssigneeId);
-      setSelectedAdmin(admin || null);
-    } else {
-      setSelectedAdmin(null);
-    }
-
-    updateAssignee({ id: testId, assigneeId: newAssigneeId });
-  };
-
-  if (isLoading) {
-    return <div className="h-9 w-full animate-pulse rounded-md bg-muted" />;
-  }
-
-  if (error || !admins) {
-    return <p className="text-sm text-red-500">Failed to load</p>;
-  }
-
-  return (
-    <div className="w-full">
-      <Select
-        value={assigneeId || "none"}
-        onValueChange={handleAssigneeChange}
-        disabled={isExecuting}
-      >
-        <SelectTrigger className="w-full">
-          {selectedAdmin ? (
-            <div className="flex items-center gap-2">
-              <Avatar className="h-5 w-5 shrink-0">
-                <AvatarImage
-                  src={selectedAdmin.image || undefined}
-                  alt={selectedAdmin.name}
-                />
-                <AvatarFallback>{selectedAdmin.name.charAt(0)}</AvatarFallback>
-              </Avatar>
-              <span className="truncate">{selectedAdmin.name}</span>
-            </div>
-          ) : (
-            <SelectValue placeholder="Assign to..." />
-          )}
-        </SelectTrigger>
-        <SelectContent
-          className="min-w-[var(--radix-select-trigger-width)] w-auto max-w-[250px] z-50"
-          position="popper"
-          sideOffset={5}
-          align="start"
-        >
-          <SelectItem value="none" className="w-full p-0 overflow-hidden">
-            <div className="py-1.5 px-3 w-full">
-              <span className="pl-7">None</span>
-            </div>
-          </SelectItem>
-          {admins.map((admin) => (
-            <SelectItem
-              key={admin.id}
-              value={admin.id}
-              className="w-full p-0 overflow-hidden"
-            >
-              <div className="flex items-center gap-2 py-1.5 px-3 w-full">
-                <Avatar className="h-5 w-5 shrink-0">
-                  <AvatarImage
-                    src={admin.image || undefined}
-                    alt={admin.name}
-                  />
-                  <AvatarFallback>{admin.name.charAt(0)}</AvatarFallback>
-                </Avatar>
-                <span className="truncate">{admin.name}</span>
-              </div>
-            </SelectItem>
-          ))}
-        </SelectContent>
-      </Select>
-    </div>
-  );
-}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/actions/getOrganizationAdmins.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/actions/getOrganizationAdmins.ts
deleted file mode 100644
index a3a7a41452..0000000000
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/tests/all/actions/getOrganizationAdmins.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-"use server";
-
-import { authActionClient } from "@/actions/safe-action";
-import { db } from "@bubba/db";
-import { MembershipRole } from "@prisma/client";
-
-export const getOrganizationAdmins = authActionClient
-  .metadata({
-    name: "getOrganizationAdmins",
-    track: {
-      event: "get-organization-admins",
-      channel: "server",
-    },
-  })
-  .action(async ({ ctx }) => {
-    const { user } = ctx;
-
-    if (!user.organizationId) {
-      return {
-        success: false,
-        error: "Not authorized - no organization found",
-      };
-    }
-
-    try {
-      // Find organization members with admin or owner roles
-      const adminMembers = await db.organizationMember.findMany({
-        where: {
-          organizationId: user.organizationId,
-          role: {
-            in: [MembershipRole.admin, MembershipRole.owner],
-          },
-        },
-        include: {
-          user: {
-            select: {
-              id: true,
-              name: true,
-              email: true,
-              image: true,
-            },
-          },
-        },
-        orderBy: {
-          user: {
-            name: "asc",
-          },
-        },
-      });
-
-      // Transform the data to a simpler format
-      const admins = adminMembers.map((member) => ({
-        id: member.userId,
-        name: member.user.name || "Unknown",
-        email: member.user.email || "",
-        image: member.user.image || null,
-        role: member.role,
-      }));
-
-      return {
-        success: true,
-        data: admins,
-      };
-    } catch (error) {
-      console.error("Error fetching organization admins:", error);
-      return {
-        success: false,
-        error: "Failed to fetch organization admins",
-      };
-    }
-  });
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/(overview)/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/(overview)/layout.tsx
deleted file mode 100644
index 71699d2dc1..0000000000
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/(overview)/layout.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { getI18n } from "@/locales/server";
-import { SecondaryMenu } from "@bubba/ui/secondary-menu";
-
-export default async function Layout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  const t = await getI18n();
-
-  return (
-    <div className="max-w-[1200px] m-auto">
-      <SecondaryMenu
-        items={[
-          { path: "/vendors", label: t("vendors.dashboard.title") },
-          { path: "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/vendors/register", label: t("vendors.register.title") },
-        ]}
-      />
-
-      <main className="mt-8">{children}</main>
-    </div>
-  );
-}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/create-risk-form.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/create-risk-form.tsx
index acd015e90b..d79fce263d 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/create-risk-form.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/create-risk-form.tsx
@@ -2,34 +2,34 @@
 
 import { createRiskAction } from "@/actions/risk/create-risk-action";
 import { createRiskSchema } from "@/actions/schema";
-import { useOrganizationAdmins } from "@/app/[locale]/(app)/(dashboard)/evidence/[id]/hooks/useOrganizationAdmins";
-import { useRisks } from "@/app/[locale]/(app)/(dashboard)/risk/register/hooks/useRisks";
+import { useOrganizationAdmins } from "@/app/[locale]/(app)/(dashboard)/[orgId]/hooks/useOrganizationAdmins";
+import { useRisks } from "@/app/[locale]/(app)/(dashboard)/[orgId]/risk/register/hooks/useRisks";
 import { SelectUser } from "@/components/select-user";
 import { useI18n } from "@/locales/client";
 import type { RiskStatus } from "@bubba/db/types";
 import { Departments, RiskCategory } from "@bubba/db/types";
 import {
-  Accordion,
-  AccordionContent,
-  AccordionItem,
-  AccordionTrigger,
+	Accordion,
+	AccordionContent,
+	AccordionItem,
+	AccordionTrigger,
 } from "@bubba/ui/accordion";
 import { Button } from "@bubba/ui/button";
 import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
+	Form,
+	FormControl,
+	FormField,
+	FormItem,
+	FormLabel,
+	FormMessage,
 } from "@bubba/ui/form";
 import { Input } from "@bubba/ui/input";
 import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
+	Select,
+	SelectContent,
+	SelectItem,
+	SelectTrigger,
+	SelectValue,
 } from "@bubba/ui/select";
 import { Textarea } from "@bubba/ui/textarea";
 import { zodResolver } from "@hookform/resolvers/zod";
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/create-vendor-sheet.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/create-vendor-sheet.tsx
index 45baecbc25..749faa7eed 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/create-vendor-sheet.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/create-vendor-sheet.tsx
@@ -11,45 +11,45 @@ import { useQueryState } from "nuqs";
 import { CreateRisk } from "./create-risk-form";
 
 export function CreateVendorSheet() {
-  const t = useI18n();
-  const isDesktop = useMediaQuery("(min-width: 768px)");
-  const [open, setOpen] = useQueryState("createVendorSheet");
-  const isOpen = Boolean(open);
+	const t = useI18n();
+	const isDesktop = useMediaQuery("(min-width: 768px)");
+	const [open, setOpen] = useQueryState("createVendorSheet");
+	const isOpen = Boolean(open);
 
-  const handleOpenChange = (open: boolean) => {
-    setOpen(open ? "true" : null);
-  };
+	const handleOpenChange = (open: boolean) => {
+		setOpen(open ? "true" : null);
+	};
 
-  if (isDesktop) {
-    return (
-      <Sheet open={isOpen} onOpenChange={handleOpenChange}>
-        <SheetContent stack>
-          <SheetHeader className="mb-8 flex justify-between items-center flex-row">
-            <SheetTitle>{t("risk.create")}</SheetTitle>
-            <Button
-              size="icon"
-              variant="ghost"
-              className="p-0 m-0 size-auto hover:bg-transparent"
-              onClick={() => setOpen(null)}
-            >
-              <X className="h-5 w-5" />
-            </Button>
-          </SheetHeader>
+	if (isDesktop) {
+		return (
+			<Sheet open={isOpen} onOpenChange={handleOpenChange}>
+				<SheetContent stack>
+					<SheetHeader className="mb-8 flex justify-between items-center flex-row">
+						<SheetTitle>{t("risk.create")}</SheetTitle>
+						<Button
+							size="icon"
+							variant="ghost"
+							className="p-0 m-0 size-auto hover:bg-transparent"
+							onClick={() => setOpen(null)}
+						>
+							<X className="h-5 w-5" />
+						</Button>
+					</SheetHeader>
 
-          <ScrollArea className="h-full p-0 pb-[100px]" hideScrollbar>
-            <CreateRisk />
-          </ScrollArea>
-        </SheetContent>
-      </Sheet>
-    );
-  }
+					<ScrollArea className="h-full p-0 pb-[100px]" hideScrollbar>
+						<CreateRisk />
+					</ScrollArea>
+				</SheetContent>
+			</Sheet>
+		);
+	}
 
-  return (
-    <Drawer open={isOpen} onOpenChange={handleOpenChange}>
-      <DrawerTitle hidden>{t("risk.create")}</DrawerTitle>
-      <DrawerContent className="p-6">
-        <CreateRisk />
-      </DrawerContent>
-    </Drawer>
-  );
+	return (
+		<Drawer open={isOpen} onOpenChange={handleOpenChange}>
+			<DrawerTitle hidden>{t("risk.create")}</DrawerTitle>
+			<DrawerContent className="p-6">
+				<CreateRisk />
+			</DrawerContent>
+		</Drawer>
+	);
 }
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/task/update-task-form.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/task/update-task-form.tsx
index 3b5d9d8518..47e9fc0476 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/task/update-task-form.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/task/update-task-form.tsx
@@ -5,24 +5,28 @@ import { updateTaskSchema } from "@/actions/schema";
 import { SelectUser } from "@/components/select-user";
 import { STATUS_TYPES, Status, type StatusType } from "@/components/status";
 import { useI18n } from "@/locales/client";
-import { type RiskMitigationTask, RiskTaskStatus, type User } from "@bubba/db/types";
+import {
+	type RiskMitigationTask,
+	RiskTaskStatus,
+	type User,
+} from "@bubba/db/types";
 import { Button } from "@bubba/ui/button";
 import { Calendar } from "@bubba/ui/calendar";
 import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
+	Form,
+	FormControl,
+	FormField,
+	FormItem,
+	FormLabel,
+	FormMessage,
 } from "@bubba/ui/form";
 import { Popover, PopoverContent, PopoverTrigger } from "@bubba/ui/popover";
 import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
+	Select,
+	SelectContent,
+	SelectItem,
+	SelectTrigger,
+	SelectValue,
 } from "@bubba/ui/select";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { format } from "date-fns";
@@ -33,165 +37,165 @@ import React from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
 import type { z } from "zod";
-import { cn } from "../../../../../../../packages/ui/src/utils";
+import { cn } from "@bubba/ui/cn";
 
 export function UpdateTaskForm({
-  task,
-  users,
+	task,
+	users,
 }: {
-  task: RiskMitigationTask;
-  users: User[];
+	task: RiskMitigationTask;
+	users: User[];
 }) {
-  const t = useI18n();
+	const t = useI18n();
 
-  const updateTask = useAction(updateTaskAction, {
-    onSuccess: () => {
-      toast.success("Task updated successfully");
-    },
-    onError: () => {
-      toast.error("Something went wrong, please try again.");
-    },
-  });
+	const updateTask = useAction(updateTaskAction, {
+		onSuccess: () => {
+			toast.success("Task updated successfully");
+		},
+		onError: () => {
+			toast.error("Something went wrong, please try again.");
+		},
+	});
 
-  const form = useForm<z.infer<typeof updateTaskSchema>>({
-    resolver: zodResolver(updateTaskSchema),
-    defaultValues: {
-      id: task.id,
-      dueDate: task.dueDate ? new Date(task.dueDate) : undefined,
-      ownerId: task.ownerId ?? undefined,
-      status: task.status ?? RiskTaskStatus.open,
-    },
-  });
+	const form = useForm<z.infer<typeof updateTaskSchema>>({
+		resolver: zodResolver(updateTaskSchema),
+		defaultValues: {
+			id: task.id,
+			dueDate: task.dueDate ? new Date(task.dueDate) : undefined,
+			ownerId: task.ownerId ?? undefined,
+			status: task.status ?? RiskTaskStatus.open,
+		},
+	});
 
-  const onSubmit = (data: z.infer<typeof updateTaskSchema>) => {
-    updateTask.execute({
-      id: data.id,
-      dueDate: data.dueDate ? new Date(data.dueDate) : undefined,
-      ownerId: data.ownerId,
-      status: data.status as RiskTaskStatus,
-    });
-  };
+	const onSubmit = (data: z.infer<typeof updateTaskSchema>) => {
+		updateTask.execute({
+			id: data.id,
+			dueDate: data.dueDate ? new Date(data.dueDate) : undefined,
+			ownerId: data.ownerId,
+			status: data.status as RiskTaskStatus,
+		});
+	};
 
-  return (
-    <Form {...form}>
-      <form onSubmit={form.handleSubmit(onSubmit)}>
-        <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-          <FormField
-            control={form.control}
-            name="ownerId"
-            render={({ field }) => (
-              <FormItem>
-                <FormLabel>{t("common.assignee.label")}</FormLabel>
-                <FormControl>
-                  <Select
-                    value={field.value}
-                    onValueChange={field.onChange}
-                    onOpenChange={() => form.handleSubmit(onSubmit)}
-                  >
-                    <SelectTrigger>
-                      <SelectValue
-                        placeholder={t("common.assignee.placeholder")}
-                      />
-                    </SelectTrigger>
-                    <SelectContent>
-                      <SelectUser
-                        isLoading={false}
-                        onSelect={field.onChange}
-                        selectedId={field.value}
-                        users={users}
-                      />
-                    </SelectContent>
-                  </Select>
-                </FormControl>
-                <FormMessage />
-              </FormItem>
-            )}
-          />
-          <FormField
-            control={form.control}
-            name="status"
-            render={({ field }) => (
-              <FormItem>
-                <FormLabel>{t("risk.tasks.form.status")}</FormLabel>
-                <FormControl>
-                  <Select value={field.value} onValueChange={field.onChange}>
-                    <SelectTrigger>
-                      <SelectValue
-                        placeholder={t("risk.tasks.form.status_placeholder")}
-                      >
-                        {field.value && (
-                          <Status status={field.value as StatusType} />
-                        )}
-                      </SelectValue>
-                    </SelectTrigger>
-                    <SelectContent>
-                      {STATUS_TYPES.map((status) => (
-                        <SelectItem key={status} value={status}>
-                          <Status status={status} />
-                        </SelectItem>
-                      ))}
-                    </SelectContent>
-                  </Select>
-                </FormControl>
-                <FormMessage />
-              </FormItem>
-            )}
-          />
+	return (
+		<Form {...form}>
+			<form onSubmit={form.handleSubmit(onSubmit)}>
+				<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+					<FormField
+						control={form.control}
+						name="ownerId"
+						render={({ field }) => (
+							<FormItem>
+								<FormLabel>{t("common.assignee.label")}</FormLabel>
+								<FormControl>
+									<Select
+										value={field.value}
+										onValueChange={field.onChange}
+										onOpenChange={() => form.handleSubmit(onSubmit)}
+									>
+										<SelectTrigger>
+											<SelectValue
+												placeholder={t("common.assignee.placeholder")}
+											/>
+										</SelectTrigger>
+										<SelectContent>
+											<SelectUser
+												isLoading={false}
+												onSelect={field.onChange}
+												selectedId={field.value}
+												users={users}
+											/>
+										</SelectContent>
+									</Select>
+								</FormControl>
+								<FormMessage />
+							</FormItem>
+						)}
+					/>
+					<FormField
+						control={form.control}
+						name="status"
+						render={({ field }) => (
+							<FormItem>
+								<FormLabel>{t("risk.tasks.form.status")}</FormLabel>
+								<FormControl>
+									<Select value={field.value} onValueChange={field.onChange}>
+										<SelectTrigger>
+											<SelectValue
+												placeholder={t("risk.tasks.form.status_placeholder")}
+											>
+												{field.value && (
+													<Status status={field.value as StatusType} />
+												)}
+											</SelectValue>
+										</SelectTrigger>
+										<SelectContent>
+											{STATUS_TYPES.map((status) => (
+												<SelectItem key={status} value={status}>
+													<Status status={status} />
+												</SelectItem>
+											))}
+										</SelectContent>
+									</Select>
+								</FormControl>
+								<FormMessage />
+							</FormItem>
+						)}
+					/>
 
-          <FormField
-            control={form.control}
-            name="dueDate"
-            render={({ field }) => (
-              <FormItem className="flex flex-col">
-                <FormLabel>{t("risk.tasks.form.due_date")}</FormLabel>
-                <Popover>
-                  <PopoverTrigger asChild>
-                    <FormControl>
-                      <Button
-                        variant={"outline"}
-                        className={cn(
-                          "pl-3 text-left font-normal",
-                          !field.value && "text-muted-foreground",
-                        )}
-                      >
-                        {field.value ? (
-                          format(field.value, "PPP")
-                        ) : (
-                          <span>{t("common.date.pick")}</span>
-                        )}
-                        <CalendarIcon className="ml-auto h-4 w-4 opacity-50" />
-                      </Button>
-                    </FormControl>
-                  </PopoverTrigger>
-                  <PopoverContent className="w-auto p-0" align="start">
-                    <Calendar
-                      mode="single"
-                      selected={field.value}
-                      onSelect={field.onChange}
-                      disabled={(date) => date <= new Date()}
-                      initialFocus
-                    />
-                  </PopoverContent>
-                </Popover>
-                <FormMessage />
-              </FormItem>
-            )}
-          />
-        </div>
-        <div className="flex justify-end mt-4">
-          <Button
-            type="submit"
-            variant="action"
-            disabled={updateTask.status === "executing"}
-          >
-            {updateTask.status === "executing" ? (
-              <Loader2 className="h-4 w-4 animate-spin" />
-            ) : (
-              t("common.actions.save")
-            )}
-          </Button>
-        </div>
-      </form>
-    </Form>
-  );
+					<FormField
+						control={form.control}
+						name="dueDate"
+						render={({ field }) => (
+							<FormItem className="flex flex-col">
+								<FormLabel>{t("risk.tasks.form.due_date")}</FormLabel>
+								<Popover>
+									<PopoverTrigger asChild>
+										<FormControl>
+											<Button
+												variant={"outline"}
+												className={cn(
+													"pl-3 text-left font-normal",
+													!field.value && "text-muted-foreground",
+												)}
+											>
+												{field.value ? (
+													format(field.value, "PPP")
+												) : (
+													<span>{t("common.date.pick")}</span>
+												)}
+												<CalendarIcon className="ml-auto h-4 w-4 opacity-50" />
+											</Button>
+										</FormControl>
+									</PopoverTrigger>
+									<PopoverContent className="w-auto p-0" align="start">
+										<Calendar
+											mode="single"
+											selected={field.value}
+											onSelect={field.onChange}
+											disabled={(date) => date <= new Date()}
+											initialFocus
+										/>
+									</PopoverContent>
+								</Popover>
+								<FormMessage />
+							</FormItem>
+						)}
+					/>
+				</div>
+				<div className="flex justify-end mt-4">
+					<Button
+						type="submit"
+						variant="action"
+						disabled={updateTask.status === "executing"}
+					>
+						{updateTask.status === "executing" ? (
+							<Loader2 className="h-4 w-4 animate-spin" />
+						) : (
+							t("common.actions.save")
+						)}
+					</Button>
+				</div>
+			</form>
+		</Form>
+	);
 }
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/register/VendorRegisterTable.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/register/VendorRegisterTable.tsx
index 544bc98864..36136f4a30 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/register/VendorRegisterTable.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/register/VendorRegisterTable.tsx
@@ -1,19 +1,20 @@
 "use client";
 
-
 import { DataTable } from "@/components/ui/data-table";
 import { useI18n } from "@/locales/client";
 import type { Departments, RiskStatus, User, Vendor } from "@bubba/db/types";
 import { Plus } from "lucide-react";
 import { useQueryState } from "nuqs";
 import { useState } from "react";
-import { useOrganizationAdmins } from "../../evidence/[id]/hooks/useOrganizationAdmins";
+import { useOrganizationAdmins } from "@/app/[locale]/(app)/(dashboard)/[orgId]/hooks/useOrganizationAdmins";
 import { CreateVendorSheet } from "../components/create-vendor-sheet";
 import { columns } from "./components/table/RiskRegisterColumns";
 
 type VendorRegisterTableRow = Vendor & { owner: User | null };
 
-export const VendorRegisterTable = ({ data }: { data: VendorRegisterTableRow[] }) => {
+export const VendorRegisterTable = ({
+	data,
+}: { data: VendorRegisterTableRow[] }) => {
 	const t = useI18n();
 	// State
 	const [search, setSearch] = useState("");
@@ -46,7 +47,6 @@ export const VendorRegisterTable = ({ data }: { data: VendorRegisterTableRow[] }
 		},
 	);
 
-
 	const hasActiveFilters = Boolean(status || department || assigneeId);
 
 	const handleClearFilters = () => {
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/register/components/table/RiskRegisterFilters.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/register/components/table/RiskRegisterFilters.tsx
index 33a9ad3c22..ead50a73f8 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/register/components/table/RiskRegisterFilters.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/register/components/table/RiskRegisterFilters.tsx
@@ -1,7 +1,7 @@
 import { Status } from "@/components/status";
 import { type Departments, RiskStatus } from "@bubba/db/types";
-import type { Admin } from "../../../../evidence/[id]/hooks/useOrganizationAdmins";
-import { AssigneeAvatar } from "../../../../evidence/list/components/table/components/AssigneeAvatar";
+import type { Admin } from "@/app/[locale]/(app)/(dashboard)/[orgId]/hooks/useOrganizationAdmins";
+import { AssigneeAvatar } from "@/app/[locale]/(app)/(dashboard)/[orgId]/evidence/list/components/table/components/AssigneeAvatar";
 
 export const RiskRegisterFilters = ({
 	setPage,
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/register/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/register/page.tsx
index 59ec00175c..100a2fa973 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/register/page.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/register/page.tsx
@@ -9,18 +9,16 @@ import { Departments, VendorStatus } from "@bubba/db/types";
 import { z } from "zod";
 
 export default async function Page({
-  params,
-  searchParams,
+	searchParams,
 }: {
-  params: { locale: string },
-  searchParams: Promise<{
-    createVendorSheet?: string;
-    page?: string;
-    pageSize?: string;
-    status?: string;
-    department?: string;
-    assigneeId?: string;
-  }>
+	searchParams: Promise<{
+		createVendorSheet?: string;
+		page?: string;
+		pageSize?: string;
+		status?: string;
+		department?: string;
+		assigneeId?: string;
+	}>;
 }) {
 	const searchParamsSchema = z.object({
 		createVendorSheet: z.string().optional(),
@@ -28,17 +26,18 @@ export default async function Page({
 		pageSize: z.string().regex(/^\d+$/).transform(Number).optional(),
 		status: z.nativeEnum(VendorStatus).optional(),
 		department: z.nativeEnum(Departments).optional(),
-		assigneeId: z.string().uuid().optional()
+		assigneeId: z.string().uuid().optional(),
 	});
 
 	const result = searchParamsSchema.safeParse(await searchParams);
 
 	if (!result.success) {
-		console.error('Invalid search params:', result.error);
-		redirect('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/vendors/register');
+		console.error("Invalid search params:", result.error);
+		redirect("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/vendors/register");
 	}
 
-	const { createVendorSheet, page, pageSize, status, department, assigneeId } = result.data;
+	const { createVendorSheet, page, pageSize, status, department, assigneeId } =
+		result.data;
 
 	const session = await auth();
 
@@ -51,13 +50,13 @@ export default async function Page({
 			organizationId: session.user.organizationId,
 			...(status && { status: status }),
 			...(department && { department: department }),
-			...(assigneeId && { ownerId: assigneeId })
+			...(assigneeId && { ownerId: assigneeId }),
 		},
 		include: {
-			owner: true
+			owner: true,
 		},
 		skip: page ? (Number(page) - 1) * Number(pageSize || 10) : 0,
-		take: Number(pageSize || 10)
+		take: Number(pageSize || 10),
 	});
 
 	return <VendorRegisterTable data={vendors} />;
diff --git a/apps/app/src/app/[locale]/(app)/setup/page.tsx b/apps/app/src/app/[locale]/(app)/setup/page.tsx
index 9397d81300..66a03c985d 100644
--- a/apps/app/src/app/[locale]/(app)/setup/page.tsx
+++ b/apps/app/src/app/[locale]/(app)/setup/page.tsx
@@ -1,50 +1,22 @@
-import { auth } from "@/auth";
 import { Onboarding } from "@/components/forms/create-organization-form";
 import { db } from "@bubba/db";
 import type { Metadata } from "next";
-import { redirect } from "next/navigation";
 import { cache } from "react";
 
 export const metadata: Metadata = {
-  title: "Organization Setup | Comp AI",
+	title: "Organization Setup | Comp AI",
 };
 
 export default async function Page() {
-  const session = await auth();
+	const frameworks = await getFrameworks();
 
-  if (!session?.user?.id) {
-    return redirect("/");
-  }
-
-  if (!session.user.organizationId) {
-    return redirect("/");
-  }
-
-  const isSetup = await isOrganizationSetup(session.user.organizationId);
-  const frameworks = await getFrameworks();
-
-  if (isSetup) {
-    return redirect("/");
-  }
-
-  return <Onboarding frameworks={frameworks} />;
+	return <Onboarding frameworks={frameworks} />;
 }
 
 const getFrameworks = cache(async () => {
-  return await db.framework.findMany({
-    orderBy: {
-      name: "asc",
-    },
-  });
-});
-
-const isOrganizationSetup = cache(async (organizationId: string) => {
-  const organization = await db.organization.findUnique({
-    where: { id: organizationId },
-    select: {
-      setup: true,
-    },
-  });
-
-  return organization?.setup;
+	return await db.framework.findMany({
+		orderBy: {
+			name: "asc",
+		},
+	});
 });
diff --git a/apps/app/src/app/layout.tsx b/apps/app/src/app/layout.tsx
new file mode 100644
index 0000000000..677510c260
--- /dev/null
+++ b/apps/app/src/app/layout.tsx
@@ -0,0 +1,3 @@
+export default function Layout({ children }: { children: React.ReactNode }) {
+	return <>{children}</>;
+}
diff --git a/apps/app/src/app/page.tsx b/apps/app/src/app/page.tsx
new file mode 100644
index 0000000000..e0ead87c27
--- /dev/null
+++ b/apps/app/src/app/page.tsx
@@ -0,0 +1,16 @@
+import { auth } from "@/auth";
+import { redirect } from "next/navigation";
+
+export default async function RootPage() {
+	const session = await auth();
+
+	if (!session) {
+		redirect("/auth");
+	}
+
+	if (session.user?.organizationId) {
+		redirect(`/${session.user.organizationId}`);
+	}
+
+	redirect("/setup");
+}
diff --git a/apps/app/src/auth/config.ts b/apps/app/src/auth/config.ts
index 39972711c8..fc03a3d016 100644
--- a/apps/app/src/auth/config.ts
+++ b/apps/app/src/auth/config.ts
@@ -7,76 +7,77 @@ import Resend from "next-auth/providers/resend";
 import { createOrganizationAndConnectUser } from "./org";
 
 declare module "next-auth" {
-	interface User {
-		organizationId?: string;
-		onboarded?: boolean;
-		full_name?: string;
-		avatar_url?: string;
-	}
+  interface User {
+    organizationId?: string;
+    onboarded?: boolean;
+    full_name?: string;
+    avatar_url?: string;
+  }
 
-	interface Session extends DefaultSession {
-		user: {
-			id: string;
-			organizationId?: string;
-			onboarded?: boolean;
-			full_name?: string;
-			avatar_url?: string;
-		} & DefaultSession["user"];
-	}
+  interface Session extends DefaultSession {
+    user: {
+      id: string;
+      organizationId?: string;
+      onboarded?: boolean;
+      full_name?: string;
+      avatar_url?: string;
+    } & DefaultSession["user"];
+  }
 }
 
 export const authConfig: NextAuthConfig = {
-	providers: [
-		GoogleProvider({
-			clientId: process.env.AUTH_GOOGLE_ID!,
-			clientSecret: process.env.AUTH_GOOGLE_SECRET!,
-			allowDangerousEmailAccountLinking: true,
-		}),
-		Resend({
-			apiKey: process.env.RESEND_API_KEY!,
-			from: "noreply@mail.trycomp.ai",
-			async sendVerificationRequest(params) {
-				await sendMagicLinkEmail({
-					email: params.identifier,
-					url: params.url,
-				});
-			},
-		}),
-	],
-	adapter: PrismaAdapter(db),
-	callbacks: {
-		session: ({ session, user }) => ({
-			...session,
-			user: {
-				...session.user,
-				id: user.id,
-				organizationId: user.organizationId,
-				onboarded: user.onboarded,
-			},
-		}),
-	},
-	events: {
-		signIn: async ({ user, isNewUser }) => {
-			if (user?.id) {
-				await db.user.update({
-					where: {
-						id: user.id,
-					},
-					data: {
-						lastLogin: new Date(),
-						organizationId: user.organizationId,
-					},
-				});
-			}
+  providers: [
+    GoogleProvider({
+      clientId: process.env.AUTH_GOOGLE_ID!,
+      clientSecret: process.env.AUTH_GOOGLE_SECRET!,
+      allowDangerousEmailAccountLinking: true,
+    }),
+    Resend({
+      apiKey: process.env.RESEND_API_KEY!,
+      from: "noreply@mail.trycomp.ai",
+      async sendVerificationRequest(params) {
+        await sendMagicLinkEmail({
+          email: params.identifier,
+          url: params.url,
+        });
+      },
+    }),
+  ],
+  adapter: PrismaAdapter(db),
+  callbacks: {
+    session: ({ session, user }) => ({
+      ...session,
+      user: {
+        ...session.user,
+        id: user.id,
+        organizationId: user.organizationId,
+        onboarded: user.onboarded,
+      },
+    }),
+  },
+  events: {
+    signIn: async ({ user, isNewUser }) => {
+      if (user?.id) {
+        await db.user.update({
+          where: {
+            id: user.id,
+          },
+          data: {
+            lastLogin: new Date(),
+            organizationId: user.organizationId,
+          },
+        });
+      }
 
-			if (isNewUser && user.email && user.id) {
-				if (!user.organizationId) {
-					await createOrganizationAndConnectUser({
-						userId: user.id,
-						normalizedEmail: user.email,
-					});
-				}
-			}
-		},
-	},
+      if (isNewUser && user.email && user.id) {
+        if (!user.organizationId) {
+          await createOrganizationAndConnectUser({
+            userId: user.id,
+            normalizedEmail: user.email,
+            orgName: "My Organization",
+          });
+        }
+      }
+    },
+  },
 } satisfies NextAuthConfig;
diff --git a/apps/app/src/auth/org.ts b/apps/app/src/auth/org.ts
index 8471dc2ffa..ef9092be33 100644
--- a/apps/app/src/auth/org.ts
+++ b/apps/app/src/auth/org.ts
@@ -2,77 +2,77 @@ import { db } from "@bubba/db";
 import { stripe } from "./stripe";
 
 async function createStripeCustomer(input: {
-	name: string;
-	email: string;
-	organizationId: string;
+  name: string;
+  email: string;
+  organizationId: string;
 }): Promise<string> {
-	try {
-		const customer = await stripe.customers.create({
-			name: input.name,
-			email: input.email,
-			metadata: {
-				organizationId: input.organizationId,
-			},
-		});
+  try {
+    const customer = await stripe.customers.create({
+      name: input.name,
+      email: input.email,
+      metadata: {
+        organizationId: input.organizationId,
+      },
+    });
 
-		return customer.id;
-	} catch (error) {
-		console.error("Error creating Stripe customer", error);
-		throw error;
-	}
+    return customer.id;
+  } catch (error) {
+    console.error("Error creating Stripe customer", error);
+    throw error;
+  }
 }
 
 export async function createOrganizationAndConnectUser(input: {
-	userId: string;
-	normalizedEmail: string;
-}): Promise<string> {
-	const initialName = "New Organization";
-
-	const [organization] = await db.$transaction([
-		db.organization.create({
-			data: {
-				name: initialName,
-				tier: "free",
-				website: "",
-				members: {
-					create: {
-						userId: input.userId,
-						role: "owner",
-					},
-				},
-			},
-			select: {
-				id: true,
-			},
-		}),
-		db.user.update({
-			where: { id: input.userId },
-			data: { role: "admin" },
-			select: {
-				id: true,
-			},
-		}),
-	]);
+  userId: string;
+  normalizedEmail: string;
+  orgName: string;
+}) {
+  const [organization] = await db.$transaction([
+    db.organization.create({
+      data: {
+        name: input.orgName,
+        tier: "free",
+        website: "",
+        members: {
+          create: {
+            userId: input.userId,
+            role: "owner",
+          },
+        },
+      },
+      select: {
+        id: true,
+        name: true,
+      },
+    }),
+    db.user.update({
+      where: { id: input.userId },
+      data: { role: "admin" },
+      select: {
+        id: true,
+      },
+    }),
+  ]);
 
-	const stripeCustomerId = await createStripeCustomer({
-		name: initialName,
-		email: input.normalizedEmail,
-		organizationId: organization.id,
-	});
+  const stripeCustomerId = await createStripeCustomer({
+    name: organization.name,
+    email: input.normalizedEmail,
+    organizationId: organization.id,
+  });
 
-	if (!stripeCustomerId) {
-		console.warn("Stripe customer ID is missing");
-	}
+  if (!stripeCustomerId) {
+    console.warn("Stripe customer ID is missing");
+  }
 
-	await db.organization.update({
-		where: { id: organization.id },
-		data: { stripeCustomerId },
-	});
+  await db.organization.update({
+    where: { id: organization.id },
+    data: { stripeCustomerId },
+  });
 
-	await db.user.update({
-		where: { id: input.userId },
-		data: { organizationId: organization.id },
-	});
+  await db.user.update({
+    where: { id: input.userId },
+    data: { organizationId: organization.id },
+  });
 
-	return organization.id;
+  return organization;
 }
diff --git a/apps/app/src/components/forms/create-organization-form.tsx b/apps/app/src/components/forms/create-organization-form.tsx
index fead4419e9..a49c1cde4d 100644
--- a/apps/app/src/components/forms/create-organization-form.tsx
+++ b/apps/app/src/components/forms/create-organization-form.tsx
@@ -5,23 +5,23 @@ import { organizationSchema } from "@/actions/schema";
 import { useI18n } from "@/locales/client";
 import { Button } from "@bubba/ui/button";
 import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
+	Form,
+	FormControl,
+	FormField,
+	FormItem,
+	FormLabel,
+	FormMessage,
 } from "@bubba/ui/form";
 import { Input } from "@bubba/ui/input";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { ArrowRight, Loader2 } from "lucide-react";
 import { useSession } from "next-auth/react";
 import { useAction } from "next-safe-action/hooks";
-import { useEffect, useState } from "react";
+import { useEffect, useRef, useState } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
 import type { z } from "zod";
-import type { Framework } from "@bubba/db/types";
+import type { Framework, Organization } from "@bubba/db/types";
 import { Icons } from "@bubba/ui/icons";
 import Link from "next/link";
 import { Checkbox } from "@bubba/ui/checkbox";
@@ -30,243 +30,266 @@ import { useRealtimeRun } from "@trigger.dev/react-hooks";
 import { useRouter } from "next/navigation";
 import { LogoSpinner } from "../logo-spinner";
 
-function RealtimeStatus({ runId, publicAccessToken }: { runId: string; publicAccessToken: string }) {
-  const t = useI18n();
-  const router = useRouter()
+function RealtimeStatus({
+	runId,
+	publicAccessToken,
+	newOrganization,
+}: {
+	runId: string;
+	publicAccessToken: string;
+	newOrganization: Pick<Organization, "id" | "name"> | null;
+}) {
+	const t = useI18n();
+	const router = useRouter();
 
-  const { run, error } = useRealtimeRun(runId, {
-    accessToken: publicAccessToken,
-    onComplete: (run, error) => {
-      if (error) {
-        toast.error(t("common.actions.error"), { duration: 5000 });
-        return;
-      }
-    },
-  });
+	const { run, error } = useRealtimeRun(runId, {
+		accessToken: publicAccessToken,
+		onComplete: (run, error) => {
+			if (error) {
+				toast.error(t("common.actions.error"), { duration: 5000 });
+				return;
+			}
+		},
+	});
 
-  useEffect(() => {
-    if (run?.status === "COMPLETED") {
-      router.push("/");
-    }
-  }, [run, router]);
+	useEffect(() => {
+		if (run?.status === "COMPLETED" && newOrganization) {
+			router.push(`/${newOrganization.id}`);
+		}
+	}, [run, router, newOrganization]);
 
-  return (
-    <div className="flex flex-col justify-center space-y-4 animate-in fade-in slide-in-from-bottom-4 duration-300">
-      {run?.status !== "FAILED" && run?.status !== "COMPLETED" && (
-        <div className="flex flex-col gap-2 justify-center">
-          <LogoSpinner />
-          <h2 className="text-xl font-semibold text-center tracking-tight">
-            {t("onboarding.trigger.title")}
-          </h2>
-          <p className="text-center text-sm text-muted-foreground">
-            {t("onboarding.trigger.creating")}
-          </p>
-        </div>
-      )}
-    </div>
-  );
+	return (
+		<div className="flex flex-col justify-center space-y-4 animate-in fade-in slide-in-from-bottom-4 duration-300">
+			{run?.status !== "FAILED" && run?.status !== "COMPLETED" && (
+				<div className="flex flex-col gap-2 justify-center">
+					<LogoSpinner />
+					<h2 className="text-xl font-semibold text-center tracking-tight">
+						{t("onboarding.trigger.title")}
+					</h2>
+					<p className="text-center text-sm text-muted-foreground">
+						{t("onboarding.trigger.creating")}
+					</p>
+				</div>
+			)}
+		</div>
+	);
 }
 
 function OnboardingClient({ frameworks }: { frameworks: Framework[] }) {
-  const t = useI18n();
-  const { data: session } = useSession();
-  const [runId, setRunId] = useState<string | null>(null);
-  const [publicAccessToken, setPublicAccessToken] = useState<string | null>(null);
+	const t = useI18n();
+	const { data: session } = useSession();
+	const [runId, setRunId] = useState<string | null>(null);
+	const [publicAccessToken, setPublicAccessToken] = useState<string | null>(
+		null,
+	);
+	const newOrganizationRef = useRef<Pick<Organization, "id" | "name"> | null>(
+		null,
+	);
 
-  const createOrganization = useAction(createOrganizationAction, {
-    onSuccess: async (data) => {
-      setRunId(data.data?.runId ?? null);
-      setPublicAccessToken(data.data?.publicAccessToken ?? null);
-    },
-    onError: () => {
-      toast.error(t("common.actions.error"), { duration: 5000 });
-    },
-  });
+	const createOrganization = useAction(createOrganizationAction, {
+		onSuccess: async (data) => {
+			setRunId(data.data?.runId ?? null);
+			setPublicAccessToken(data.data?.publicAccessToken ?? null);
+			newOrganizationRef.current = data.data?.newOrganization ?? null;
+		},
+		onError: () => {
+			toast.error(t("common.actions.error"), { duration: 5000 });
+		},
+	});
 
-  const form = useForm<z.infer<typeof organizationSchema>>({
-    resolver: zodResolver(organizationSchema),
-    defaultValues: {
-      fullName: session?.user?.name ?? "",
-      name: "",
-      website: "",
-      frameworks: [],
-    },
-    mode: "onChange",
-  });
+	const form = useForm<z.infer<typeof organizationSchema>>({
+		resolver: zodResolver(organizationSchema),
+		defaultValues: {
+			fullName: session?.user?.name ?? "",
+			name: "",
+			website: "",
+			frameworks: [],
+		},
+		mode: "onChange",
+	});
 
-  const onSubmit = async (data: z.infer<typeof organizationSchema>) => {
-    createOrganization.execute(data);
-  };
+	const onSubmit = async (data: z.infer<typeof organizationSchema>) => {
+		createOrganization.execute(data);
+	};
 
-  if (runId && publicAccessToken) {
-    return (
-      <div className="flex min-h-screen items-center justify-center bg-background p-6 md:p-8">
-        <div className="relative w-full max-w-[440px] border bg-card p-8 shadow-lg">
-          <RealtimeStatus runId={runId} publicAccessToken={publicAccessToken} />
-        </div>
-      </div>
-    );
-  }
+	if (runId && publicAccessToken) {
+		return (
+			<div className="flex min-h-screen items-center justify-center bg-background p-6 md:p-8">
+				<div className="relative w-full max-w-[440px] border bg-card p-8 shadow-lg">
+					<RealtimeStatus
+						runId={runId}
+						publicAccessToken={publicAccessToken}
+						newOrganization={newOrganizationRef.current}
+					/>
+				</div>
+			</div>
+		);
+	}
 
-  return (
-    <div className="flex min-h-screen items-center justify-center bg-background p-6 md:p-8">
-      <div className="relative w-full max-w-[440px] border bg-card p-8 shadow-lg">
-        <div className="mb-8 flex justify-between">
-          <Link href="/">
-            <Icons.Logo />
-          </Link>
-        </div>
+	return (
+		<div className="flex min-h-screen items-center justify-center bg-background p-6 md:p-8">
+			<div className="relative w-full max-w-[440px] border bg-card p-8 shadow-lg">
+				<div className="mb-8 flex justify-between">
+					<Link href="/">
+						<Icons.Logo />
+					</Link>
+				</div>
 
-        <div className="mb-8 space-y-2">
-          <h1 className="text-2xl font-semibold tracking-tight">
-            {t("onboarding.setup")}
-          </h1>
-          <p className="text-sm text-muted-foreground">
-            {t("onboarding.description")}
-          </p>
-        </div>
+				<div className="mb-8 space-y-2">
+					<h1 className="text-2xl font-semibold tracking-tight">
+						{t("onboarding.setup")}
+					</h1>
+					<p className="text-sm text-muted-foreground">
+						{t("onboarding.description")}
+					</p>
+				</div>
 
-        <Form {...form}>
-          <form
-            onSubmit={form.handleSubmit(onSubmit)}
-            className="space-y-6"
-            suppressHydrationWarning
-          >
-            <FormField
-              control={form.control}
-              name="fullName"
-              render={({ field }) => (
-                <FormItem className="space-y-2">
-                  <FormLabel className="text-sm font-medium">
-                    {t("onboarding.fields.fullName.label")}
-                  </FormLabel>
-                  <FormControl>
-                    <Input
-                      autoCorrect="off"
-                      placeholder={t("onboarding.fields.fullName.placeholder")}
-                      suppressHydrationWarning
-                      {...field}
-                    />
-                  </FormControl>
-                  <FormMessage className="text-xs" />
-                </FormItem>
-              )}
-            />
+				<Form {...form}>
+					<form
+						onSubmit={form.handleSubmit(onSubmit)}
+						className="space-y-6"
+						suppressHydrationWarning
+					>
+						<FormField
+							control={form.control}
+							name="fullName"
+							render={({ field }) => (
+								<FormItem className="space-y-2">
+									<FormLabel className="text-sm font-medium">
+										{t("onboarding.fields.fullName.label")}
+									</FormLabel>
+									<FormControl>
+										<Input
+											autoCorrect="off"
+											placeholder={t("onboarding.fields.fullName.placeholder")}
+											suppressHydrationWarning
+											{...field}
+										/>
+									</FormControl>
+									<FormMessage className="text-xs" />
+								</FormItem>
+							)}
+						/>
 
-            <FormField
-              control={form.control}
-              name="name"
-              render={({ field }) => (
-                <FormItem className="space-y-2">
-                  <FormLabel className="text-sm font-medium">
-                    {t("onboarding.fields.name.label")}
-                  </FormLabel>
-                  <FormControl>
-                    <Input
-                      autoCorrect="off"
-                      placeholder={t("onboarding.fields.name.placeholder")}
-                      suppressHydrationWarning
-                      {...field}
-                    />
-                  </FormControl>
-                  <FormMessage className="text-xs" />
-                </FormItem>
-              )}
-            />
+						<FormField
+							control={form.control}
+							name="name"
+							render={({ field }) => (
+								<FormItem className="space-y-2">
+									<FormLabel className="text-sm font-medium">
+										{t("onboarding.fields.name.label")}
+									</FormLabel>
+									<FormControl>
+										<Input
+											autoCorrect="off"
+											placeholder={t("onboarding.fields.name.placeholder")}
+											suppressHydrationWarning
+											{...field}
+										/>
+									</FormControl>
+									<FormMessage className="text-xs" />
+								</FormItem>
+							)}
+						/>
 
-            <FormField
-              control={form.control}
-              name="website"
-              render={({ field }) => (
-                <FormItem className="space-y-2">
-                  <FormLabel className="text-sm font-medium">
-                    {t("onboarding.fields.website.label")}
-                  </FormLabel>
-                  <FormControl>
-                    <Input
-                      autoCorrect="off"
-                      placeholder={t("onboarding.fields.website.placeholder")}
-                      suppressHydrationWarning
-                      {...field}
-                    />
-                  </FormControl>
-                  <FormMessage className="text-xs" />
-                </FormItem>
-              )}
-            />
-            <FormField
-              control={form.control}
-              name="frameworks"
-              render={({ field }) => (
-                <FormItem className="space-y-2">
-                  <FormLabel className="text-sm font-medium">
-                    {t("frameworks.overview.grid.title")}
-                  </FormLabel>
-                  <FormControl>
-                    <div className="flex flex-col gap-2 select-none">
-                      {frameworks.map((framework) => (
-                        <div
-                          key={framework.id}
-                          className={cn(
-                            "relative flex flex-col p-4 border cursor-pointer transition-colors",
-                            field.value.includes(framework.id) && "border-primary bg-primary/5"
-                          )}
-                          onClick={() => {
-                            const newValue = !field.value.includes(framework.id)
-                              ? [...field.value, framework.id]
-                              : field.value.filter((id) => id !== framework.id);
-                            field.onChange(newValue);
-                          }}
-                        >
-                          <div className="flex items-start justify-between">
-                            <div>
-                              <h3 className="font-semibold">{framework.name}</h3>
-                              <p className="text-sm text-muted-foreground mt-1">
-                                {framework.description}
-                              </p>
-                              <p className="text-xs text-muted-foreground/75 mt-2">
-                                {`${t("frameworks.overview.grid.version")}: ${framework.version}`}
-                              </p>
-                            </div>
-                            <div onClick={(e) => e.stopPropagation()}>
-                              <Checkbox
-                                checked={field.value.includes(framework.id)}
-                                className="mt-1"
-                                onCheckedChange={(checked) => {
-                                  const newValue = checked
-                                    ? [...field.value, framework.id]
-                                    : field.value.filter((id) => id !== framework.id);
-                                  field.onChange(newValue);
-                                }}
-                              />
-                            </div>
-                          </div>
-                        </div>
-                      ))}
-                    </div>
-                  </FormControl>
-                  <FormMessage className="text-xs" />
-                </FormItem>
-              )}
-            />
+						<FormField
+							control={form.control}
+							name="website"
+							render={({ field }) => (
+								<FormItem className="space-y-2">
+									<FormLabel className="text-sm font-medium">
+										{t("onboarding.fields.website.label")}
+									</FormLabel>
+									<FormControl>
+										<Input
+											autoCorrect="off"
+											placeholder={t("onboarding.fields.website.placeholder")}
+											suppressHydrationWarning
+											{...field}
+										/>
+									</FormControl>
+									<FormMessage className="text-xs" />
+								</FormItem>
+							)}
+						/>
+						<FormField
+							control={form.control}
+							name="frameworks"
+							render={({ field }) => (
+								<FormItem className="space-y-2">
+									<FormLabel className="text-sm font-medium">
+										{t("frameworks.overview.grid.title")}
+									</FormLabel>
+									<FormControl>
+										<fieldset className="flex flex-col gap-2 select-none">
+											<legend className="sr-only">
+												{t("frameworks.overview.grid.title")}
+											</legend>
+											{frameworks.map((framework) => (
+												<label
+													key={framework.id}
+													htmlFor={`framework-${framework.id}`}
+													className={cn(
+														"relative flex flex-col p-4 border cursor-pointer transition-colors focus-within:ring-2 focus-within:ring-ring focus-within:ring-offset-2 w-full text-left",
+														field.value.includes(framework.id) &&
+															"border-primary bg-primary/5",
+													)}
+												>
+													<div className="flex items-start justify-between">
+														<div>
+															<h3 className="font-semibold">
+																{framework.name}
+															</h3>
+															<p className="text-sm text-muted-foreground mt-1">
+																{framework.description}
+															</p>
+															<p className="text-xs text-muted-foreground/75 mt-2">
+																{`${t("frameworks.overview.grid.version")}: ${framework.version}`}
+															</p>
+														</div>
+														<div>
+															<Checkbox
+																id={`framework-${framework.id}`}
+																checked={field.value.includes(framework.id)}
+																className="mt-1"
+																onCheckedChange={(checked) => {
+																	const newValue = checked
+																		? [...field.value, framework.id]
+																		: field.value.filter(
+																				(id) => id !== framework.id,
+																			);
+																	field.onChange(newValue);
+																}}
+															/>
+														</div>
+													</div>
+												</label>
+											))}
+										</fieldset>
+									</FormControl>
+									<FormMessage className="text-xs" />
+								</FormItem>
+							)}
+						/>
 
-            <Button
-              type="submit"
-              className="w-full"
-              disabled={createOrganization.status === "executing"}
-            >
-              {createOrganization.status === "executing" && (
-                <Loader2 className="mr-2 h-4 w-4 animate-spin" />
-              )}
-              {t("onboarding.submit")}
-            </Button>
-          </form>
-        </Form>
-      </div>
-    </div>
-  );
+						<Button
+							type="submit"
+							className="w-full"
+							disabled={createOrganization.status === "executing"}
+							suppressHydrationWarning
+						>
+							{createOrganization.status === "executing" && (
+								<Loader2 className="mr-2 h-4 w-4 animate-spin" />
+							)}
+							{t("onboarding.submit")}
+						</Button>
+					</form>
+				</Form>
+			</div>
+		</div>
+	);
 }
 
 export function Onboarding({ frameworks }: { frameworks: Framework[] }) {
-  return <OnboardingClient frameworks={frameworks} />;
+	return <OnboardingClient frameworks={frameworks} />;
 }
diff --git a/apps/app/src/components/forms/create-test-comment-form.tsx b/apps/app/src/components/forms/create-test-comment-form.tsx
index 7420a8ca09..ca1e65a98d 100644
--- a/apps/app/src/components/forms/create-test-comment-form.tsx
+++ b/apps/app/src/components/forms/create-test-comment-form.tsx
@@ -1,21 +1,21 @@
 "use client";
 
-import { createTestCommentAction } from "@/app/[locale]/(app)/(dashboard)/tests/all/[testId]/actions/createTestComment";
-import { createTestCommentSchema } from "@/app/[locale]/(app)/(dashboard)/tests/all/[testId]/actions/types";
+import { createTestCommentAction } from "@/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/[testId]/actions/createTestComment";
+import { createTestCommentSchema } from "@/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/[testId]/actions/types";
 import { useI18n } from "@/locales/client";
 import {
-  Accordion,
-  AccordionContent,
-  AccordionItem,
-  AccordionTrigger,
+	Accordion,
+	AccordionContent,
+	AccordionItem,
+	AccordionTrigger,
 } from "@bubba/ui/accordion";
 import { Button } from "@bubba/ui/button";
 import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormMessage,
+	Form,
+	FormControl,
+	FormField,
+	FormItem,
+	FormMessage,
 } from "@bubba/ui/form";
 import { Textarea } from "@bubba/ui/textarea";
 import { zodResolver } from "@hookform/resolvers/zod";
@@ -29,80 +29,80 @@ import { toast } from "sonner";
 import type { z } from "zod";
 
 export function CreateTestCommentForm() {
-  const t = useI18n();
-  const [_, setTestCommentSheet] = useQueryState("test-comment-sheet");
-  const params = useParams<{ testId: string }>();
+	const t = useI18n();
+	const [_, setTestCommentSheet] = useQueryState("test-comment-sheet");
+	const params = useParams<{ testId: string }>();
 
-  const createPolicyComment = useAction(createTestCommentAction, {
-    onSuccess: () => {
-      toast.success(t("common.comments.success"));
-      setTestCommentSheet(null);
-    },
-    onError: () => {
-      toast.error(t("common.comments.error"));
-    },
-  });
+	const createPolicyComment = useAction(createTestCommentAction, {
+		onSuccess: () => {
+			toast.success(t("common.comments.success"));
+			setTestCommentSheet(null);
+		},
+		onError: () => {
+			toast.error(t("common.comments.error"));
+		},
+	});
 
-  const form = useForm<z.infer<typeof createTestCommentSchema>>({
-    resolver: zodResolver(createTestCommentSchema),
-    defaultValues: {
-      content: "",
-      testId: params.testId,
-    },
-  });
+	const form = useForm<z.infer<typeof createTestCommentSchema>>({
+		resolver: zodResolver(createTestCommentSchema),
+		defaultValues: {
+			content: "",
+			testId: params.testId,
+		},
+	});
 
-  const onSubmit = (data: z.infer<typeof createTestCommentSchema>) => {
-    createPolicyComment.execute(data);
-  };
+	const onSubmit = (data: z.infer<typeof createTestCommentSchema>) => {
+		createPolicyComment.execute(data);
+	};
 
-  return (
-    <Form {...form}>
-      <form onSubmit={form.handleSubmit(onSubmit)}>
-        <div className="h-[calc(100vh-250px)] scrollbar-hide overflow-auto">
-          <div>
-            <Accordion type="multiple" defaultValue={["policy"]}>
-              <AccordionItem value="policy">
-                <AccordionTrigger>{t("common.comments.new")}</AccordionTrigger>
-                <AccordionContent>
-                  <div className="space-y-4">
-                    <FormField
-                      control={form.control}
-                      name="content"
-                      render={({ field }) => (
-                        <FormItem>
-                          <FormControl>
-                            <Textarea
-                              {...field}
-                              autoFocus
-                              className="mt-3"
-                              placeholder={t("common.comments.placeholder")}
-                              autoCorrect="off"
-                            />
-                          </FormControl>
-                          <FormMessage />
-                        </FormItem>
-                      )}
-                    />
-                  </div>
-                </AccordionContent>
-              </AccordionItem>
-            </Accordion>
-          </div>
+	return (
+		<Form {...form}>
+			<form onSubmit={form.handleSubmit(onSubmit)}>
+				<div className="h-[calc(100vh-250px)] scrollbar-hide overflow-auto">
+					<div>
+						<Accordion type="multiple" defaultValue={["policy"]}>
+							<AccordionItem value="policy">
+								<AccordionTrigger>{t("common.comments.new")}</AccordionTrigger>
+								<AccordionContent>
+									<div className="space-y-4">
+										<FormField
+											control={form.control}
+											name="content"
+											render={({ field }) => (
+												<FormItem>
+													<FormControl>
+														<Textarea
+															{...field}
+															autoFocus
+															className="mt-3"
+															placeholder={t("common.comments.placeholder")}
+															autoCorrect="off"
+														/>
+													</FormControl>
+													<FormMessage />
+												</FormItem>
+											)}
+										/>
+									</div>
+								</AccordionContent>
+							</AccordionItem>
+						</Accordion>
+					</div>
 
-          <div className="flex justify-end mt-4">
-            <Button
-              type="submit"
-              variant="action"
-              disabled={createPolicyComment.status === "executing"}
-            >
-              <div className="flex items-center justify-center">
-                {t("common.comments.save")}
-                <ArrowRightIcon className="ml-2 h-4 w-4" />
-              </div>
-            </Button>
-          </div>
-        </div>
-      </form>
-    </Form>
-  );
-}
\ No newline at end of file
+					<div className="flex justify-end mt-4">
+						<Button
+							type="submit"
+							variant="action"
+							disabled={createPolicyComment.status === "executing"}
+						>
+							<div className="flex items-center justify-center">
+								{t("common.comments.save")}
+								<ArrowRightIcon className="ml-2 h-4 w-4" />
+							</div>
+						</Button>
+					</div>
+				</div>
+			</form>
+		</Form>
+	);
+}
diff --git a/apps/app/src/components/forms/risks/create-risk-form.tsx b/apps/app/src/components/forms/risks/create-risk-form.tsx
index acd015e90b..d79fce263d 100644
--- a/apps/app/src/components/forms/risks/create-risk-form.tsx
+++ b/apps/app/src/components/forms/risks/create-risk-form.tsx
@@ -2,34 +2,34 @@
 
 import { createRiskAction } from "@/actions/risk/create-risk-action";
 import { createRiskSchema } from "@/actions/schema";
-import { useOrganizationAdmins } from "@/app/[locale]/(app)/(dashboard)/evidence/[id]/hooks/useOrganizationAdmins";
-import { useRisks } from "@/app/[locale]/(app)/(dashboard)/risk/register/hooks/useRisks";
+import { useOrganizationAdmins } from "@/app/[locale]/(app)/(dashboard)/[orgId]/hooks/useOrganizationAdmins";
+import { useRisks } from "@/app/[locale]/(app)/(dashboard)/[orgId]/risk/register/hooks/useRisks";
 import { SelectUser } from "@/components/select-user";
 import { useI18n } from "@/locales/client";
 import type { RiskStatus } from "@bubba/db/types";
 import { Departments, RiskCategory } from "@bubba/db/types";
 import {
-  Accordion,
-  AccordionContent,
-  AccordionItem,
-  AccordionTrigger,
+	Accordion,
+	AccordionContent,
+	AccordionItem,
+	AccordionTrigger,
 } from "@bubba/ui/accordion";
 import { Button } from "@bubba/ui/button";
 import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
+	Form,
+	FormControl,
+	FormField,
+	FormItem,
+	FormLabel,
+	FormMessage,
 } from "@bubba/ui/form";
 import { Input } from "@bubba/ui/input";
 import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
+	Select,
+	SelectContent,
+	SelectItem,
+	SelectTrigger,
+	SelectValue,
 } from "@bubba/ui/select";
 import { Textarea } from "@bubba/ui/textarea";
 import { zodResolver } from "@hookform/resolvers/zod";
diff --git a/apps/app/src/components/google-sign-in.tsx b/apps/app/src/components/google-sign-in.tsx
index 54201c87e9..4fe0b53930 100644
--- a/apps/app/src/components/google-sign-in.tsx
+++ b/apps/app/src/components/google-sign-in.tsx
@@ -9,37 +9,39 @@ import { signIn } from "next-auth/react";
 import { useState } from "react";
 
 export function GoogleSignIn({
-  inviteCode,
+	inviteCode,
 }: {
-  inviteCode?: string;
+	inviteCode?: string;
 }) {
-  const t = useI18n();
+	const t = useI18n();
 
-  const [isLoading, setLoading] = useState(false);
+	const [isLoading, setLoading] = useState(false);
 
-  const handleSignIn = async () => {
-    setLoading(true);
+	const handleSignIn = async () => {
+		setLoading(true);
 
-    await signIn("google", {
-      redirectTo: inviteCode ? `/api/auth/invitation?code=${inviteCode}` : "/",
-    });
-  };
+		await signIn("google", {
+			redirectTo: inviteCode
+				? `/api/auth/invitation?code=${inviteCode}`
+				: "/setup",
+		});
+	};
 
-  return (
-    <Button
-      onClick={handleSignIn}
-      className="flex h-[40px] w-full space-x-2 px-6 py-4 font-medium active:scale-[0.98]"
-    >
-      {isLoading ? (
-        <Loader2 className="h-4 w-4 animate-spin" />
-      ) : (
-        <>
-          <ButtonIcon className="mr-2" isLoading={isLoading}>
-            <Icons.Google />
-          </ButtonIcon>
-          <span>{t("auth.google")}</span>
-        </>
-      )}
-    </Button>
-  );
+	return (
+		<Button
+			onClick={handleSignIn}
+			className="flex h-[40px] w-full space-x-2 px-6 py-4 font-medium active:scale-[0.98]"
+		>
+			{isLoading ? (
+				<Loader2 className="h-4 w-4 animate-spin" />
+			) : (
+				<>
+					<ButtonIcon className="mr-2" isLoading={isLoading}>
+						<Icons.Google />
+					</ButtonIcon>
+					<span>{t("auth.google")}</span>
+				</>
+			)}
+		</Button>
+	);
 }
diff --git a/apps/app/src/components/header.tsx b/apps/app/src/components/header.tsx
index e5332d5f83..207488d5a8 100644
--- a/apps/app/src/components/header.tsx
+++ b/apps/app/src/components/header.tsx
@@ -8,39 +8,59 @@ import { Suspense } from "react";
 import { FeedbackForm } from "./feedback-form";
 import { MobileMenu } from "./mobile-menu";
 import { NotificationCenter } from "./notification-center";
+import { OrganizationSwitcher } from "./organization-switcher";
+import { getOrganizations } from "@/data/getOrganizations";
+import { auth } from "@/auth";
+import { redirect } from "next/navigation";
 
 export async function Header() {
-  const t = await getI18n();
-
-  return (
-    <header className="-ml-4 -mr-4 md:m-0 z-10 px-4 md:px-0 md:border-b-[1px] flex justify-between pt-4 pb-2 md:pb-4 items-center todesktop:sticky todesktop:top-0 todesktop:bg-background todesktop:border-none sticky md:static top-0 backdrop-filter backdrop-blur-xl md:backdrop-filter md:backdrop-blur-none bg-opacity-70">
-      <MobileMenu />
-
-      <div className="flex space-x-2 ml-auto">
-        <div className="hidden md:flex gap-2">
-          <FeedbackForm />
-          <Button
-            asChild
-            variant="outline"
-            className="rounded-full font-normal h-[32px] p-0 px-3 text-xs text-muted-foreground gap-2 items-center"
-          >
-            <Link
-              href="https://discord.gg/compai"
-              target="_blank"
-              className="flex gap-2"
-            >
-              <Icons.Discord className="h-4 w-4" />
-              {t("header.discord.button")}
-            </Link>
-          </Button>
-        </div>
-
-        <NotificationCenter />
-
-        <Suspense fallback={<Skeleton className="h-8 w-8 rounded-full" />}>
-          <UserMenu />
-        </Suspense>
-      </div>
-    </header>
-  );
+	const t = await getI18n();
+	const { organizations } = await getOrganizations();
+
+	const session = await auth();
+	const user = session?.user;
+	const currentOrganizationId = user?.organizationId;
+
+	if (!currentOrganizationId) {
+		redirect("/");
+	}
+
+	return (
+		<header className="-ml-4 -mr-4 md:m-0 z-10 px-4 md:px-0 md:border-b-[1px] flex justify-between pt-4 pb-2 md:pb-4 items-center todesktop:sticky todesktop:top-0 todesktop:bg-background todesktop:border-none sticky md:static top-0 backdrop-filter backdrop-blur-xl md:backdrop-filter md:backdrop-blur-none bg-opacity-70">
+			<MobileMenu organizationId={currentOrganizationId} />
+
+			<Suspense fallback={<Skeleton className="h-8 w-8 rounded-full" />}>
+				<OrganizationSwitcher
+					organizations={organizations}
+					organizationId={currentOrganizationId}
+				/>
+			</Suspense>
+
+			<div className="flex space-x-2 ml-auto">
+				<div className="hidden md:flex gap-2">
+					<FeedbackForm />
+					<Button
+						asChild
+						variant="outline"
+						className="rounded-full font-normal h-[32px] p-0 px-3 text-xs text-muted-foreground gap-2 items-center"
+					>
+						<Link
+							href="https://discord.gg/compai"
+							target="_blank"
+							className="flex gap-2"
+						>
+							<Icons.Discord className="h-4 w-4" />
+							{t("header.discord.button")}
+						</Link>
+					</Button>
+				</div>
+
+				<NotificationCenter />
+
+				<Suspense fallback={<Skeleton className="h-8 w-8 rounded-full" />}>
+					<UserMenu />
+				</Suspense>
+			</div>
+		</header>
+	);
 }
diff --git a/apps/app/src/components/main-menu.tsx b/apps/app/src/components/main-menu.tsx
index e39e5bf5f6..18ba505087 100644
--- a/apps/app/src/components/main-menu.tsx
+++ b/apps/app/src/components/main-menu.tsx
@@ -20,30 +20,38 @@ import { usePathname } from "next/navigation";
 import { useState } from "react";
 import { useLongPress } from "use-long-press";
 
-const icons = {
-	"/": () => <Icons.Overview size={22} />,
-	"/overview": () => <Icons.Overview size={22} />,
-	"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/overview/frameworks": () => <Icons.Overview size={22} />,
-	"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/settings": () => <Icons.Settings size={22} />,
-	"/policies": () => <Icons.Policies size={22} />,
-	"/risk": () => <Icons.Risk size={22} />,
-	"/vendors": () => <Icons.Vendors size={22} />,
-	"/integrations": () => <Icons.Apps size={22} />,
-	"/people": () => <Icons.Peolple size={22} />,
-	"/evidence": () => <Icons.Evidence size={22} />,
-	"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/evidence/overview": () => <Icons.Evidence size={22} />,
-	"/tests": () => <Icons.CloudSync size={22} />,
+// Define menu item types with icon component
+type MenuItem = {
+	id: string;
+	path: string;
+	name: string;
+	disabled: boolean;
+	icon: React.FC<{ size?: number }>;
+};
+
+// Map of menu item IDs to their icon components
+const menuIcons = {
+	overview: Icons.Overview,
+	settings: Icons.Settings,
+	policies: Icons.Policies,
+	risk: Icons.Risk,
+	vendors: Icons.Vendors,
+	integrations: Icons.Apps,
+	people: Icons.Peolple,
+	evidence: Icons.Evidence,
+	tests: Icons.CloudSync,
 };
 
 interface ItemProps {
-	item: { path: string; name: string; disabled: boolean };
+	item: MenuItem;
 	isActive: boolean;
 	isCustomizing: boolean;
-	onRemove: (path: string) => void;
+	onRemove: (id: string) => void;
 	disableRemove: boolean;
 	onDragEnd: () => void;
 	onSelect?: () => void;
 	disabled: boolean;
+	organizationId: string;
 }
 
 const Item = ({
@@ -55,11 +63,15 @@ const Item = ({
 	onDragEnd,
 	onSelect,
 	disabled,
+	organizationId,
 }: ItemProps) => {
 	const y = useMotionValue(0);
-	const Icon = icons[item.path as keyof typeof icons];
+	const Icon = item.icon;
 	const linkDisabled = disabled || item.disabled;
 
+	// Replace the organizationId placeholder in the path
+	const itemPath = item.path.replace(":organizationId", organizationId);
+
 	return (
 		<TooltipProvider delayDuration={70}>
 			{linkDisabled ? (
@@ -69,7 +81,7 @@ const Item = ({
 			) : (
 				<Link
 					prefetch
-					href={item.path}
+					href={itemPath}
 					onClick={(evt) => {
 						if (isCustomizing) {
 							evt.preventDefault();
@@ -86,9 +98,9 @@ const Item = ({
 						<TooltipTrigger className="w-full">
 							<Reorder.Item
 								onDragEnd={onDragEnd}
-								key={item.path}
+								key={item.id}
 								value={item}
-								id={item.path}
+								id={item.id}
 								style={{ y }}
 								layoutRoot
 								className={cn(
@@ -108,7 +120,7 @@ const Item = ({
 								>
 									{!disableRemove && isCustomizing && (
 										<Button
-											onClick={() => onRemove(item.path)}
+											onClick={() => onRemove(item.id)}
 											variant="ghost"
 											size="icon"
 											className="absolute -left-4 -top-4 w-4 h-4 p-0 rounded-full bg-border hover:bg-border hover:scale-150 z-10 transition-all"
@@ -124,7 +136,7 @@ const Item = ({
 												"animate-[jiggle_0.3s_ease-in-out_infinite] transform-gpu pointer-events-none",
 										)}
 									>
-										<Icon />
+										{Icon && <Icon size={22} />}
 										<span className="flex md:hidden">{item.name}</span>
 									</div>
 								</motion.div>
@@ -160,78 +172,91 @@ const itemVariant = {
 };
 
 type Props = {
-	initialItems?: { path: string; name: string; disabled: boolean }[];
+	initialItems?: MenuItem[];
 	onSelect?: () => void;
+	organizationId: string;
 };
 
-export function MainMenu({ initialItems, onSelect }: Props) {
+export function MainMenu({ initialItems, onSelect, organizationId }: Props) {
 	const t = useI18n();
 
-	const defaultItems = [
+	const defaultItems: MenuItem[] = [
 		{
-			path: "/",
+			id: "overview",
+			path: "/:organizationId",
 			name: t("sidebar.overview"),
 			disabled: false,
+			icon: Icons.Overview,
 		},
 		{
-			path: "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/evidence/overview",
+			id: "evidence",
+			path: "/:organizationId/evidence/overview",
 			name: t("sidebar.evidence"),
 			disabled: false,
+			icon: Icons.Evidence,
 		},
 		{
-			path: "/tests",
+			id: "tests",
+			path: "/:organizationId/tests",
 			name: t("sidebar.tests"),
 			disabled: false,
+			icon: Icons.CloudSync,
 		},
 		{
-			path: "/policies",
+			id: "policies",
+			path: "/:organizationId/policies",
 			name: t("sidebar.policies"),
 			disabled: false,
+			icon: Icons.Policies,
 		},
 		{
-			path: "/people",
+			id: "people",
+			path: "/:organizationId/people",
 			name: t("sidebar.people"),
 			disabled: false,
+			icon: Icons.Peolple,
 		},
 		{
-			path: "/risk",
+			id: "risk",
+			path: "/:organizationId/risk",
 			name: t("sidebar.risk"),
 			disabled: false,
+			icon: Icons.Risk,
 		},
 		{
-			path: "/vendors",
+			id: "vendors",
+			path: "/:organizationId/vendors",
 			name: t("sidebar.vendors"),
 			disabled: false,
+			icon: Icons.Vendors,
 		},
 		{
-			path: "/integrations",
+			id: "integrations",
+			path: "/:organizationId/integrations",
 			name: t("sidebar.integrations"),
 			disabled: false,
+			icon: Icons.Apps,
 		},
 		{
-			path: "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/settings",
+			id: "settings",
+			path: "/:organizationId/settings",
 			name: t("sidebar.settings"),
 			disabled: false,
+			icon: Icons.Settings,
 		},
 	];
 
 	const [items, setItems] = useState(initialItems ?? defaultItems);
 	const { isCustomizing, setCustomizing } = useMenuStore();
 	const pathname = usePathname();
-	const part = pathname?.split("/")[1];
+
 	const updateMenu = useAction(updateMenuAction);
 
 	const hiddenItems = defaultItems.filter(
-		(item) => !items.some((i) => i.path === item.path),
+		(item) => !items.some((i) => i.id === item.id),
 	);
 
-	const onReorder = (
-		items: {
-			path: string;
-			name: string;
-			disabled: boolean;
-		}[],
-	) => {
+	const onReorder = (items: MenuItem[]) => {
 		setItems(items);
 	};
 
@@ -239,12 +264,13 @@ export function MainMenu({ initialItems, onSelect }: Props) {
 		updateMenu.execute(items);
 	};
 
-	const onRemove = (path: string) => {
-		setItems((prevItems) => prevItems.filter((item) => item.path !== path));
-		updateMenu.execute(items.filter((item) => item.path !== path));
+	const onRemove = (id: string) => {
+		const updatedItems = items.filter((item) => item.id !== id);
+		setItems(updatedItems);
+		updateMenu.execute(updatedItems);
 	};
 
-	const onAdd = (item: { path: string; name: string; disabled: boolean }) => {
+	const onAdd = (item: MenuItem) => {
 		const updatedItems = [...items, item];
 		setItems(updatedItems);
 		updateMenu.execute(updatedItems);
@@ -263,6 +289,37 @@ export function MainMenu({ initialItems, onSelect }: Props) {
 		setCustomizing(false);
 	});
 
+	// Helper function to check if a path is active
+	const isPathActive = (itemPath: string) => {
+		const normalizedItemPath = itemPath.replace(
+			":organizationId",
+			organizationId,
+		);
+
+		// Extract the base path from the menu item (first two segments after normalization)
+		const itemPathParts = normalizedItemPath.split("/").filter(Boolean);
+		const itemBaseSegment = itemPathParts.length > 1 ? itemPathParts[1] : "";
+
+		// Extract the current path parts
+		const currentPathParts = pathname.split("/").filter(Boolean);
+		const currentBaseSegment =
+			currentPathParts.length > 1 ? currentPathParts[1] : "";
+
+		// Special case for root organization path
+		if (
+			normalizedItemPath === `/${organizationId}` ||
+			normalizedItemPath === `/${organizationId}/overview`
+		) {
+			return (
+				pathname === `/${organizationId}` ||
+				pathname?.startsWith(`/${organizationId}/overview`)
+			);
+		}
+
+		// Compare the base segments (usually the feature section like "evidence", "settings", etc.)
+		return itemBaseSegment === currentBaseSegment;
+	};
+
 	return (
 		<div
 			className="mt-6"
@@ -279,16 +336,11 @@ export function MainMenu({ initialItems, onSelect }: Props) {
 					{items
 						.filter((item) => !item.disabled)
 						.map((item) => {
-							const isActive =
-								(pathname === "/" && item.path === "/") ||
-								(pathname?.startsWith("/overview") && item.path === "/") ||
-								(pathname !== "/" &&
-									pathname !== "/overview" &&
-									item.path.startsWith(`/${part}`));
+							const isActive = isPathActive(item.path);
 
 							return (
 								<Item
-									key={item.path}
+									key={item.id}
 									item={item}
 									isActive={isActive}
 									isCustomizing={isCustomizing}
@@ -297,6 +349,7 @@ export function MainMenu({ initialItems, onSelect }: Props) {
 									onDragEnd={onDragEnd}
 									onSelect={onSelect}
 									disabled={item.disabled}
+									organizationId={organizationId}
 								/>
 							);
 						})}
@@ -314,12 +367,12 @@ export function MainMenu({ initialItems, onSelect }: Props) {
 						{hiddenItems
 							.filter((item) => !item.disabled)
 							.map((item) => {
-								const Icon = icons[item.path as keyof typeof icons];
+								const Icon = item.icon;
 
 								return (
 									<motion.li
 										variants={itemVariant}
-										key={item.path}
+										key={item.id}
 										className={cn(
 											"border border-transparent w-[45px] h-[45px] flex items-center md:justify-center",
 											"hover:bg-secondary hover:border-[#DCDAD2] hover:dark:border-[#2C2C2C]",
@@ -336,7 +389,7 @@ export function MainMenu({ initialItems, onSelect }: Props) {
 												<Icons.Add className="w-3 h-3" />
 											</Button>
 
-											<Icon />
+											<Icon size={22} />
 										</div>
 									</motion.li>
 								);
diff --git a/apps/app/src/components/mobile-menu.tsx b/apps/app/src/components/mobile-menu.tsx
index e43c7dc2db..090bb8968d 100644
--- a/apps/app/src/components/mobile-menu.tsx
+++ b/apps/app/src/components/mobile-menu.tsx
@@ -6,28 +6,31 @@ import { Sheet, SheetContent } from "@bubba/ui/sheet";
 import { useState } from "react";
 import { MainMenu } from "./main-menu";
 
-export function MobileMenu() {
-  const [isOpen, setOpen] = useState(false);
+export function MobileMenu({ organizationId }: { organizationId: string }) {
+	const [isOpen, setOpen] = useState(false);
 
-  return (
-    <Sheet open={isOpen} onOpenChange={setOpen}>
-      <div>
-        <Button
-          variant="outline"
-          size="icon"
-          onClick={() => setOpen(true)}
-          className="rounded-full w-8 h-8 items-center relative flex md:hidden"
-        >
-          <Icons.Menu size={16} />
-        </Button>
-      </div>
-      <SheetContent side="left" className="border-none rounded-none -ml-2">
-        <div className="ml-2 mb-8">
-          <Icons.Logo />
-        </div>
+	return (
+		<Sheet open={isOpen} onOpenChange={setOpen}>
+			<div>
+				<Button
+					variant="outline"
+					size="icon"
+					onClick={() => setOpen(true)}
+					className="rounded-full w-8 h-8 items-center relative flex md:hidden"
+				>
+					<Icons.Menu size={16} />
+				</Button>
+			</div>
+			<SheetContent side="left" className="border-none rounded-none -ml-2">
+				<div className="ml-2 mb-8">
+					<Icons.Logo />
+				</div>
 
-        <MainMenu onSelect={() => setOpen(false)} />
-      </SheetContent>
-    </Sheet>
-  );
+				<MainMenu
+					onSelect={() => setOpen(false)}
+					organizationId={organizationId}
+				/>
+			</SheetContent>
+		</Sheet>
+	);
 }
diff --git a/apps/app/src/components/organization-switcher.tsx b/apps/app/src/components/organization-switcher.tsx
new file mode 100644
index 0000000000..5c53b5f53b
--- /dev/null
+++ b/apps/app/src/components/organization-switcher.tsx
@@ -0,0 +1,79 @@
+"use client";
+
+import { changeOrganizationAction } from "@/actions/change-organization";
+import type { Organization } from "@bubba/db/types";
+import { Button } from "@bubba/ui/button";
+import {
+	DropdownMenu,
+	DropdownMenuContent,
+	DropdownMenuItem,
+	DropdownMenuTrigger,
+} from "@bubba/ui/dropdown-menu";
+import { Building2, ChevronDown, Plus } from "lucide-react";
+import { useAction } from "next-safe-action/hooks";
+import { useRouter } from "next/navigation";
+
+interface OrganizationSwitcherProps {
+	organizations: Organization[];
+	organizationId: string | undefined;
+}
+
+export function OrganizationSwitcher({
+	organizations,
+	organizationId,
+}: OrganizationSwitcherProps) {
+	const router = useRouter();
+
+	const { execute } = useAction(changeOrganizationAction, {
+		onSuccess: (result) => {
+			if (result.data?.success) {
+				router.push(`/${result.data.data?.id}`);
+			}
+		},
+		onError: (error) => {
+			console.error(error);
+		},
+	});
+
+	const handleOrganizationChange = async (organizationId: string) => {
+		execute({ organizationId });
+	};
+
+	const currentOrganization = organizations.find(
+		(org) => org.id === organizationId,
+	);
+
+	return (
+		<DropdownMenu>
+			<DropdownMenuTrigger asChild>
+				<Button variant="outline" className="flex items-center gap-2">
+					<Building2 className="h-4 w-4" />
+					<span className="hidden md:inline-block">
+						{currentOrganization?.name}
+					</span>
+					<ChevronDown className="h-4 w-4" />
+				</Button>
+			</DropdownMenuTrigger>
+			<DropdownMenuContent align="start" className="w-52">
+				{organizations.map((org) => (
+					<DropdownMenuItem
+						key={org.id}
+						onClick={() => handleOrganizationChange(org.id)}
+						className="flex items-center gap-2 cursor-pointer"
+					>
+						<span>{org.name}</span>
+					</DropdownMenuItem>
+				))}
+				<DropdownMenuItem
+					className="flex items-center gap-2 cursor-pointer"
+					onClick={() => {
+						router.push("/setup");
+					}}
+				>
+					<Plus className="h-4 w-4" />
+					<span>Create new org</span>
+				</DropdownMenuItem>
+			</DropdownMenuContent>
+		</DropdownMenu>
+	);
+}
diff --git a/apps/app/src/components/policies/charts/policies-by-framework.tsx b/apps/app/src/components/policies/charts/policies-by-framework.tsx
index a8a0f3d0e8..078c9f4e4d 100644
--- a/apps/app/src/components/policies/charts/policies-by-framework.tsx
+++ b/apps/app/src/components/policies/charts/policies-by-framework.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { usePolicies } from "@/app/[locale]/(app)/(dashboard)/policies/all/(overview)/hooks/usePolicies";
+import { usePolicies } from "@/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/(overview)/hooks/usePolicies";
 import { useI18n } from "@/locales/client";
 import { Card, CardContent, CardHeader, CardTitle } from "@bubba/ui/card";
 import {
diff --git a/apps/app/src/components/risks/charts/risks-by-assignee.tsx b/apps/app/src/components/risks/charts/risks-by-assignee.tsx
index 1aceb8c7b1..b35d4cc0c6 100644
--- a/apps/app/src/components/risks/charts/risks-by-assignee.tsx
+++ b/apps/app/src/components/risks/charts/risks-by-assignee.tsx
@@ -1,3 +1,4 @@
+import { auth } from "@/auth";
 import { getInitials } from "@/lib/utils";
 import { getI18n } from "@/locales/server";
 import { db } from "@bubba/db";
@@ -9,185 +10,185 @@ import Link from "next/link";
 import { redirect } from "next/navigation";
 
 interface Props {
-  organizationId: string;
+	organizationId: string;
 }
 
 interface UserRiskStats {
-  user: {
-    id: string;
-    name: string | null;
-    image: string | null;
-  };
-  totalRisks: number;
-  openRisks: number;
-  pendingRisks: number;
-  closedRisks: number;
-  archivedRisks: number;
+	user: {
+		id: string;
+		name: string | null;
+		image: string | null;
+	};
+	totalRisks: number;
+	openRisks: number;
+	pendingRisks: number;
+	closedRisks: number;
+	archivedRisks: number;
 }
 
 export async function RisksByAssignee({ organizationId }: Props) {
-  const t = await getI18n();
+	const t = await getI18n();
 
-  const userStats = await userData(organizationId);
+	const userStats = await userData(organizationId);
 
-  const stats: UserRiskStats[] = userStats.map((user) => ({
-    user: {
-      id: user.id,
-      name: user.name,
-      image: user.image,
-    },
-    totalRisks: user.Risk.length,
-    openRisks: user.Risk.filter((risk) => risk.status === "open").length,
-    pendingRisks: user.Risk.filter((risk) => risk.status === "pending").length,
-    closedRisks: user.Risk.filter((risk) => risk.status === "closed").length,
-    archivedRisks: user.Risk.filter((risk) => risk.status === "archived")
-      .length,
-  }));
+	const stats: UserRiskStats[] = userStats.map((user) => ({
+		user: {
+			id: user.id,
+			name: user.name,
+			image: user.image,
+		},
+		totalRisks: user.Risk.length,
+		openRisks: user.Risk.filter((risk) => risk.status === "open").length,
+		pendingRisks: user.Risk.filter((risk) => risk.status === "pending").length,
+		closedRisks: user.Risk.filter((risk) => risk.status === "closed").length,
+		archivedRisks: user.Risk.filter((risk) => risk.status === "archived")
+			.length,
+	}));
 
-  stats.sort((a, b) => b.totalRisks - a.totalRisks);
+	stats.sort((a, b) => b.totalRisks - a.totalRisks);
 
-  return (
-    <Card>
-      <CardHeader>
-        <CardTitle>{t("risk.dashboard.risks_by_assignee")}</CardTitle>
-      </CardHeader>
-      <CardContent>
-        <ScrollArea>
-          <div className="space-y-4">
-            {stats.map((stat) => (
-              <Link
-                href={`/risk/register?ownerId=${stat.user.id}`}
-                key={stat.user.id}
-              >
-                <div className="flex items-center gap-4 p-3 rounded-lg hover:bg-muted/50">
-                  <Avatar>
-                    <AvatarImage src={stat.user.image || undefined} />
-                    <AvatarFallback>
-                      {getInitials(stat.user.name || "Unknown User")}
-                    </AvatarFallback>
-                  </Avatar>
+	return (
+		<Card>
+			<CardHeader>
+				<CardTitle>{t("risk.dashboard.risks_by_assignee")}</CardTitle>
+			</CardHeader>
+			<CardContent>
+				<ScrollArea>
+					<div className="space-y-4">
+						{stats.map((stat) => (
+							<Link
+								href={`/${organizationId}/risk/register?ownerId=${stat.user.id}`}
+								key={stat.user.id}
+							>
+								<div className="flex items-center gap-4 p-3 rounded-lg hover:bg-muted/50">
+									<Avatar>
+										<AvatarImage src={stat.user.image || undefined} />
+										<AvatarFallback>
+											{getInitials(stat.user.name || "Unknown User")}
+										</AvatarFallback>
+									</Avatar>
 
-                  <div className="flex-1 min-w-0">
-                    <div className="flex items-center justify-between">
-                      <p className="text-sm font-medium leading-none truncate">
-                        {stat.user.name || "Unknown User"}
-                      </p>
-                      <span className="text-sm text-muted-foreground">
-                        {stat.totalRisks} {t("risk.risks")}
-                      </span>
-                    </div>
+									<div className="flex-1 min-w-0">
+										<div className="flex items-center justify-between">
+											<p className="text-sm font-medium leading-none truncate">
+												{stat.user.name || "Unknown User"}
+											</p>
+											<span className="text-sm text-muted-foreground">
+												{stat.totalRisks} {t("risk.risks")}
+											</span>
+										</div>
 
-                    <div className="mt-2 w-full bg-muted rounded-full h-2 overflow-hidden">
-                      {stat.totalRisks > 0 && (
-                        <div className="h-full flex">
-                          {stat.openRisks > 0 && (
-                            <div
-                              className="bg-yellow-500 h-full"
-                              style={{
-                                width: `${(stat.openRisks / stat.totalRisks) * 100}%`,
-                              }}
-                              title={`${t("common.status.open")}: ${stat.openRisks}`}
-                            />
-                          )}
-                          {stat.pendingRisks > 0 && (
-                            <div
-                              className="bg-blue-500 h-full"
-                              style={{
-                                width: `${
-                                  (stat.pendingRisks / stat.totalRisks) * 100
-                                }%`,
-                              }}
-                              title={`${t("common.status.pending")}: ${stat.pendingRisks}`}
-                            />
-                          )}
-                          {stat.closedRisks > 0 && (
-                            <div
-                              className="bg-green-500 h-full"
-                              style={{
-                                width: `${(stat.closedRisks / stat.totalRisks) * 100}%`,
-                              }}
-                              title={`${t("common.status.closed")}: ${stat.closedRisks}`}
-                            />
-                          )}
-                          {stat.archivedRisks > 0 && (
-                            <div
-                              className="bg-gray-500 h-full"
-                              style={{
-                                width: `${(stat.archivedRisks / stat.totalRisks) * 100}%`,
-                              }}
-                              title={`${t("common.status.archived")}: ${stat.archivedRisks}`}
-                            />
-                          )}
-                        </div>
-                      )}
-                    </div>
+										<div className="mt-2 w-full bg-muted rounded-full h-2 overflow-hidden">
+											{stat.totalRisks > 0 && (
+												<div className="h-full flex">
+													{stat.openRisks > 0 && (
+														<div
+															className="bg-yellow-500 h-full"
+															style={{
+																width: `${(stat.openRisks / stat.totalRisks) * 100}%`,
+															}}
+															title={`${t("common.status.open")}: ${stat.openRisks}`}
+														/>
+													)}
+													{stat.pendingRisks > 0 && (
+														<div
+															className="bg-blue-500 h-full"
+															style={{
+																width: `${
+																	(stat.pendingRisks / stat.totalRisks) * 100
+																}%`,
+															}}
+															title={`${t("common.status.pending")}: ${stat.pendingRisks}`}
+														/>
+													)}
+													{stat.closedRisks > 0 && (
+														<div
+															className="bg-green-500 h-full"
+															style={{
+																width: `${(stat.closedRisks / stat.totalRisks) * 100}%`,
+															}}
+															title={`${t("common.status.closed")}: ${stat.closedRisks}`}
+														/>
+													)}
+													{stat.archivedRisks > 0 && (
+														<div
+															className="bg-gray-500 h-full"
+															style={{
+																width: `${(stat.archivedRisks / stat.totalRisks) * 100}%`,
+															}}
+															title={`${t("common.status.archived")}: ${stat.archivedRisks}`}
+														/>
+													)}
+												</div>
+											)}
+										</div>
 
-                    <div className="mt-1.5 hidden lg:flex items-center gap-3 text-xs text-muted-foreground">
-                      {stat.openRisks > 0 && (
-                        <div className="flex items-center gap-1">
-                          <div className="size-2 rounded-full bg-yellow-500" />
-                          <span>
-                            {t("common.status.open")} ({stat.openRisks})
-                          </span>
-                        </div>
-                      )}
-                      {stat.pendingRisks > 0 && (
-                        <div className="flex items-center gap-1">
-                          <div className="size-2 rounded-full bg-blue-500" />
-                          <span>
-                            {t("common.status.pending")} ({stat.pendingRisks})
-                          </span>
-                        </div>
-                      )}
-                      {stat.closedRisks > 0 && (
-                        <div className="flex items-center gap-1">
-                          <div className="size-2 rounded-full bg-green-500" />
-                          <span>
-                            {t("common.status.closed")} ({stat.closedRisks})
-                          </span>
-                        </div>
-                      )}
-                      {stat.archivedRisks > 0 && (
-                        <div className="flex items-center gap-1">
-                          <div className="size-2 rounded-full bg-gray-500" />
-                          <span>
-                            {t("common.status.archived")} ({stat.archivedRisks})
-                          </span>
-                        </div>
-                      )}
-                    </div>
-                  </div>
-                </div>
-              </Link>
-            ))}
-          </div>
-        </ScrollArea>
-      </CardContent>
-    </Card>
-  );
+										<div className="mt-1.5 hidden lg:flex items-center gap-3 text-xs text-muted-foreground">
+											{stat.openRisks > 0 && (
+												<div className="flex items-center gap-1">
+													<div className="size-2 rounded-full bg-yellow-500" />
+													<span>
+														{t("common.status.open")} ({stat.openRisks})
+													</span>
+												</div>
+											)}
+											{stat.pendingRisks > 0 && (
+												<div className="flex items-center gap-1">
+													<div className="size-2 rounded-full bg-blue-500" />
+													<span>
+														{t("common.status.pending")} ({stat.pendingRisks})
+													</span>
+												</div>
+											)}
+											{stat.closedRisks > 0 && (
+												<div className="flex items-center gap-1">
+													<div className="size-2 rounded-full bg-green-500" />
+													<span>
+														{t("common.status.closed")} ({stat.closedRisks})
+													</span>
+												</div>
+											)}
+											{stat.archivedRisks > 0 && (
+												<div className="flex items-center gap-1">
+													<div className="size-2 rounded-full bg-gray-500" />
+													<span>
+														{t("common.status.archived")} ({stat.archivedRisks})
+													</span>
+												</div>
+											)}
+										</div>
+									</div>
+								</div>
+							</Link>
+						))}
+					</div>
+				</ScrollArea>
+			</CardContent>
+		</Card>
+	);
 }
 
 const userData = unstable_cache(
-  async (organizationId: string) => {
-    return await db.user.findMany({
-      where: {
-        organizationId,
-        Risk: {
-          some: {},
-        },
-      },
-      select: {
-        id: true,
-        name: true,
-        image: true,
-        Risk: {
-          select: {
-            status: true,
-          },
-        },
-      },
-    });
-  },
-  ["users-with-risks"],
-  { tags: ["risks", "users"] },
+	async (organizationId: string) => {
+		return await db.user.findMany({
+			where: {
+				organizationId,
+				Risk: {
+					some: {},
+				},
+			},
+			select: {
+				id: true,
+				name: true,
+				image: true,
+				Risk: {
+					select: {
+						status: true,
+					},
+				},
+			},
+		});
+	},
+	["users-with-risks"],
+	{ tags: ["risks", "users"] },
 );
diff --git a/apps/app/src/components/risks/tasks/task-attachments.tsx b/apps/app/src/components/risks/tasks/task-attachments.tsx
index 92a46242af..4b69a998d5 100644
--- a/apps/app/src/components/risks/tasks/task-attachments.tsx
+++ b/apps/app/src/components/risks/tasks/task-attachments.tsx
@@ -1,12 +1,11 @@
 "use client";
 
+import { UPLOAD_TYPE } from "@/actions/types";
+import { useTaskAttachments } from "@/app/[locale]/(app)/(dashboard)/[orgId]/risk/[riskId]/tasks/[taskId]/hooks/useTaskAttachments";
+import { FileSection } from "@/components/upload/FileSection";
+import { useI18n } from "@/locales/client";
 import { Card, CardContent, CardHeader, CardTitle } from "@bubba/ui/card";
 import { Skeleton } from "@bubba/ui/skeleton";
-import { useI18n } from "@/locales/client";
-import { useParams } from "next/navigation";
-import { useTaskAttachments } from "@/app/[locale]/(app)/(dashboard)/risk/[riskId]/tasks/[taskId]/hooks/useTaskAttachments";
-import { FileSection } from "@/components/upload/FileSection";
-import { UPLOAD_TYPE } from "@/actions/types";
 
 export function TaskAttachments({ taskId }: { taskId: string }) {
 	const { data, isLoading, error, mutate } = useTaskAttachments({
diff --git a/apps/app/src/components/sheets/invite-user-sheet.tsx b/apps/app/src/components/sheets/invite-user-sheet.tsx
index 9f3ac2df40..476717e51c 100644
--- a/apps/app/src/components/sheets/invite-user-sheet.tsx
+++ b/apps/app/src/components/sheets/invite-user-sheet.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { useEmployees } from "@/app/[locale]/(app)/(dashboard)/people/hooks/useEmployees";
+import { useEmployees } from "@/app/[locale]/(app)/(dashboard)/[orgId]/people/hooks/useEmployees";
 import { useI18n } from "@/locales/client";
 import { Button } from "@bubba/ui/button";
 import { Input } from "@bubba/ui/input";
diff --git a/apps/app/src/components/sheets/test-comment-sheet.tsx b/apps/app/src/components/sheets/test-comment-sheet.tsx
index 3e4a09e1c0..af6e273b47 100644
--- a/apps/app/src/components/sheets/test-comment-sheet.tsx
+++ b/apps/app/src/components/sheets/test-comment-sheet.tsx
@@ -6,69 +6,69 @@ import { Drawer, DrawerContent, DrawerTitle } from "@bubba/ui/drawer";
 import { useMediaQuery } from "@bubba/ui/hooks";
 import { ScrollArea } from "@bubba/ui/scroll-area";
 import {
-  Sheet,
-  SheetContent,
-  SheetDescription,
-  SheetHeader,
-  SheetTitle,
+	Sheet,
+	SheetContent,
+	SheetDescription,
+	SheetHeader,
+	SheetTitle,
 } from "@bubba/ui/sheet";
 import { X } from "lucide-react";
 import { useQueryState } from "nuqs";
 import React from "react";
 
-import type { Test } from "@/app/[locale]/(app)/(dashboard)/tests/all/types";
+import type { Test } from "@/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/types";
 import { CreateTestCommentForm } from "../forms/create-test-comment-form";
 
 export function TestCommentSheet({
-  test,
+	test,
 }: {
-  test: Test;
+	test: Test;
 }) {
-  const t = useI18n();
+	const t = useI18n();
 
-  const isDesktop = useMediaQuery("(min-width: 768px)");
-  const [open, setOpen] = useQueryState("test-comment-sheet");
-  const isOpen = Boolean(open);
+	const isDesktop = useMediaQuery("(min-width: 768px)");
+	const [open, setOpen] = useQueryState("test-comment-sheet");
+	const isOpen = Boolean(open);
 
-  const handleOpenChange = (open: boolean) => {
-    setOpen(open ? "true" : null);
-  };
+	const handleOpenChange = (open: boolean) => {
+		setOpen(open ? "true" : null);
+	};
 
-  if (isDesktop) {
-    return (
-      <Sheet open={isOpen} onOpenChange={handleOpenChange}>
-        <SheetContent stack>
-          <SheetHeader className="mb-8">
-            <div className="flex justify-between items-center flex-row">
-              <SheetTitle>{t("common.comments.title")}</SheetTitle>
-              <Button
-                size="icon"
-                variant="ghost"
-                className="p-0 m-0 size-auto hover:bg-transparent"
-                onClick={() => setOpen(null)}
-              >
-                <X className="h-5 w-5" />
-              </Button>
-            </div>{" "}
-            <SheetDescription>
-              {t("common.comments.description")}
-            </SheetDescription>
-          </SheetHeader>
+	if (isDesktop) {
+		return (
+			<Sheet open={isOpen} onOpenChange={handleOpenChange}>
+				<SheetContent stack>
+					<SheetHeader className="mb-8">
+						<div className="flex justify-between items-center flex-row">
+							<SheetTitle>{t("common.comments.title")}</SheetTitle>
+							<Button
+								size="icon"
+								variant="ghost"
+								className="p-0 m-0 size-auto hover:bg-transparent"
+								onClick={() => setOpen(null)}
+							>
+								<X className="h-5 w-5" />
+							</Button>
+						</div>{" "}
+						<SheetDescription>
+							{t("common.comments.description")}
+						</SheetDescription>
+					</SheetHeader>
 
-          <ScrollArea className="h-full p-0 pb-[100px]" hideScrollbar>
-            <CreateTestCommentForm />
-          </ScrollArea>
-        </SheetContent>
-      </Sheet>
-    );
-  }
+					<ScrollArea className="h-full p-0 pb-[100px]" hideScrollbar>
+						<CreateTestCommentForm />
+					</ScrollArea>
+				</SheetContent>
+			</Sheet>
+		);
+	}
 
-  return (
-    <Drawer open={isOpen} onOpenChange={handleOpenChange}>
-      <DrawerTitle hidden>{t("common.comments.title")}</DrawerTitle>
-      <DrawerContent className="p-6">
-        <CreateTestCommentForm />
-      </DrawerContent>
-    </Drawer>
-  );
-}
\ No newline at end of file
+	return (
+		<Drawer open={isOpen} onOpenChange={handleOpenChange}>
+			<DrawerTitle hidden>{t("common.comments.title")}</DrawerTitle>
+			<DrawerContent className="p-6">
+				<CreateTestCommentForm />
+			</DrawerContent>
+		</Drawer>
+	);
+}
diff --git a/apps/app/src/components/sidebar.tsx b/apps/app/src/components/sidebar.tsx
index e354eac8b0..2070eae585 100644
--- a/apps/app/src/components/sidebar.tsx
+++ b/apps/app/src/components/sidebar.tsx
@@ -3,26 +3,36 @@ import { Icons } from "@bubba/ui/icons";
 import { cookies } from "next/headers";
 import Link from "next/link";
 import { MainMenu } from "./main-menu";
+import { auth } from "@/auth";
+import { redirect } from "next/navigation";
 
 export async function Sidebar() {
-  const cookieStore = await cookies();
+	const session = await auth();
+	const user = session?.user;
+	const organizationId = user?.organizationId;
 
-  const initialItems = cookieStore.has(Cookies.MenuConfig)
-    ? JSON.parse(cookieStore.get(Cookies.MenuConfig)?.value ?? "")
-    : null;
+	if (!organizationId) {
+		redirect("/");
+	}
 
-  return (
-    <aside className="h-screen flex-shrink-0 flex-col justify-between fixed top-0 ml-4 pb-4 items-center hidden md:flex">
-      <div className="flex flex-col items-center justify-center">
-        <div className="mt-2 todesktop:mt-[35px]">
-          <div className="mt-2 items-center justify-center">
-            <Link href="/">
-              <Icons.Logo />
-            </Link>
-          </div>
-        </div>
-        <MainMenu initialItems={initialItems} />
-      </div>
-    </aside>
-  );
+	const cookieStore = await cookies();
+
+	const initialItems = cookieStore.has(Cookies.MenuConfig)
+		? JSON.parse(cookieStore.get(Cookies.MenuConfig)?.value ?? "")
+		: null;
+
+	return (
+		<aside className="h-screen flex-shrink-0 flex-col justify-between fixed top-0 ml-4 pb-4 items-center hidden md:flex">
+			<div className="flex flex-col items-center justify-center">
+				<div className="mt-2 todesktop:mt-[35px]">
+					<div className="mt-2 items-center justify-center">
+						<Link href={`/${organizationId}`}>
+							<Icons.Logo />
+						</Link>
+					</div>
+				</div>
+				<MainMenu initialItems={initialItems} organizationId={organizationId} />
+			</div>
+		</aside>
+	);
 }
diff --git a/apps/app/src/components/tables/people/data-table.tsx b/apps/app/src/components/tables/people/data-table.tsx
index 05d86884b9..0d768bbe18 100644
--- a/apps/app/src/components/tables/people/data-table.tsx
+++ b/apps/app/src/components/tables/people/data-table.tsx
@@ -11,7 +11,7 @@ import { useI18n } from "@/locales/client";
 import { Button } from "@bubba/ui/button";
 import { cn } from "@bubba/ui/cn";
 import { Table, TableBody, TableCell, TableRow } from "@bubba/ui/table";
-import { useRouter } from "next/navigation";
+import { useParams, useRouter } from "next/navigation";
 import type { PersonType } from "./columns";
 import { DataTableHeader } from "./data-table-header";
 import { DataTablePagination } from "./data-table-pagination";
@@ -46,6 +46,7 @@ interface DataTableProps {
 
 function getColumns(): ColumnDef<PersonType>[] {
 	const t = useI18n();
+	const { orgId } = useParams<{ orgId: string }>();
 
 	return [
 		{
@@ -63,7 +64,7 @@ function getColumns(): ColumnDef<PersonType>[] {
 				return (
 					<div className="flex flex-col space-y-0.5">
 						<Button variant="link" className="p-0 h-auto justify-start" asChild>
-							<Link href={`/people/${row.original.id}`}>
+							<Link href={`/${orgId}/people/${row.original.id}`}>
 								<span className="truncate">{name}</span>
 							</Link>
 						</Button>
@@ -105,7 +106,7 @@ function getColumns(): ColumnDef<PersonType>[] {
 			cell: ({ row }) => {
 				const department = row.original.department;
 				return (
-					<div className="flex items-center hidden md:flex">
+					<div className="flex items-center md:flex">
 						<Badge variant="marketing">{department}</Badge>
 					</div>
 				);
diff --git a/apps/app/src/components/tables/people/empty-states.tsx b/apps/app/src/components/tables/people/empty-states.tsx
index f8a8d61850..3e5d68936b 100644
--- a/apps/app/src/components/tables/people/empty-states.tsx
+++ b/apps/app/src/components/tables/people/empty-states.tsx
@@ -3,7 +3,7 @@
 import { useI18n } from "@/locales/client";
 import { Button } from "@bubba/ui/button";
 import { Users } from "lucide-react";
-import { useRouter } from "next/navigation";
+import { useParams, useRouter } from "next/navigation";
 import { useQueryState } from "nuqs";
 import { Plus } from "lucide-react";
 import { EmployeeInviteSheet } from "@/components/sheets/invite-user-sheet";
@@ -15,6 +15,7 @@ interface Props {
 export function NoResults({ hasFilters }: Props) {
 	const router = useRouter();
 	const t = useI18n();
+	const { orgId } = useParams<{ orgId: string }>();
 
 	return (
 		<div className="mt-24 flex items-center justify-center">
@@ -32,7 +33,10 @@ export function NoResults({ hasFilters }: Props) {
 				</div>
 
 				{hasFilters && (
-					<Button variant="outline" onClick={() => router.push("/people")}>
+					<Button
+						variant="outline"
+						onClick={() => router.push(`/${orgId}/people`)}
+					>
 						{t("people.actions.clear")}
 					</Button>
 				)}
diff --git a/apps/app/src/components/tables/policies/columns.tsx b/apps/app/src/components/tables/policies/columns.tsx
index 91a7fb1cc0..b872c34d1c 100644
--- a/apps/app/src/components/tables/policies/columns.tsx
+++ b/apps/app/src/components/tables/policies/columns.tsx
@@ -5,69 +5,72 @@ import { formatDate } from "@/utils/format";
 import { Button } from "@bubba/ui/button";
 import type { ColumnDef } from "@tanstack/react-table";
 import Link from "next/link";
+import { useParams } from "next/navigation";
 
 export type PolicyType = {
-  id: string;
-  policy: {
-    id: string;
-    name: string;
-    description: string | null;
-    slug: string;
-  };
-  status: "draft" | "published" | "archived";
-  createdAt: string;
-  updatedAt: string;
+	id: string;
+	policy: {
+		id: string;
+		name: string;
+		description: string | null;
+		slug: string;
+	};
+	status: "draft" | "published" | "archived";
+	createdAt: string;
+	updatedAt: string;
 };
 
 export function columns(): ColumnDef<PolicyType>[] {
-  return [
-    {
-      id: "name",
-      accessorKey: "policy.name",
-      cell: ({ row }) => {
-        const name = row.original.policy.name;
-        const id = row.original.id;
-        const status = row.original.status;
+	const { orgId } = useParams<{ orgId: string }>();
 
-        return (
-          <div className="flex flex-col gap-1">
-            <Button variant="link" className="p-0 justify-start" asChild>
-              <Link href={`/policies/all/${id}`}>
-                <span className="truncate">{name}</span>
-              </Link>
-            </Button>
-            <div className="md:hidden">
-              <StatusPolicies status={status as StatusType} />
-            </div>
-          </div>
-        );
-      },
-    },
-    {
-      id: "status",
-      accessorKey: "status",
-      cell: ({ row }) => {
-        const status = row.original.status;
+	return [
+		{
+			id: "name",
+			accessorKey: "policy.name",
+			cell: ({ row }) => {
+				const name = row.original.policy.name;
+				const id = row.original.id;
+				const status = row.original.status;
 
-        return (
-          <div className="hidden md:flex items-center gap-2">
-            <StatusPolicies status={status as StatusType} />
-          </div>
-        );
-      },
-    },
-    {
-      id: "updatedAt",
-      accessorKey: "updatedAt",
-      cell: ({ row }) => {
-        const date = row.original.updatedAt;
+				return (
+					<div className="flex flex-col gap-1">
+						<Button variant="link" className="p-0 justify-start" asChild>
+							<Link href={`/${orgId}/policies/all/${id}`}>
+								<span className="truncate">{name}</span>
+							</Link>
+						</Button>
+						<div className="md:hidden">
+							<StatusPolicies status={status as StatusType} />
+						</div>
+					</div>
+				);
+			},
+		},
+		{
+			id: "status",
+			accessorKey: "status",
+			cell: ({ row }) => {
+				const status = row.original.status;
 
-        return (
-          <div className="text-muted-foreground">
-            {formatDate(date, "MMM d, yyyy")}
-          </div>
-        );
-      },
-    },
-  ];
+				return (
+					<div className="hidden md:flex items-center gap-2">
+						<StatusPolicies status={status as StatusType} />
+					</div>
+				);
+			},
+		},
+		{
+			id: "updatedAt",
+			accessorKey: "updatedAt",
+			cell: ({ row }) => {
+				const date = row.original.updatedAt;
+
+				return (
+					<div className="text-muted-foreground">
+						{formatDate(date, "MMM d, yyyy")}
+					</div>
+				);
+			},
+		},
+	];
 }
diff --git a/apps/app/src/components/tables/policies/empty-states.tsx b/apps/app/src/components/tables/policies/empty-states.tsx
index f08e71ce71..e3561e9cb3 100644
--- a/apps/app/src/components/tables/policies/empty-states.tsx
+++ b/apps/app/src/components/tables/policies/empty-states.tsx
@@ -1,46 +1,50 @@
+"use client";
+
 import { useI18n } from "@/locales/client";
 import { Button } from "@bubba/ui/button";
 import { Card, CardContent } from "@bubba/ui/card";
 import { FileText } from "lucide-react";
 import Link from "next/link";
+import { useParams } from "next/navigation";
 
 export function NoPolicies() {
-  const t = useI18n();
+	const t = useI18n();
+	const { orgId } = useParams<{ orgId: string }>();
 
-  return (
-    <Card className="w-full">
-      <CardContent className="flex flex-col items-center justify-center p-6 text-center">
-        <FileText className="h-12 w-12 text-muted-foreground mb-4" />
-        <h3 className="font-semibold text-lg mb-2">
-          {t("policies.no_policies_title")}
-        </h3>
-        <p className="text-muted-foreground mb-6">
-          {t("policies.no_policies_description")}
-        </p>
-        <Link href="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/policies/new">
-          <Button>{t("policies.create_first")}</Button>
-        </Link>
-      </CardContent>
-    </Card>
-  );
+	return (
+		<Card className="w-full">
+			<CardContent className="flex flex-col items-center justify-center p-6 text-center">
+				<FileText className="h-12 w-12 text-muted-foreground mb-4" />
+				<h3 className="font-semibold text-lg mb-2">
+					{t("policies.no_policies_title")}
+				</h3>
+				<p className="text-muted-foreground mb-6">
+					{t("policies.no_policies_description")}
+				</p>
+				<Link href={`/${orgId}/policies/new`}>
+					<Button>{t("policies.create_first")}</Button>
+				</Link>
+			</CardContent>
+		</Card>
+	);
 }
 
 export function NoResults({ hasFilters }: { hasFilters: boolean }) {
-  const t = useI18n();
+	const t = useI18n();
 
-  return (
-    <Card className="w-full">
-      <CardContent className="flex flex-col items-center justify-center p-6 text-center">
-        <FileText className="h-12 w-12 text-muted-foreground mb-4" />
-        <h3 className="font-semibold text-lg mb-2">
-          {t("common.empty_states.no_results.title")}
-        </h3>
-        <p className="text-muted-foreground">
-          {hasFilters
-            ? t("common.empty_states.no_results.description_filters")
-            : t("common.empty_states.no_results.description")}
-        </p>
-      </CardContent>
-    </Card>
-  );
+	return (
+		<Card className="w-full">
+			<CardContent className="flex flex-col items-center justify-center p-6 text-center">
+				<FileText className="h-12 w-12 text-muted-foreground mb-4" />
+				<h3 className="font-semibold text-lg mb-2">
+					{t("common.empty_states.no_results.title")}
+				</h3>
+				<p className="text-muted-foreground">
+					{hasFilters
+						? t("common.empty_states.no_results.description_filters")
+						: t("common.empty_states.no_results.description")}
+				</p>
+			</CardContent>
+		</Card>
+	);
 }
diff --git a/apps/app/src/components/tables/risk-register/empty-states.tsx b/apps/app/src/components/tables/risk-register/empty-states.tsx
index 175131e4fd..6290a76825 100644
--- a/apps/app/src/components/tables/risk-register/empty-states.tsx
+++ b/apps/app/src/components/tables/risk-register/empty-states.tsx
@@ -5,66 +5,67 @@ import { useI18n } from "@/locales/client";
 import { Button } from "@bubba/ui/button";
 import { Icons } from "@bubba/ui/icons";
 import { Plus } from "lucide-react";
-import { useRouter } from "next/navigation";
+import { useRouter, useParams } from "next/navigation";
 import { useQueryState } from "nuqs";
 
 type Props = {
-  hasFilters?: boolean;
+	hasFilters?: boolean;
 };
 
 export function NoResults({ hasFilters }: Props) {
-  const router = useRouter();
-  const t = useI18n();
+	const router = useRouter();
+	const t = useI18n();
+	const { orgId } = useParams<{ orgId: string }>();
 
-  return (
-    <div className="mt-24 flex items-center justify-center">
-      <div className="flex flex-col items-center">
-        <Icons.Transactions2 className="mb-4" />
-        <div className="text-center mb-6 space-y-2">
-          <h2 className="font-medium text-lg">
-            {t("common.empty_states.no_results.title")}
-          </h2>
-          <p className="text-muted-foreground text-sm">
-            {hasFilters
-              ? t("common.empty_states.no_results.description_filters")
-              : t("common.empty_states.no_results.description")}
-          </p>
-        </div>
+	return (
+		<div className="mt-24 flex items-center justify-center">
+			<div className="flex flex-col items-center">
+				<Icons.Transactions2 className="mb-4" />
+				<div className="text-center mb-6 space-y-2">
+					<h2 className="font-medium text-lg">
+						{t("common.empty_states.no_results.title")}
+					</h2>
+					<p className="text-muted-foreground text-sm">
+						{hasFilters
+							? t("common.empty_states.no_results.description_filters")
+							: t("common.empty_states.no_results.description")}
+					</p>
+				</div>
 
-        {hasFilters && (
-          <Button
-            variant="outline"
-            onClick={() => router.push("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/risk/register")}
-          >
-            {t("common.actions.clear")}
-          </Button>
-        )}
-      </div>
-    </div>
-  );
+				{hasFilters && (
+					<Button
+						variant="outline"
+						onClick={() => router.push(`/${orgId}/risk/register`)}
+					>
+						{t("common.actions.clear")}
+					</Button>
+				)}
+			</div>
+		</div>
+	);
 }
 
 export function NoRisks() {
-  const t = useI18n();
+	const t = useI18n();
 
-  const [open, setOpen] = useQueryState("create-risk-sheet");
+	const [open, setOpen] = useQueryState("create-risk-sheet");
 
-  return (
-    <div className="mt-24 absolute w-full top-0 left-0 flex items-center justify-center z-20">
-      <div className="text-center max-w-sm mx-auto flex flex-col items-center justify-center">
-        <h2 className="text-xl font-medium mb-2">
-          {t("risk.register.empty.no_risks.title")}
-        </h2>
-        <p className="text-sm text-muted-foreground mb-6">
-          {t("risk.register.empty.no_risks.description")}
-        </p>
-        <Button onClick={() => setOpen("true")} className="flex">
-          <Plus className="h-4 w-4 mr-2" />
-          {t("common.actions.create")}
-        </Button>
-      </div>
+	return (
+		<div className="mt-24 absolute w-full top-0 left-0 flex items-center justify-center z-20">
+			<div className="text-center max-w-sm mx-auto flex flex-col items-center justify-center">
+				<h2 className="text-xl font-medium mb-2">
+					{t("risk.register.empty.no_risks.title")}
+				</h2>
+				<p className="text-sm text-muted-foreground mb-6">
+					{t("risk.register.empty.no_risks.description")}
+				</p>
+				<Button onClick={() => setOpen("true")} className="flex">
+					<Plus className="h-4 w-4 mr-2" />
+					{t("common.actions.create")}
+				</Button>
+			</div>
 
-      <CreateRiskSheet />
-    </div>
-  );
+			<CreateRiskSheet />
+		</div>
+	);
 }
diff --git a/apps/app/src/components/tables/tests/data-table.tsx b/apps/app/src/components/tables/tests/data-table.tsx
index b2637b9f26..bc4e02ef99 100644
--- a/apps/app/src/components/tables/tests/data-table.tsx
+++ b/apps/app/src/components/tables/tests/data-table.tsx
@@ -1,207 +1,217 @@
 "use client";
 
 import {
-  type ColumnDef,
-  flexRender,
-  getCoreRowModel,
-  useReactTable,
+	type ColumnDef,
+	flexRender,
+	getCoreRowModel,
+	useReactTable,
 } from "@tanstack/react-table";
 
 import { useI18n } from "@/locales/client";
 import { Button } from "@bubba/ui/button";
 import { cn } from "@bubba/ui/cn";
 import {
-  Table,
-  TableBody,
-  TableCell,
-  TableHead,
-  TableRow,
+	Table,
+	TableBody,
+	TableCell,
+	TableHead,
+	TableRow,
 } from "@bubba/ui/table";
-import { useRouter } from "next/navigation";
+import { useParams, useRouter } from "next/navigation";
 import type { TestType } from "./columns";
 import { DataTableHeader } from "./data-table-header";
 import { DataTablePagination } from "./data-table-pagination";
 import { AssignedUser } from "@/components/assigned-user";
 
 interface DataTableProps {
-  columnHeaders: {
-    severity: string;
-    result: string;
-    title: string;
-    provider: string;
-    createdAt: string;
-    assignedUser: string;
-  };
-  data: TestType[];
-  pageCount: number;
-  currentPage: number;
+	columnHeaders: {
+		severity: string;
+		result: string;
+		title: string;
+		provider: string;
+		createdAt: string;
+		assignedUser: string;
+	};
+	data: TestType[];
+	pageCount: number;
+	currentPage: number;
 }
 
 function getColumns(): ColumnDef<TestType>[] {
-  const t = useI18n();
+	const t = useI18n();
 
-  return [
-    {
-      id: "severity",
-      accessorKey: "severity",
-      header: ({ column }) => (
-        <TableHead>
-          <Button
-            variant="ghost"
-            onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
-          >
-            {t("tests.table.severity")}
-          </Button>
-        </TableHead>
-      ),
-    },
-    {
-      id: "result",
-      accessorKey: "result",
-      header: ({ column }) => (
-        <TableHead>
-          <Button
-            variant="ghost"
-            onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
-          >
-            {t("tests.table.result")}
-          </Button>
-        </TableHead>
-      ),
-    },
-    {
-      id: "title",
-      accessorKey: "title",
-      header: ({ column }) => (
-        <TableHead>
-          <Button
-            variant="ghost"
-            onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
-          >
-            {t("tests.table.title")}
-          </Button>
-        </TableHead>
-      ),
-    },
-    {
-      id: "provider",
-      accessorKey: "provider",
-      header: ({ column }) => (
-        <TableHead>
-          <Button
-            variant="ghost"
-            onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
-          >
-            {t("tests.table.provider")}
-          </Button>
-        </TableHead>
-      ),
-    },
-    {
-      id: "createdAt",
-      accessorKey: "createdAt",
-      header: ({ column }) => (
-        <TableHead>
-          <Button
-            variant="ghost"
-            onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
-          >
-            {t("tests.table.createdAt")}
-          </Button>
-        </TableHead>
-      ),
-    },
-    {
-      id: "assignedUser",
-      accessorKey: "assignedUser",
-      header: ({ column }) => (
-        <TableHead>
-          <Button
-            variant="ghost"
-            onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
-          >
-            {t("tests.table.assignedUser")}
-          </Button>
-        </TableHead>
-      ),
-      cell: ({ row }) => {
-        const assignedUser = row.original.assignedUser;
-        if (!assignedUser) {
-          return <span className="text-muted-foreground text-sm">{t("tests.table.assignedUserEmpty")}</span>;
-        }
-        return <AssignedUser avatarUrl={assignedUser.image} fullName={assignedUser.name} />;
-      },
-    }
-  ];
+	return [
+		{
+			id: "severity",
+			accessorKey: "severity",
+			header: ({ column }) => (
+				<TableHead>
+					<Button
+						variant="ghost"
+						onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
+					>
+						{t("tests.table.severity")}
+					</Button>
+				</TableHead>
+			),
+		},
+		{
+			id: "result",
+			accessorKey: "result",
+			header: ({ column }) => (
+				<TableHead>
+					<Button
+						variant="ghost"
+						onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
+					>
+						{t("tests.table.result")}
+					</Button>
+				</TableHead>
+			),
+		},
+		{
+			id: "title",
+			accessorKey: "title",
+			header: ({ column }) => (
+				<TableHead>
+					<Button
+						variant="ghost"
+						onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
+					>
+						{t("tests.table.title")}
+					</Button>
+				</TableHead>
+			),
+		},
+		{
+			id: "provider",
+			accessorKey: "provider",
+			header: ({ column }) => (
+				<TableHead>
+					<Button
+						variant="ghost"
+						onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
+					>
+						{t("tests.table.provider")}
+					</Button>
+				</TableHead>
+			),
+		},
+		{
+			id: "createdAt",
+			accessorKey: "createdAt",
+			header: ({ column }) => (
+				<TableHead>
+					<Button
+						variant="ghost"
+						onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
+					>
+						{t("tests.table.createdAt")}
+					</Button>
+				</TableHead>
+			),
+		},
+		{
+			id: "assignedUser",
+			accessorKey: "assignedUser",
+			header: ({ column }) => (
+				<TableHead>
+					<Button
+						variant="ghost"
+						onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
+					>
+						{t("tests.table.assignedUser")}
+					</Button>
+				</TableHead>
+			),
+			cell: ({ row }) => {
+				const assignedUser = row.original.assignedUser;
+				if (!assignedUser) {
+					return (
+						<span className="text-muted-foreground text-sm">
+							{t("tests.table.assignedUserEmpty")}
+						</span>
+					);
+				}
+				return (
+					<AssignedUser
+						avatarUrl={assignedUser.image}
+						fullName={assignedUser.name}
+					/>
+				);
+			},
+		},
+	];
 }
 
 export function DataTable({
-  columnHeaders,
-  data,
-  pageCount,
-  currentPage,
+	columnHeaders,
+	data,
+	pageCount,
+	currentPage,
 }: DataTableProps) {
-  const router = useRouter();
-  const clientColumns = getColumns();
-  const columns = clientColumns.map((col) => ({
-    ...col,
-    header: columnHeaders[col.id as keyof typeof columnHeaders],
-    accessorFn: (row: TestType) => row[col.id as keyof TestType],
-  }));
+	const { orgId } = useParams<{ orgId: string }>();
+	const router = useRouter();
+	const clientColumns = getColumns();
+	const columns = clientColumns.map((col) => ({
+		...col,
+		header: columnHeaders[col.id as keyof typeof columnHeaders],
+		accessorFn: (row: TestType) => row[col.id as keyof TestType],
+	}));
 
-  const table = useReactTable({
-    data,
-    columns,
-    getCoreRowModel: getCoreRowModel(),
-    manualPagination: true,
-    pageCount,
-  });
+	const table = useReactTable({
+		data,
+		columns,
+		getCoreRowModel: getCoreRowModel(),
+		manualPagination: true,
+		pageCount,
+	});
 
-  return (
-    <div className="w-full overflow-auto">
-      <Table>
-        <DataTableHeader table={table} />
+	return (
+		<div className="w-full overflow-auto">
+			<Table>
+				<DataTableHeader table={table} />
 
-        <TableBody>
-          {table.getRowModel().rows?.length ? (
-            table.getRowModel().rows.map((row) => (
-              <TableRow
-                key={row.id}
-                data-state={row.getIsSelected() && "selected"}
-                className="cursor-pointer hover:bg-muted/50"
-                onClick={() => {
-                  const test = row.original;
-                  router.push(`/tests/all/${test.id}`);
-                }}
-              >
-                {row.getVisibleCells().map((cell) => (
-                  <TableCell
-                    key={cell.id}
-                    className={cn({
-                      "hidden md:table-cell":
-                        cell.column.id === "severity" ||
-                        cell.column.id === "result" ||
-                        cell.column.id === "title" ||
-                        cell.column.id === "provider" ||
-                        cell.column.id === "createdAt" ||
-                        cell.column.id === "assignedUser",
-                    })}
-                  >
-                    {flexRender(cell.column.columnDef.cell, cell.getContext())}
-                  </TableCell>
-                ))}
-              </TableRow>
-            ))
-          ) : (
-            <TableRow>
-              <TableCell colSpan={columns.length} className="h-24 text-center">
-                No results.
-              </TableCell>
-            </TableRow>
-          )}
-        </TableBody>
-      </Table>
-      <DataTablePagination pageCount={pageCount} currentPage={currentPage} />
-    </div>
-  );
+				<TableBody>
+					{table.getRowModel().rows?.length ? (
+						table.getRowModel().rows.map((row) => (
+							<TableRow
+								key={row.id}
+								data-state={row.getIsSelected() && "selected"}
+								className="cursor-pointer hover:bg-muted/50"
+								onClick={() => {
+									const test = row.original;
+									router.push(`/${orgId}/tests/all/${test.id}`);
+								}}
+							>
+								{row.getVisibleCells().map((cell) => (
+									<TableCell
+										key={cell.id}
+										className={cn({
+											"hidden md:table-cell":
+												cell.column.id === "severity" ||
+												cell.column.id === "result" ||
+												cell.column.id === "title" ||
+												cell.column.id === "provider" ||
+												cell.column.id === "createdAt" ||
+												cell.column.id === "assignedUser",
+										})}
+									>
+										{flexRender(cell.column.columnDef.cell, cell.getContext())}
+									</TableCell>
+								))}
+							</TableRow>
+						))
+					) : (
+						<TableRow>
+							<TableCell colSpan={columns.length} className="h-24 text-center">
+								No results.
+							</TableCell>
+						</TableRow>
+					)}
+				</TableBody>
+			</Table>
+			<DataTablePagination pageCount={pageCount} currentPage={currentPage} />
+		</div>
+	);
 }
diff --git a/apps/app/src/components/tables/tests/filter-toolbar.tsx b/apps/app/src/components/tables/tests/filter-toolbar.tsx
index 086e776a7e..441a932b03 100644
--- a/apps/app/src/components/tables/tests/filter-toolbar.tsx
+++ b/apps/app/src/components/tables/tests/filter-toolbar.tsx
@@ -10,111 +10,112 @@ import { useCallback, useEffect, useState, useTransition } from "react";
 import { useDebounce } from "use-debounce";
 import Link from "next/link";
 
-
-import { refreshTestsAction } from "@/app/[locale]/(app)/(dashboard)/tests/all/actions/refreshTests";
+import { refreshTestsAction } from "@/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/actions/refreshTests";
 import { useAction } from "next-safe-action/hooks";
 import { toast } from "sonner";
 
 interface FilterToolbarProps {
-  isEmpty?: boolean;
+	isEmpty?: boolean;
 }
 
-
 export function FilterToolbar({ isEmpty }: FilterToolbarProps) {
-  const router = useRouter();
-  const pathname = usePathname();
-  const searchParams = useSearchParams();
-  const t = useI18n();
-  const [isPending, startTransition] = useTransition();
-  const [inputValue, setInputValue] = useState(
-    searchParams?.get("search") ?? "",
-  );
-
-  const refreshTests = useAction(refreshTestsAction, {
-    onSuccess: () => {
-      toast.success(t("tests.actions.refresh_success"));
-    },
-    onError: () => {
-      toast.error(t("tests.actions.refresh_error"));
-    },
-  });
-
-  const refreshTestsClick = () => {
-    refreshTests.execute();
-  };
-
-  const createQueryString = useCallback(
-    (params: Record<string, string | null>) => {
-      const newSearchParams = new URLSearchParams(searchParams?.toString());
-
-      for (const [key, value] of Object.entries(params)) {
-        if (value === null) {
-          newSearchParams.delete(key);
-        } else {
-          newSearchParams.set(key, value);
-        }
-      }
-
-      return newSearchParams.toString();
-    },
-    [searchParams],
-  );
-
-  const [debouncedValue] = useDebounce(inputValue, 300);
-
-  useEffect(() => {
-    startTransition(() => {
-      router.push(
-        `${pathname}?${createQueryString({
-          search: debouncedValue || null,
-          page: null,
-        })}`,
-      );
-    });
-  }, [debouncedValue, createQueryString, pathname, router]);
-
-  return (
-    <div className="flex flex-row items-center justify-between gap-2 mb-4">
-      <div className="flex flex-1 items-center gap-2 min-w-0">
-          {!isEmpty && (
-        <div className="relative flex-1 md:max-w-sm">
-            <Search className="absolute left-2 top-2.5 h-4 w-4 text-muted-foreground" />
-          <Input
-          placeholder={t("tests.filters.search")}
-          className="pl-8"
-          value={inputValue}
-          onChange={(e) => setInputValue(e.target.value)}
-          />
-        </div>
-        )}
-
-        <div className="md:hidden">
-          {<Button asChild variant="action" onClick={refreshTestsClick}>
-            {t("tests.actions.refresh")}
-        </Button>}
-        </div>
-      </div>
-
-      <div className="hidden md:flex items-center gap-2">
-        {inputValue && (
-          <Button
-            variant="ghost"
-            size="sm"
-            onClick={() => {
-              setInputValue("");
-              router.push(pathname);
-            }}
-            disabled={isPending}
-          >
-            <X className="h-4 w-4 mr-2" />
-            {t("common.actions.clear")}
-          </Button>
-        )}
-{
-        <Button asChild variant="action" onClick={refreshTestsClick}>
-            {t("tests.actions.refresh")}
-        </Button> }
-      </div>
-    </div>
-  );
+	const router = useRouter();
+	const pathname = usePathname();
+	const searchParams = useSearchParams();
+	const t = useI18n();
+	const [isPending, startTransition] = useTransition();
+	const [inputValue, setInputValue] = useState(
+		searchParams?.get("search") ?? "",
+	);
+
+	const refreshTests = useAction(refreshTestsAction, {
+		onSuccess: () => {
+			toast.success(t("tests.actions.refresh_success"));
+		},
+		onError: () => {
+			toast.error(t("tests.actions.refresh_error"));
+		},
+	});
+
+	const refreshTestsClick = () => {
+		refreshTests.execute();
+	};
+
+	const createQueryString = useCallback(
+		(params: Record<string, string | null>) => {
+			const newSearchParams = new URLSearchParams(searchParams?.toString());
+
+			for (const [key, value] of Object.entries(params)) {
+				if (value === null) {
+					newSearchParams.delete(key);
+				} else {
+					newSearchParams.set(key, value);
+				}
+			}
+
+			return newSearchParams.toString();
+		},
+		[searchParams],
+	);
+
+	const [debouncedValue] = useDebounce(inputValue, 300);
+
+	useEffect(() => {
+		startTransition(() => {
+			router.push(
+				`${pathname}?${createQueryString({
+					search: debouncedValue || null,
+					page: null,
+				})}`,
+			);
+		});
+	}, [debouncedValue, createQueryString, pathname, router]);
+
+	return (
+		<div className="flex flex-row items-center justify-between gap-2 mb-4">
+			<div className="flex flex-1 items-center gap-2 min-w-0">
+				{!isEmpty && (
+					<div className="relative flex-1 md:max-w-sm">
+						<Search className="absolute left-2 top-2.5 h-4 w-4 text-muted-foreground" />
+						<Input
+							placeholder={t("tests.filters.search")}
+							className="pl-8"
+							value={inputValue}
+							onChange={(e) => setInputValue(e.target.value)}
+						/>
+					</div>
+				)}
+
+				<div className="md:hidden">
+					{
+						<Button asChild variant="action" onClick={refreshTestsClick}>
+							{t("tests.actions.refresh")}
+						</Button>
+					}
+				</div>
+			</div>
+
+			<div className="hidden md:flex items-center gap-2">
+				{inputValue && (
+					<Button
+						variant="ghost"
+						size="sm"
+						onClick={() => {
+							setInputValue("");
+							router.push(pathname);
+						}}
+						disabled={isPending}
+					>
+						<X className="h-4 w-4 mr-2" />
+						{t("common.actions.clear")}
+					</Button>
+				)}
+				{
+					<Button asChild variant="action" onClick={refreshTestsClick}>
+						{t("tests.actions.refresh")}
+					</Button>
+				}
+			</div>
+		</div>
+	);
 }
diff --git a/apps/app/src/components/ui/data-table/DataTable.tsx b/apps/app/src/components/ui/data-table/DataTable.tsx
index bc62929b4f..f974afd335 100644
--- a/apps/app/src/components/ui/data-table/DataTable.tsx
+++ b/apps/app/src/components/ui/data-table/DataTable.tsx
@@ -254,7 +254,7 @@ export function DataTable<TData>({
 							{isLoading ? (
 								<TableRow>
 									<TableCell colSpan={columns.length} className="p-0">
-										<DataTableSkeleton columns={columns.length} rows={5} />
+										<DataTableSkeleton columns={columns.length} rows={10} />
 									</TableCell>
 								</TableRow>
 							) : table.getRowModel().rows?.length ? (
diff --git a/apps/app/src/components/ui/data-table/DataTableSkeleton.tsx b/apps/app/src/components/ui/data-table/DataTableSkeleton.tsx
index d17857f0b5..dba69be6d7 100644
--- a/apps/app/src/components/ui/data-table/DataTableSkeleton.tsx
+++ b/apps/app/src/components/ui/data-table/DataTableSkeleton.tsx
@@ -13,35 +13,67 @@ interface DataTableSkeletonProps {
 	columns?: number;
 	rows?: number;
 	className?: string;
+	showFilters?: boolean;
+	showSearch?: boolean;
+	showPagination?: boolean;
 }
 
 export function DataTableSkeleton({
 	columns = 5,
 	rows = 5,
 	className,
+	showFilters = false,
+	showSearch = false,
+	showPagination = false,
 }: DataTableSkeletonProps) {
 	return (
-		<Table className={className}>
-			<TableHeader>
-				<TableRow>
-					{Array.from({ length: columns }).map((_, i) => (
-						<TableHead key={`skeleton-header-${i + 1}`}>
-							<Skeleton className="h-4 w-[200px]" />
-						</TableHead>
-					))}
-				</TableRow>
-			</TableHeader>
-			<TableBody>
-				{Array.from({ length: rows }).map((_, i) => (
-					<TableRow key={`skeleton-row-${i + 1}`} className="h-[54px]">
-						{Array.from({ length: columns }).map((_, j) => (
-							<TableCell key={`skeleton-cell-${i + 1}-${j + 1}`}>
-								<Skeleton className="h-4 w-[150px]" />
-							</TableCell>
+		<div className="space-y-4 w-full">
+			{(showSearch || showFilters) && (
+				<div className="flex flex-col md:flex-row justify-between gap-4 mb-4">
+					{showSearch && (
+						<div className="w-full md:w-[300px]">
+							<Skeleton className="h-10 w-full" />
+						</div>
+					)}
+					{showFilters && (
+						<div className="flex items-center gap-2">
+							<Skeleton className="h-10 w-24" />
+							<Skeleton className="h-10 w-24" />
+							<Skeleton className="h-10 w-24" />
+						</div>
+					)}
+				</div>
+			)}
+
+			<Table className={className}>
+				<TableHeader>
+					<TableRow>
+						{Array.from({ length: columns }).map((_, i) => (
+							<TableHead key={`skeleton-header-${i + 1}`}>
+								<Skeleton className="h-4 w-[200px]" />
+							</TableHead>
 						))}
 					</TableRow>
-				))}
-			</TableBody>
-		</Table>
+				</TableHeader>
+				<TableBody>
+					{Array.from({ length: rows }).map((_, i) => (
+						<TableRow key={`skeleton-row-${i + 1}`} className="h-[54px]">
+							{Array.from({ length: columns }).map((_, j) => (
+								<TableCell key={`skeleton-cell-${i + 1}-${j + 1}`}>
+									<Skeleton className="h-4 w-[150px]" />
+								</TableCell>
+							))}
+						</TableRow>
+					))}
+				</TableBody>
+			</Table>
+
+			{showPagination && (
+				<div className="flex items-center justify-between mt-4">
+					<Skeleton className="h-8 w-[200px]" />
+					<Skeleton className="h-8 w-[120px]" />
+				</div>
+			)}
+		</div>
 	);
 }
diff --git a/apps/app/src/data/getOrganizations.ts b/apps/app/src/data/getOrganizations.ts
new file mode 100644
index 0000000000..7ffb58696f
--- /dev/null
+++ b/apps/app/src/data/getOrganizations.ts
@@ -0,0 +1,28 @@
+import { db } from "@bubba/db";
+import { auth } from "@/auth";
+
+export async function getOrganizations() {
+  const session = await auth();
+  const user = session?.user;
+
+  if (!user) {
+    throw new Error("Not authenticated");
+  }
+
+  const memberOrganizations = await db.organizationMember.findMany({
+    where: {
+      userId: user.id,
+    },
+    include: {
+      organization: true,
+    },
+  });
+
+  const organizations = memberOrganizations.map(
+    (member) => member.organization
+  );
+
+  return {
+    organizations,
+  };
+}
diff --git a/apps/app/src/hooks/use-compliance-scores.ts b/apps/app/src/hooks/use-compliance-scores.ts
index dcdba51e7f..e207de7693 100644
--- a/apps/app/src/hooks/use-compliance-scores.ts
+++ b/apps/app/src/hooks/use-compliance-scores.ts
@@ -1,14 +1,14 @@
 "use client";
 
 import { useMemo } from "react";
-import { usePolicies } from "@/app/[locale]/(app)/(dashboard)/policies/all/(overview)/hooks/usePolicies";
-import { useTests } from "@/app/[locale]/(app)/(dashboard)/tests/all/hooks/useTests";
+import { usePolicies } from "@/app/[locale]/(app)/(dashboard)/[orgId]/policies/all/(overview)/hooks/usePolicies";
+import { useTests } from "@/app/[locale]/(app)/(dashboard)/[orgId]/tests/all/hooks/useTests";
 import type {
   Framework,
   OrganizationControl,
   OrganizationFramework,
 } from "@bubba/db/types";
-import { useOrganizationEvidenceTasks } from "@/app/[locale]/(app)/(dashboard)/evidence/hooks/useEvidenceTasks";
+import { useOrganizationEvidenceTasks } from "@/app/[locale]/(app)/(dashboard)/[orgId]/evidence/hooks/useEvidenceTasks";
 import { usePoliciesByFramework } from "./use-policies-by-framework";
 
 interface UseComplianceScoresProps {
diff --git a/apps/app/src/middleware.ts b/apps/app/src/middleware.ts
index 2459c3854c..773dcfd466 100644
--- a/apps/app/src/middleware.ts
+++ b/apps/app/src/middleware.ts
@@ -1,31 +1,51 @@
 import { createI18nMiddleware } from "next-international/middleware";
 import type { NextRequest } from "next/server";
+import { NextResponse } from "next/server";
 
 const I18nMiddleware = createI18nMiddleware({
-	locales: ["en", "es", "fr", "no", "pt"],
-	defaultLocale: "en",
-	urlMappingStrategy: "rewrite",
+  locales: ["en", "es", "fr", "no", "pt"],
+  defaultLocale: "en",
+  urlMappingStrategy: "rewrite",
 });
 
 export async function middleware(request: NextRequest) {
-	const response = await I18nMiddleware(request);
-	const nextUrl = request.nextUrl;
+  const hasSession = request.cookies.has("authjs.session-token");
 
-	const pathnameLocale = nextUrl.pathname.split("/", 2)?.[1];
+  // If the user is not authenticated, redirect to the auth page.
+  if (!hasSession && request.nextUrl.pathname !== "/auth") {
+    return NextResponse.redirect(new URL("/auth", request.url));
+  }
 
-	const pathnameWithoutLocale = pathnameLocale
-		? nextUrl.pathname.slice(pathnameLocale.length + 1)
-		: nextUrl.pathname;
+  // Only handle root path redirects
+  if (request.nextUrl.pathname === "/") {
+    if (!hasSession) {
+      return NextResponse.redirect(new URL("/auth", request.url));
+    }
 
-	const newUrl = new URL(pathnameWithoutLocale || "/", request.url);
+    // If authenticated, let the page handle the redirection
+    // This way we avoid Prisma in middleware
+    return NextResponse.next();
+  }
 
-	response.headers.set("x-pathname", request.nextUrl.pathname);
+  const response = I18nMiddleware(request);
+  const nextUrl = request.nextUrl;
 
-	return response;
+  const pathnameLocale = nextUrl.pathname.split("/", 2)?.[1];
+
+  const pathnameWithoutLocale = pathnameLocale
+    ? nextUrl.pathname.slice(pathnameLocale.length + 1)
+    : nextUrl.pathname;
+
+  const newUrl = new URL(pathnameWithoutLocale || "/", request.url);
+
+  response.headers.set("x-pathname", request.nextUrl.pathname);
+
+  return response;
 }
 
 export const config = {
-	matcher: [
-		"/((?!api|_next/static|_next/image|favicon.ico|monitoring|ingest).*)",
-	],
+  matcher: [
+    // Skip auth-related routes
+    "/((?!api|_next/static|_next/image|favicon.ico|monitoring|ingest|auth/callback|auth/signin|auth/signout).*)",
+  ],
 };
diff --git a/packages/db/docker-compose.yml b/packages/db/docker-compose.yml
index 90947be543..531f16693e 100644
--- a/packages/db/docker-compose.yml
+++ b/packages/db/docker-compose.yml
@@ -17,8 +17,7 @@ services:
       retries: 5
 
 volumes:
-  postgres_data: 
-
+  postgres_data:
 ########################################################
 # # How to run the database
 ########################################################
@@ -26,6 +25,9 @@ volumes:
 # # Start the database
 # docker-compose up -d
 
+# # If the above command doesn't work, use this instead:
+# docker compose up -d
+
 # # Run migrations
 # bunx prisma migrate dev
 
diff --git a/packages/docs/development.mdx b/packages/docs/development.mdx
index fc3fec155f..4a9e07ce19 100644
--- a/packages/docs/development.mdx
+++ b/packages/docs/development.mdx
@@ -1,11 +1,13 @@
 ---
-title: 'Development'
-description: 'Preview changes locally to update your docs'
+title: "Development"
+description: "Preview changes locally to update your docs"
 ---
 
 <Info>
-  **Prerequisite**: Please install Node.js (version 19 or higher) before proceeding. <br />
-  Please upgrade to ```docs.json``` before proceeding and delete the legacy ```mint.json``` file.
+  **Prerequisite**: Please install Node.js (version 19 or higher) before
+  proceeding. <br />
+  Please upgrade to ```docs.json``` before proceeding and delete the legacy
+  ```mint.json``` file.
 </Info>
 
 Follow these steps to install and run Mintlify on your operating system:
@@ -14,9 +16,9 @@ Follow these steps to install and run Mintlify on your operating system:
 
 <CodeGroup>
 
-  ```bash npm
-  npm i -g mintlify
-  ```
+```bash npm
+npm i -g mintlify
+```
 
 ```bash yarn
 yarn global add mintlify
@@ -43,7 +45,7 @@ mintlify dev --port 3333
 If you attempt to run Mintlify on a port that's already in use, it will use the next available port:
 
 ```md
-Port 3000 is already in use. Trying 3001 instead.
+Port 3000 is already in use. Trying 3002 instead.
 ```
 
 ## Mintlify Versions
@@ -73,14 +75,14 @@ mintlify broken-links
 ## Deployment
 
 <Tip>
-  Unlimited editors available under the [Pro
-  Plan](https://mintlify.com/pricing) and above.
+  Unlimited editors available under the [Pro Plan](https://mintlify.com/pricing)
+  and above.
 </Tip>
 
 If the deployment is successful, you should see the following:
 
 <Frame>
-  <img src="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/images/checks-passed.png" style={{ borderRadius: '0.5rem' }} />
+  <img src="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/images/checks-passed.png" style={{ borderRadius: "0.5rem" }} />
 </Frame>
 
 ## Code Formatting
@@ -96,6 +98,7 @@ We suggest using extensions on your IDE to recognize and format MDX. If you're a
     1. Remove the currently-installed version of mintlify: `npm remove -g mintlify`
     2. Upgrade to Node v19 or higher.
     3. Reinstall mintlify: `npm install -g mintlify`
+
   </Accordion>
 
   <Accordion title="Issue: Encountering an unknown error">
diff --git a/yarn.lock b/yarn.lock
index f8833c6da8..ea2ff66ef8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1041,18 +1041,19 @@
     formdata-node "^4.3.2"
     node-fetch "^2.6.7"
 
-"@bubba/analytics@packages/analytics":
+"@bubba/analytics@^workspace:packages/analytics":
   version "workspace:packages/analytics"
   resolved "workspace:packages/analytics"
   dependencies:
     posthog-js "^1.215.3"
     posthog-node "^4.4.1"
 
-"@bubba/db@packages/db", "@bubba/db@workspace:*":
+"@bubba/db@^workspace:packages/db", "@bubba/db@workspace:*":
   version "workspace:packages/db"
   resolved "workspace:packages/db"
   devDependencies:
     "@bubba/tsconfig" "workspace:*"
+  devDependencies:
     typescript "^5.8.2"
   dependencies:
     "@auth/prisma-adapter" "^2.8.0"
@@ -1062,7 +1063,7 @@
     "@prisma/extension-accelerate" "^1.2.2"
     prisma "^6.5.0"
 
-"@bubba/email@packages/email":
+"@bubba/email@^workspace:packages/email":
   version "workspace:packages/email"
   resolved "workspace:packages/email"
   devDependencies:
@@ -1082,7 +1083,7 @@
     react-email "3.0.4"
     responsive-react-email "^0.0.5"
 
-"@bubba/integrations@packages/integrations":
+"@bubba/integrations@^workspace:packages/integrations":
   version "workspace:packages/integrations"
   resolved "workspace:packages/integrations"
   devDependencies:
@@ -1096,14 +1097,14 @@
     sharp "^0.33.5"
     zod "^3.24.2"
 
-"@bubba/kv@packages/kv":
+"@bubba/kv@^workspace:packages/kv":
   version "workspace:packages/kv"
   resolved "workspace:packages/kv"
   dependencies:
     "@upstash/redis" "^1.34.2"
     server-only "0.0.1"
 
-"@bubba/notifications@packages/notifications", "@bubba/notifications@workspace:*":
+"@bubba/notifications@^workspace:packages/notifications", "@bubba/notifications@workspace:*":
   version "workspace:packages/notifications"
   resolved "workspace:packages/notifications"
   devDependencies:
@@ -1112,11 +1113,11 @@
     "@novu/node" "^2.0.1"
     nanoid "5.1.0"
 
-"@bubba/tsconfig@packages/tsconfig", "@bubba/tsconfig@workspace:*":
+"@bubba/tsconfig@^workspace:packages/tsconfig", "@bubba/tsconfig@workspace:*":
   version "workspace:packages/tsconfig"
   resolved "workspace:packages/tsconfig"
 
-"@bubba/ui@packages/ui", "@bubba/ui@workspace:*":
+"@bubba/ui@^workspace:packages/ui", "@bubba/ui@workspace:*":
   version "workspace:packages/ui"
   resolved "workspace:packages/ui"
   devDependencies:
@@ -1180,7 +1181,7 @@
     use-callback-ref "^1.3.3"
     vaul "^1.0.0"
 
-"@bubba/utils@packages/utils", "@bubba/utils@workspace:*":
+"@bubba/utils@^workspace:packages/utils", "@bubba/utils@workspace:*":
   version "workspace:packages/utils"
   resolved "workspace:packages/utils"
   devDependencies:
@@ -6335,7 +6336,7 @@ commander@11.1.0:
   resolved "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz"
   integrity sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==
 
-"comp.ai@apps/app":
+comp.ai@^workspace:apps/app:
   version "workspace:apps/app"
   resolved "workspace:apps/app"
   devDependencies:
@@ -10892,12 +10893,13 @@ plist@^3.1.0:
     base64-js "^1.5.1"
     xmlbuilder "^15.1.1"
 
-"portal@apps/portal":
+portal@^workspace:apps/portal:
   version "workspace:apps/portal"
   resolved "workspace:apps/portal"
   devDependencies:
     "@bubba/db" "workspace:*"
     "@bubba/ui" "workspace:*"
+  devDependencies:
     "@types/node" "^22.13.2"
     "@types/react" "^19.0.8"
     "@types/react-dom" "^19.0.3"
@@ -13453,7 +13455,7 @@ uuid@^11.1.0:
   resolved "https://registry.npmjs.org/uuid/-/uuid-11.1.0.tgz"
   integrity sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==
 
-"valibot@1.0.0-beta.15", "valibot@>= 0.36.0":
+"valibot@1.0.0-beta.15", "valibot@>= 0.36.0", "valibot@^1.0.0-beta.7 || ^1.0.0":
   version "1.0.0-beta.15"
   resolved "https://registry.npmjs.org/valibot/-/valibot-1.0.0-beta.15.tgz"
   integrity sha512-BKy8XosZkDHWmYC+cJG74LBzP++Gfntwi33pP3D3RKztz2XV9jmFWnkOi21GoqARP8wAWARwhV6eTr1JcWzjGw==
@@ -13880,7 +13882,7 @@ zod@3.23.8:
   resolved "https://registry.npmjs.org/zod/-/zod-3.23.8.tgz"
   integrity sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==
 
-"zod@>= 3", zod@^3.0.0, zod@^3.18.0, zod@^3.20.2, zod@^3.24.1, zod@^3.24.2:
+"zod@>= 3", zod@^3.0.0, zod@^3.18.0, zod@^3.20.2, zod@^3.24.0, zod@^3.24.1, zod@^3.24.2:
   version "3.24.2"
   resolved "https://registry.npmjs.org/zod/-/zod-3.24.2.tgz"
   integrity sha512-lY7CDW43ECgW9u1TcT3IoXHflywfVqDYze4waEz812jR/bZ8FHDsl7pFQoSZTz5N+2NqRXs8GBwnAwo3ZNxqhQ==