diff --git a/src/pages/email/administration/mailboxes/index.js b/src/pages/email/administration/mailboxes/index.js
index 8ef21abfa990..b03919b9d752 100644
--- a/src/pages/email/administration/mailboxes/index.js
+++ b/src/pages/email/administration/mailboxes/index.js
@@ -83,6 +83,29 @@ const Page = () => {
     actions: actions,
   };
 
+  const filterList = [
+    {
+      filterName: "View User Mailboxes",
+      value: [{ id: "recipientTypeDetails", value: "UserMailbox" }],
+      type: "column",
+    },
+    {
+      filterName: "View Shared Mailboxes",
+      value: [{ id: "recipientTypeDetails", value: "SharedMailbox" }],
+      type: "column",
+    },
+    {
+      filterName: "View Room Mailboxes",
+      value: [{ id: "recipientTypeDetails", value: "RoomMailbox" }],
+      type: "column",
+    },
+    {
+      filterName: "View Equipment Mailboxes",
+      value: [{ id: "recipientTypeDetails", value: "EquipmentMailbox" }],
+      type: "column",
+    },
+  ];
+
   // Simplified columns for the table
   const simpleColumns = [
     "UPN", // User Principal Name
@@ -100,6 +123,7 @@ const Page = () => {
       actions={actions}
       offCanvas={offCanvas}
       simpleColumns={simpleColumns}
+      filters={filterList}
       cardButton={
         <>
           <Button component={Link} href="/email/administration/mailboxes/addshared">
diff --git a/src/pages/email/administration/quarantine/index.js b/src/pages/email/administration/quarantine/index.js
index eb24a4f73ccb..e784d8888a0e 100644
--- a/src/pages/email/administration/quarantine/index.js
+++ b/src/pages/email/administration/quarantine/index.js
@@ -133,6 +133,19 @@ const Page = () => {
     actions: actions,
   };
 
+  const filterList = [
+    {
+      filterName: "Not Released",
+      value: [{ id: "ReleaseStatus", value: "NOTRELEASED" }],
+      type: "column",
+    },
+    {
+      filterName: "Released",
+      value: [{ id: "ReleaseStatus", value: "RELEASED" }],
+      type: "column",
+    },
+  ];
+
   return (
     <>
       <CippTablePage
@@ -141,6 +154,7 @@ const Page = () => {
         actions={actions}
         offCanvas={offCanvas}
         simpleColumns={simpleColumns}
+        filters={filterList}
       />
       <Dialog open={dialogOpen} onClose={() => setDialogOpen(false)} maxWidth="lg" fullWidth>
         <DialogTitle sx={{ py: 2 }}>
diff --git a/src/pages/endpoint/applications/list/add.jsx b/src/pages/endpoint/applications/list/add.jsx
index ca226d78cc26..7bceb2e69857 100644
--- a/src/pages/endpoint/applications/list/add.jsx
+++ b/src/pages/endpoint/applications/list/add.jsx
@@ -86,6 +86,7 @@ const ApplicationDeploymentForm = () => {
         const formattedData = { ...data };
         formattedData.selectedTenants = selectedTenants.map((tenant) => ({
           defaultDomainName: tenant.value,
+          customerId: tenant.addedFields.customerId,
         }));
         return formattedData;
       }}
@@ -174,11 +175,12 @@ const ApplicationDeploymentForm = () => {
               />
             </Grid>
             {selectedTenants?.map((tenant, index) => (
-              <Grid item xs={12} md={6} key={tenant.value || index}>
+              <Grid item xs={12} md={6} key={tenant.addedFields.customerId || index}>
+                {console.log(tenant)}
                 <CippFormComponent
                   type="textField"
                   label={`Datto ID for ${tenant.label}`}
-                  name={`params.dattoGuid.${tenant.value}`}
+                  name={`params.dattoGuid.${tenant.addedFields.customerId}`}
                   formControl={formControl}
                   validators={{ required: `Datto ID for ${tenant.label} is required` }}
                 />
@@ -194,11 +196,11 @@ const ApplicationDeploymentForm = () => {
             compareValue="syncro"
           >
             {selectedTenants?.map((tenant, index) => (
-              <Grid item xs={12} md={6} key={tenant.value || index}>
+              <Grid item xs={12} md={6} key={tenant.addedFields.customerId || index}>
                 <CippFormComponent
                   type="textField"
                   label={`Client URL for ${tenant.label}`}
-                  name={`params.ClientURL.${tenant.value}`}
+                  name={`params.ClientURL.${tenant.addedFields.customerId}`}
                   formControl={formControl}
                   validators={{ required: `Client URL for ${tenant.label} is required` }}
                 />
@@ -215,11 +217,11 @@ const ApplicationDeploymentForm = () => {
             compareValue="immy"
           >
             {selectedTenants?.map((tenant, index) => (
-              <Grid item xs={12} md={6} key={tenant.value || index}>
+              <Grid item xs={12} md={6} key={tenant.addedFields.customerId || index}>
                 <CippFormComponent
                   type="textField"
                   label={`Client URL for ${tenant.label}`}
-                  name={`params.ClientURL.${tenant.value}`}
+                  name={`params.ClientURL.${tenant.addedFields.customerId}`}
                   formControl={formControl}
                   validators={{ required: `Client URL for ${tenant.label} is required` }}
                 />
@@ -244,11 +246,11 @@ const ApplicationDeploymentForm = () => {
               />
             </Grid>
             {selectedTenants?.map((tenant, index) => (
-              <Grid item xs={12} md={6} key={tenant.value || index}>
+              <Grid item xs={12} md={6} key={tenant.addedFields.customerId || index}>
                 <CippFormComponent
                   type="textField"
                   label={`Organization Key for ${tenant.label}`}
-                  name={`params.Orgkey.${tenant.value}`}
+                  name={`params.Orgkey.${tenant.addedFields.customerId}`}
                   formControl={formControl}
                   validators={{ required: `Organization Key for ${tenant.label} is required` }}
                 />
@@ -273,22 +275,22 @@ const ApplicationDeploymentForm = () => {
               />
             </Grid>
             {selectedTenants?.map((tenant, index) => (
-              <Grid item xs={12} md={6} key={tenant.value || index}>
+              <Grid item xs={12} md={6} key={tenant.addedFields.customerId || index}>
                 <CippFormComponent
                   type="textField"
                   label={`Installer Token for ${tenant.label}`}
-                  name={`params.InstallerToken.${tenant.value}`}
+                  name={`params.InstallerToken.${tenant.addedFields.customerId}`}
                   formControl={formControl}
                   validators={{ required: `Installer Token for ${tenant.label} is required` }}
                 />
               </Grid>
             ))}
             {selectedTenants?.map((tenant, index) => (
-              <Grid item xs={12} md={6} key={`${tenant.value}_location_${index}`}>
+              <Grid item xs={12} md={6} key={`${tenant.addedFields.customerId}_location_${index}`}>
                 <CippFormComponent
                   type="textField"
                   label={`Location ID for ${tenant.label}`}
-                  name={`params.LocationID.${tenant.value}`}
+                  name={`params.LocationID.${tenant.addedFields.customerId}`}
                   formControl={formControl}
                   validators={{ required: `Location ID for ${tenant.label} is required` }}
                 />
@@ -304,11 +306,11 @@ const ApplicationDeploymentForm = () => {
             compareValue="cwcommand"
           >
             {selectedTenants?.map((tenant, index) => (
-              <Grid item xs={12} md={6} key={tenant.value || index}>
+              <Grid item xs={12} md={6} key={tenant.addedFields.customerId || index}>
                 <CippFormComponent
                   type="textField"
                   label={`Client URL for ${tenant.label}`}
-                  name={`params.ClientURL.${tenant.value}`}
+                  name={`params.ClientURL.${tenant.addedFields.customerId}`}
                   formControl={formControl}
                   validators={{ required: `Client URL for ${tenant.label} is required` }}
                 />
diff --git a/src/pages/endpoint/reports/analyticsdevicescore/index.js b/src/pages/endpoint/reports/analyticsdevicescore/index.js
index 563f2168b1ff..16702d203621 100644
--- a/src/pages/endpoint/reports/analyticsdevicescore/index.js
+++ b/src/pages/endpoint/reports/analyticsdevicescore/index.js
@@ -1,23 +1,23 @@
 import { EyeIcon } from "@heroicons/react/24/outline";
 import { Layout as DashboardLayout } from "/src/layouts/index.js";
 import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx";
+import { useSettings } from "/src/hooks/use-settings";
 
 const Page = () => {
   const pageTitle = "Analytics Device Score Report";
+  const tenantFilter = useSettings().currentTenant;
 
   // Actions from the source file
   const actions = [
-    /* TODO: Add direct link to InTune Device
     {
-      label: "View Device",
-      type: "LINK",
-      link: "https://intune.microsoft.com/[tenant]/#view/Microsoft_Intune_Devices/DeviceSettingsMenuBlade/~/overview/mdmDeviceId/[id]",
-      linkParams: {
-        tenant: "TenantFilter",
-        id: "id",
-      },
+      label: "View in InTune",
+      link: `https://intune.microsoft.com/${tenantFilter}/#view/Microsoft_Intune_Devices/DeviceSettingsMenuBlade/~/overview/mdmDeviceId/[id]`,
+      color: "info",
       icon: <EyeIcon />,
-    },*/
+      target: "_blank",
+      multiPost: false,
+      external: true,
+    },
   ];
 
   // OffCanvas details based on the source file
diff --git a/src/pages/endpoint/reports/devices/index.js b/src/pages/endpoint/reports/devices/index.js
index 4bce06237a4c..4ce9ebcbc46a 100644
--- a/src/pages/endpoint/reports/devices/index.js
+++ b/src/pages/endpoint/reports/devices/index.js
@@ -1,8 +1,11 @@
 import { Layout as DashboardLayout } from "/src/layouts/index.js";
 import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx";
+import { useSettings } from "/src/hooks/use-settings";
+import { EyeIcon } from "@heroicons/react/24/outline";
 
 const Page = () => {
   const pageTitle = "Devices";
+  const tenantFilter = useSettings().currentTenant;
 
   const actions = [
     {
@@ -96,6 +99,15 @@ const Page = () => {
       confirmText:
         "Are you sure you want to update the Windows Defender signatures for this device?",
     },
+    {
+      label: "View in InTune",
+      link: `https://intune.microsoft.com/${tenantFilter}/#view/Microsoft_Intune_Devices/DeviceSettingsMenuBlade/~/overview/mdmDeviceId/[id]`,
+      color: "info",
+      icon: <EyeIcon />,
+      target: "_blank",
+      multiPost: false,
+      external: true,
+    },
   ];
 
   const offCanvas = {
diff --git a/src/pages/identity/administration/devices/index.js b/src/pages/identity/administration/devices/index.js
index d58914fdcbec..456329c33755 100644
--- a/src/pages/identity/administration/devices/index.js
+++ b/src/pages/identity/administration/devices/index.js
@@ -1,9 +1,22 @@
 import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx";
 import { Layout as DashboardLayout } from "/src/layouts/index.js"; // had to add an extra path here because I added an extra folder structure. We should switch to absolute pathing so we dont have to deal with relative.
+import { useSettings } from "/src/hooks/use-settings";
+import { EyeIcon } from "@heroicons/react/24/outline";
 
 const Page = () => {
   const pageTitle = "Devices";
+  const tenantFilter = useSettings().currentTenant;
+
   const actions = [
+    {
+      label: "View in Entra",
+      link: `https://entra.microsoft.com/${tenantFilter}/#view/Microsoft_AAD_Devices/DeviceDetailsMenuBlade/~/Properties/objectId/[id]/deviceId/`,
+      color: "info",
+      icon: <EyeIcon />,
+      target: "_blank",
+      multiPost: false,
+      external: true,
+    },
     {
       label: "Enable Device",
       type: "POST",
diff --git a/src/pages/identity/administration/risky-users/index.js b/src/pages/identity/administration/risky-users/index.js
index b419366b0d83..759117480d8b 100644
--- a/src/pages/identity/administration/risky-users/index.js
+++ b/src/pages/identity/administration/risky-users/index.js
@@ -6,7 +6,6 @@ import { MagnifyingGlassIcon } from "@heroicons/react/24/outline";
 const Page = () => {
   const pageTitle = "Risky Users";
 
-  // Actions from the source file
   const actions = [
     {
       label: "Dismiss Risk",
@@ -27,20 +26,46 @@ const Page = () => {
     },
   ];
 
-  // OffCanvas details based on the source file
   const offCanvas = {
     extendedInfoFields: [
-      "id", // User ID
-      "userDisplayName", // Display Name
-      "userPrincipalName", // User Principal
-      "riskLastUpdatedDateTime", // Risk Last Updated
-      "riskLevel", // Risk Level
-      "riskState", // Risk State
-      "riskDetail", // Risk Detail
+      "id",
+      "userDisplayName",
+      "userPrincipalName",
+      "riskLastUpdatedDateTime",
+      "riskLevel",
+      "riskState",
+      "riskDetail",
     ],
     actions: actions,
   };
 
+  const simpleColumns = [
+    "userDisplayName",
+    "userPrincipalName",
+    "riskLevel",
+    "riskState",
+    "riskDetail",
+    "riskLastUpdatedDateTime",
+  ];
+
+  const filterList = [
+    {
+      filterName: "Users at Risk",
+      value: [{ id: "riskState", value: "atRisk" }],
+      type: "column",
+    },
+    {
+      filterName: "Dismissed Users",
+      value: [{ id: "riskState", value: "dismissed" }],
+      type: "column",
+    },
+    {
+      filterName: "Remediated Users",
+      value: [{ id: "riskState", value: "remediated" }],
+      type: "column",
+    },
+  ];
+
   return (
     <CippTablePage
       title={pageTitle}
@@ -48,8 +73,6 @@ const Page = () => {
       apiData={{
         Endpoint: "identityProtection/riskyUsers",
         manualPagination: true,
-        $select:
-          "id,userDisplayName,userPrincipalName,riskLevel,riskState,riskDetail,riskLastUpdatedDateTime",
         $count: true,
         $orderby: "riskLastUpdatedDateTime desc",
         $top: 500,
@@ -57,14 +80,8 @@ const Page = () => {
       apiDataKey="Results"
       actions={actions}
       offCanvas={offCanvas}
-      simpleColumns={[
-        "userDisplayName",
-        "userPrincipalName",
-        "riskLevel",
-        "riskState",
-        "riskDetail",
-        "riskLastUpdatedDateTime",
-      ]}
+      simpleColumns={simpleColumns}
+      filters={filterList}
     />
   );
 };
diff --git a/src/pages/identity/reports/risk-detections/index.js b/src/pages/identity/reports/risk-detections/index.js
index 4847fef513db..f6fe5e6b07da 100644
--- a/src/pages/identity/reports/risk-detections/index.js
+++ b/src/pages/identity/reports/risk-detections/index.js
@@ -51,18 +51,28 @@ const Page = () => {
     "activity",
   ];
 
-  // Note to Developer: Add necessary filter logic here
-  // Filters previously defined:
-  /*
-    filterlist: [
-      { filterName: 'State: atRisk', filter: 'Complex: riskState eq atRisk' },
-      { filterName: 'State: confirmedCompromised', filter: 'Complex: riskState eq confirmedCompromised' },
-      { filterName: 'State: confirmedSafe', filter: 'Complex: riskState eq confirmedSafe' },
-      { filterName: 'State: dismissed', filter: 'Complex: riskState eq dismissed' },
-      { filterName: 'State: remediated', filter: 'Complex: riskState eq remediated' },
-      { filterName: 'State: unknownFutureValue', filter: 'Complex: riskState eq unknownFutureValue' },
-    ]
-  */
+  const filterList = [
+    {
+      filterName: "Users at Risk",
+      value: [{ id: "riskState", value: "atRisk" }],
+      type: "column",
+    },
+    {
+      filterName: "Confirmed Compromised",
+      value: [{ id: "riskState", value: "confirmedCompromised" }],
+      type: "column",
+    },
+    {
+      filterName: "Confirmed Safe",
+      value: [{ id: "riskState", value: "confirmedSafe" }],
+      type: "column",
+    },
+    {
+      filterName: "Remediated",
+      value: [{ id: "riskState", value: "remediated" }],
+      type: "column",
+    },
+  ];
 
   return (
     <CippTablePage
@@ -79,6 +89,7 @@ const Page = () => {
       actions={actions}
       offCanvas={offCanvas}
       simpleColumns={simpleColumns}
+      filters={filterList}
     />
   );
 };