diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/[employeeId]/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/[employeeId]/page.tsx
index 283bc78a61..12054f453a 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/[employeeId]/page.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/[employeeId]/page.tsx
@@ -34,6 +34,6 @@ export async function generateMetadata({
   const t = await getI18n();
 
   return {
-    title: t("people.employee_details"),
+    title: t("people.details.title"),
   };
 }
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
index 22f82df83b..ede811316c 100644
--- 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
@@ -25,6 +25,6 @@ export async function generateMetadata({
 	const t = await getI18n();
 
 	return {
-		title: t("policies.policy_details"),
+		title: t("policies.dashboard.sub_pages.edit_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
index 0f0b740df0..2bec9de335 100644
--- 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
@@ -40,7 +40,7 @@ export async function generateMetadata({
 	const t = await getI18n();
 
 	return {
-		title: t("policies.policy_details"),
+		title: t("policies.overview.title"),
 	};
 }
 
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/[riskId]/comments/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/[riskId]/comments/page.tsx
index 844b73b236..3c2a124060 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/[riskId]/comments/page.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/[riskId]/comments/page.tsx
@@ -74,6 +74,6 @@ export async function generateMetadata({
 	const t = await getI18n();
 
 	return {
-		title: t("risk.risk_comments"),
+		title: t("risk.comments"),
 	};
 }
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/register/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/register/page.tsx
index 56fee7d27f..5b814a65a7 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/register/page.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/register/page.tsx
@@ -17,6 +17,6 @@ export async function generateMetadata({
 	const t = await getI18n();
 
 	return {
-		title: t("risk.register"),
+		title: t("risk.register.title"),
 	};
 }
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/settings/members/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/settings/members/page.tsx
index ce5cfe33b6..9da4cc0cd5 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/settings/members/page.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/settings/members/page.tsx
@@ -28,6 +28,6 @@ export async function generateMetadata({
   const t = await getI18n();
 
   return {
-    title: t("settings.members"),
+    title: t("settings.team.members.title"),
   };
 }
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/page.tsx
index 53da904752..896a10e3cb 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/page.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/page.tsx
@@ -143,7 +143,7 @@ export default async function VendorPage({ searchParams, params }: PageProps) {
         <CardHeader>
           <CardTitle>
             <div className="flex items-center justify-between gap-2">
-              {t("vendor.tasks.title")}
+              {t("vendors.tasks.title")}
             </div>
           </CardTitle>
         </CardHeader>
@@ -182,6 +182,6 @@ export async function generateMetadata({
   const t = await getI18n();
 
   return {
-    title: t("vendors.vendor_overview"),
+    title: t("vendors.title"),
   };
 }
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/task/update-task-overview-form.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/task/update-task-overview-form.tsx
index d0b01477a7..74f8d81690 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/task/update-task-overview-form.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/task/update-task-overview-form.tsx
@@ -33,11 +33,11 @@ export function UpdateTaskOverviewForm({
 
   const updateTask = useAction(updateTaskAction, {
     onSuccess: () => {
-      toast.success(t("risk.form.update_risk_success"));
+      toast.success(t("risk.tasks.form.update_success"));
       setOpen(null);
     },
     onError: () => {
-      toast.error(t("risk.form.update_risk_error"));
+      toast.error(t("risk.tasks.form.update_error"));
     },
   });
 
@@ -92,7 +92,7 @@ export function UpdateTaskOverviewForm({
             name="description"
             render={({ field }) => (
               <FormItem>
-                <FormLabel>Description</FormLabel>
+                <FormLabel>{t("risk.tasks.form.description")}</FormLabel>
                 <FormControl>
                   <Textarea
                     {...field}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/update-risk-form.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/update-risk-form.tsx
index 5df1ff615f..18b6311b8b 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/update-risk-form.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/update-risk-form.tsx
@@ -94,7 +94,7 @@ export function UpdateRiskForm({
             name="description"
             render={({ field }) => (
               <FormItem>
-                <FormLabel>Description</FormLabel>
+                <FormLabel>{t("risk.form.risk_description")}</FormLabel>
                 <FormControl>
                   <Textarea
                     {...field}
diff --git a/apps/app/src/components/forms/policies/policy-overview.tsx b/apps/app/src/components/forms/policies/policy-overview.tsx
index 3dbf9207a6..31f9dd2f0f 100644
--- a/apps/app/src/components/forms/policies/policy-overview.tsx
+++ b/apps/app/src/components/forms/policies/policy-overview.tsx
@@ -144,12 +144,12 @@ export function UpdatePolicyOverview({
 						name="status"
 						render={({ field }) => (
 							<FormItem>
-								<FormLabel>{t("risk.form.risk_status")}</FormLabel>
+								<FormLabel>{t("policies.overview.form.status")}</FormLabel>
 								<FormControl>
 									<Select value={field.value} onValueChange={field.onChange}>
 										<SelectTrigger>
 											<SelectValue
-												placeholder={t("risk.form.risk_status_placeholder")}
+												placeholder={t("policies.overview.form.status_placeholder")}
 											>
 												{field.value && (
 													<StatusPolicies status={field.value as StatusType} />
diff --git a/apps/app/src/components/forms/policies/update-policy-form.tsx b/apps/app/src/components/forms/policies/update-policy-form.tsx
index 3839a4d9b2..ac42cdb01a 100644
--- a/apps/app/src/components/forms/policies/update-policy-form.tsx
+++ b/apps/app/src/components/forms/policies/update-policy-form.tsx
@@ -104,7 +104,7 @@ export function UpdatePolicyForm({
                   <Textarea
                     {...field}
                     className="mt-3 min-h-[80px]"
-                    placeholder={t("risk.form.risk_description_description")}
+                    placeholder={t("policies.overview.form.description_placeholder")}
                   />
                 </FormControl>
                 <FormMessage />
diff --git a/apps/app/src/locales/core/common.ts b/apps/app/src/locales/core/common.ts
index 2b651ad7d5..6cdbaad920 100644
--- a/apps/app/src/locales/core/common.ts
+++ b/apps/app/src/locales/core/common.ts
@@ -130,6 +130,7 @@ export const common = {
     toasts: {
       error: "Something went wrong, please try again.",
       error_uploading_files: "Cannot upload more than 1 file at a time",
+      error_uploading_files_multiple: "Cannot upload more files than the maximum allowed",
       error_no_files_selected: "No files selected",
       error_file_rejected: "File {file} was rejected",
       error_failed_to_upload_files: "Failed to upload files",
diff --git a/apps/app/src/locales/features/people.ts b/apps/app/src/locales/features/people.ts
index 4c09a24fb2..bc2acb081e 100644
--- a/apps/app/src/locales/features/people.ts
+++ b/apps/app/src/locales/features/people.ts
@@ -1,6 +1,7 @@
 export const people = {
   title: "People",
   details: {
+    title: "Employee Details",
     tasks: "Tasks",
   },
   description: "Manage your team members and their roles.",
diff --git a/apps/app/src/locales/features/policies.ts b/apps/app/src/locales/features/policies.ts
index 65310a9583..788d0f6484 100644
--- a/apps/app/src/locales/features/policies.ts
+++ b/apps/app/src/locales/features/policies.ts
@@ -18,6 +18,10 @@ export const policies = {
       update_policy_success: "Policy updated successfully",
       update_policy_error: "Failed to update policy",
       update_policy_title: "Policy Name",
+      status: "Status",
+      status_placeholder: "Select status",
+      description: "Description",
+      description_placeholder: "Enter policy description",
       review_frequency: "Review Frequency",
       review_frequency_placeholder: "Select a review frequency",
       review_date: "Review Date",
diff --git a/apps/app/src/locales/features/risk.ts b/apps/app/src/locales/features/risk.ts
index 92a43ff921..61b1abe1cf 100644
--- a/apps/app/src/locales/features/risk.ts
+++ b/apps/app/src/locales/features/risk.ts
@@ -2,6 +2,64 @@ export const risk = {
   risks: "risks",
   overview: "Overview",
   create: "Create New Risk",
+  comments: "Risk Comments",
+  risk_overview: "Risk Overview",
+  form: {
+    update_inherent_risk_success: "Inherent risk updated successfully",
+    update_inherent_risk_error: "Failed to update inherent risk",
+    update_residual_risk_success: "Residual risk updated successfully",
+    update_residual_risk_error: "Failed to update residual risk",
+    update_risk_success: "Risk updated successfully",
+    update_risk_error: "Failed to update risk",
+    create_risk_success: "Risk created successfully",
+    create_risk_error: "Failed to create risk",
+    risk_title: "Risk Title",
+    risk_title_description: "Enter risk title",
+    risk_details: "Risk Details",
+    risk_category: "Category",
+    risk_category_placeholder: "Select risk category",
+    risk_description: "Description",
+    risk_description_description: "Enter risk description",
+    risk_status: "Status",
+    risk_status_placeholder: "Select status"
+  },
+  register: {
+    title: "Risk Register",
+    table: {
+      risk: "Risk"
+    },
+    empty: {
+      create_risk: "Create Risk"
+    }
+  },
+  dashboard: {
+    title: "Risk Dashboard",
+    by_department: "Risks by Department",
+    status: "Risks by Status",
+    risks_by_assignee: "Risks by Assignee"
+  },
+  metrics: {
+    probability: "Probability",
+    impact: "Impact"
+  },
+  tasks: {
+    title: "Tasks",
+    task_overview: "Task Overview",
+    form: {
+      title: "Task Details",
+      task_title: "Task Title",
+      task_title_description: "Enter task title",
+      description: "Description",
+      description_description: "Enter task description",
+      due_date: "Due Date",
+      success: "Task created successfully",
+      error: "Failed to create task",
+      update_success: "Task updated successfully",
+      update_error: "Failed to update task",
+      status: "Status",
+      status_placeholder: "Select status"
+    }
+  },
   vendor: {
     title: "Vendor Management",
     dashboard: {
diff --git a/apps/app/src/locales/features/tests.ts b/apps/app/src/locales/features/tests.ts
index 5a2e5ab54a..ea671ae51c 100644
--- a/apps/app/src/locales/features/tests.ts
+++ b/apps/app/src/locales/features/tests.ts
@@ -7,6 +7,7 @@ export const tests = {
     failed: "Failed",
     severity_distribution: "Test Severity Distribution",
   },
+  test_details: "Test Details",
   severity: {
     info: "Info",
     low: "Low",
diff --git a/apps/app/src/locales/features/vendors.ts b/apps/app/src/locales/features/vendors.ts
index d1906583c4..59b371ebe8 100644
--- a/apps/app/src/locales/features/vendors.ts
+++ b/apps/app/src/locales/features/vendors.ts
@@ -10,6 +10,7 @@ export const vendors = {
     create_new: "Create Vendor",
   },
   create: "Create Vendor",
+  vendor_comments: "Vendor Comments",
   form: {
     vendor_details: "Vendor Details",
     vendor_name: "Name",
diff --git a/apps/app/src/locales/settings/settings.ts b/apps/app/src/locales/settings/settings.ts
index dcdd949261..e3faf647ca 100644
--- a/apps/app/src/locales/settings/settings.ts
+++ b/apps/app/src/locales/settings/settings.ts
@@ -17,6 +17,7 @@ export const settings = {
     org_delete_alert_title: "Are you absolutely sure?",
     org_delete_alert_description:
       "This action cannot be undone. This will permanently delete your organization and remove your data from our servers.",
+    delete_confirm_tip: "Type 'delete' to confirm",
     org_delete_error: "Error deleting organization",
     org_delete_success: "Organization deleted",
     org_name_updated: "Organization name updated",
@@ -136,6 +137,10 @@ export const settings = {
       title: "Invite Team Member",
       description:
         "Send an invitation to a new team member to join your organization",
+      error: {
+        title: "Invitation Error",
+        description: "There was an error processing your invitation."
+      },
       form: {
         email: {
           label: "Email",