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
index b4b9a2a863..9a78b8b01d 100644
--- 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
@@ -13,105 +13,105 @@ import { getRisks } from "./data/getRisks";
 import { RisksTable } from "./RisksTable";
 
 export default async function RiskRegisterPage({
-	params,
+  params,
 }: {
-	params: Promise<{
-		locale: string;
-		search: string;
-		page: number;
-		pageSize: number;
-		status: RiskStatus | null;
-		department: Departments | null;
-		assigneeId: string | null;
-	}>;
+  params: Promise<{
+    locale: string;
+    search: string;
+    page: number;
+    pageSize: number;
+    status: RiskStatus | null;
+    department: Departments | null;
+    assigneeId: string | null;
+  }>;
 }) {
-	const { locale, search, page, pageSize, status, department, assigneeId } =
-		await params;
+  const { locale, search, page, pageSize, status, department, assigneeId } =
+    await params;
 
-	setStaticParamsLocale(locale);
-	const t = await getI18n();
+  setStaticParamsLocale(locale);
+  const t = await getI18n();
 
-	const risks = await getRisks({
-		search: search || "",
-		page: page || 1,
-		pageSize: pageSize || 10,
-		status: status || null,
-		department: department || null,
-		assigneeId: assigneeId || null,
-	});
+  const risks = await getRisks({
+    search: search || "",
+    page: page || 1,
+    pageSize: pageSize || 10,
+    status: status || null,
+    department: department || null,
+    assigneeId: assigneeId || null,
+  });
 
-	const assignees = await getAssignees();
+  const assignees = await getAssignees();
 
-	if (risks.risks?.length === 0) {
-		return (
-			<>
-				<AppOnboarding
-					title={t("app_onboarding.risk_management.title")}
-					description={t("app_onboarding.risk_management.description")}
-					cta={t("app_onboarding.risk_management.cta")}
-					imageSrc="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/onboarding/risk-management.webp"
-					imageAlt="Risk Management"
-					sheetName="create-risk-sheet"
-					faqs={[
-						{
-							questionKey: t("app_onboarding.risk_management.faqs.question_1"),
-							answerKey: t("app_onboarding.risk_management.faqs.answer_1"),
-						},
-						{
-							questionKey: t("app_onboarding.risk_management.faqs.question_2"),
-							answerKey: t("app_onboarding.risk_management.faqs.answer_2"),
-						},
-						{
-							questionKey: t("app_onboarding.risk_management.faqs.question_3"),
-							answerKey: t("app_onboarding.risk_management.faqs.answer_3"),
-						},
-					]}
-				/>
-				<CreateRiskSheet assignees={assignees} />
-			</>
-		);
-	}
+  if (risks.risks?.length === 0) {
+    return (
+      <>
+        <AppOnboarding
+          title={t("app_onboarding.risk_management.title")}
+          description={t("app_onboarding.risk_management.description")}
+          cta={t("app_onboarding.risk_management.cta")}
+          imageSrc="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/onboarding/risk-management.webp"
+          imageAlt="Risk Management"
+          sheetName="create-risk-sheet"
+          faqs={[
+            {
+              questionKey: t("app_onboarding.risk_management.faqs.question_1"),
+              answerKey: t("app_onboarding.risk_management.faqs.answer_1"),
+            },
+            {
+              questionKey: t("app_onboarding.risk_management.faqs.question_2"),
+              answerKey: t("app_onboarding.risk_management.faqs.answer_2"),
+            },
+            {
+              questionKey: t("app_onboarding.risk_management.faqs.question_3"),
+              answerKey: t("app_onboarding.risk_management.faqs.answer_3"),
+            },
+          ]}
+        />
+        <CreateRiskSheet assignees={assignees} />
+      </>
+    );
+  }
 
-	return (
-		<PageWithBreadcrumb breadcrumbs={[{ label: "Risk", current: true }]}>
-			<RisksTable risks={risks?.risks || []} assignees={assignees} />
-		</PageWithBreadcrumb>
-	);
+  return (
+    <>
+      <RisksTable risks={risks?.risks || []} assignees={assignees} />
+    </>
+  );
 }
 
 export async function generateMetadata({
-	params,
+  params,
 }: {
-	params: Promise<{ locale: string }>;
+  params: Promise<{ locale: string }>;
 }): Promise<Metadata> {
-	const { locale } = await params;
-	setStaticParamsLocale(locale);
-	const t = await getI18n();
+  const { locale } = await params;
+  setStaticParamsLocale(locale);
+  const t = await getI18n();
 
-	return {
-		title: t("risk.register.title"),
-	};
+  return {
+    title: t("risk.register.title"),
+  };
 }
 
 const getAssignees = cache(async () => {
-	const session = await auth.api.getSession({
-		headers: await headers(),
-	});
+  const session = await auth.api.getSession({
+    headers: await headers(),
+  });
 
-	if (!session || !session.session.activeOrganizationId) {
-		return [];
-	}
+  if (!session || !session.session.activeOrganizationId) {
+    return [];
+  }
 
-	return await db.member.findMany({
-		where: {
-			organizationId: session.session.activeOrganizationId,
-			isActive: true,
-			role: {
-				notIn: ["employee"],
-			},
-		},
-		include: {
-			user: true,
-		},
-	});
+  return await db.member.findMany({
+    where: {
+      organizationId: session.session.activeOrganizationId,
+      isActive: true,
+      role: {
+        notIn: ["employee"],
+      },
+    },
+    include: {
+      user: true,
+    },
+  });
 });
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/layout.tsx
index f7906940e3..c5319cca82 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/layout.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/layout.tsx
@@ -1,11 +1,36 @@
+import { SecondaryMenu } from "@comp/ui/secondary-menu";
+import { auth } from "@/utils/auth";
+import { headers } from "next/headers";
+import { Suspense } from "react";
+import { getI18n } from "@/locales/server";
+
 export default async function Layout({
-	children,
+  children,
 }: {
-	children: React.ReactNode;
+  children: React.ReactNode;
 }) {
-	return (
-		<div className="max-w-[1200px] m-auto">
-			<main className="mt-8">{children}</main>
-		</div>
-	);
+  const t = await getI18n();
+
+  const session = await auth.api.getSession({
+    headers: await headers(),
+  });
+
+  const orgId = session?.session.activeOrganizationId;
+
+  return (
+    <div className="max-w-[1200px] m-auto">
+      <Suspense>
+        <SecondaryMenu
+          items={[
+            {
+              path: `/${orgId}/risk`,
+              label: t("risk.dashboard.title"),
+            },
+          ]}
+        />
+
+        <main className="mt-8">{children}</main>
+      </Suspense>
+    </div>
+  );
 }
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/layout.tsx
index f7906940e3..891563272f 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/layout.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/layout.tsx
@@ -1,11 +1,33 @@
+import { SecondaryMenu } from "@comp/ui/secondary-menu";
+import { auth } from "@/utils/auth";
+import { headers } from "next/headers";
+import { Suspense } from "react";
+import { getI18n } from "@/locales/server";
+
 export default async function Layout({
-	children,
+  children,
 }: {
-	children: React.ReactNode;
+  children: React.ReactNode;
 }) {
-	return (
-		<div className="max-w-[1200px] m-auto">
-			<main className="mt-8">{children}</main>
-		</div>
-	);
+  const t = await getI18n();
+
+  const session = await auth.api.getSession({
+    headers: await headers(),
+  });
+
+  const orgId = session?.session.activeOrganizationId;
+
+  return (
+    <div className="max-w-[1200px] m-auto">
+      <Suspense>
+        <SecondaryMenu
+          items={[
+            { path: `/${orgId}/vendors`, label: t("vendors.dashboard.title") },
+          ]}
+        />
+
+        <main className="mt-8">{children}</main>
+      </Suspense>
+    </div>
+  );
 }