diff --git a/ui/actions/users/users.ts b/ui/actions/users/users.ts
index f77e7c3ab1..793389b353 100644
--- a/ui/actions/users/users.ts
+++ b/ui/actions/users/users.ts
@@ -4,7 +4,7 @@ import { revalidatePath } from "next/cache";
 import { redirect } from "next/navigation";
 
 import { auth } from "@/auth.config";
-import { getErrorMessage, parseStringify, wait } from "@/lib";
+import { getErrorMessage, parseStringify } from "@/lib";
 
 export const getUsers = async ({
   page = 1,
diff --git a/ui/components/findings/table/finding-detail.tsx b/ui/components/findings/table/finding-detail.tsx
index bc1d9e6992..ee2a399cb6 100644
--- a/ui/components/findings/table/finding-detail.tsx
+++ b/ui/components/findings/table/finding-detail.tsx
@@ -102,7 +102,7 @@ export const FindingDetail = ({
         <div className="grid grid-cols-1 gap-4 md:grid-cols-2">
           <InfoField label="Check ID" variant="simple">
             <Snippet
-              className="max-w-full bg-gray-50 py-1 dark:bg-slate-800"
+              className="max-w-full bg-gray-50 py-1 text-xs dark:bg-slate-800"
               hideSymbol
             >
               {attributes.check_id}
@@ -116,7 +116,7 @@ export const FindingDetail = ({
         {attributes.status === "FAIL" && (
           <InfoField label="Risk" variant="simple">
             <Snippet
-              className="max-w-full py-4"
+              className="max-w-full py-2"
               color="danger"
               hideCopyButton
               hideSymbol
@@ -132,6 +132,10 @@ export const FindingDetail = ({
           {renderValue(attributes.check_metadata.description)}
         </InfoField>
 
+        <InfoField label="Status Extended">
+          {renderValue(attributes.status_extended)}
+        </InfoField>
+
         {attributes.check_metadata.remediation && (
           <div className="flex flex-col gap-4">
             <h4 className="text-sm font-bold text-gray-700 dark:text-prowler-theme-pale/90">
diff --git a/ui/components/overview/new-findings-table/table/finding-detail.tsx b/ui/components/overview/new-findings-table/table/finding-detail.tsx
deleted file mode 100644
index 71927e520b..0000000000
--- a/ui/components/overview/new-findings-table/table/finding-detail.tsx
+++ /dev/null
@@ -1,227 +0,0 @@
-"use client";
-
-import { Snippet } from "@nextui-org/react";
-import Link from "next/link";
-
-import { SnippetId } from "@/components/ui/entities";
-import { DateWithTime } from "@/components/ui/entities/date-with-time";
-import { SeverityBadge } from "@/components/ui/table/severity-badge";
-import { FindingProps } from "@/types";
-
-export const FindingDetail = ({
-  findingDetails,
-}: {
-  findingDetails: FindingProps;
-}) => {
-  const finding = findingDetails;
-  const attributes = finding.attributes;
-  const resource = finding.relationships.resource.attributes;
-
-  const remediation = attributes.check_metadata.remediation;
-
-  return (
-    <div className="flex flex-col gap-6 rounded-lg">
-      {/* Header */}
-      <div className="flex items-center justify-between">
-        <div>
-          <h2 className="line-clamp-2 text-xl font-bold leading-tight text-gray-800 dark:text-prowler-theme-pale/90">
-            {attributes.check_metadata.checktitle}
-          </h2>
-          <p className="text-sm text-gray-500 dark:text-prowler-theme-pale/70">
-            {resource.service}
-          </p>
-        </div>
-        <div
-          className={`rounded-lg px-3 py-1 text-sm font-semibold ${
-            attributes.status === "PASS"
-              ? "bg-green-100 text-green-600"
-              : attributes.status === "MANUAL"
-                ? "bg-gray-100 text-gray-600"
-                : "bg-red-100 text-red-600"
-          }`}
-        >
-          {attributes.status}
-        </div>
-      </div>
-
-      {/* Check Metadata */}
-      <div className="flex flex-col gap-4 rounded-lg p-4 shadow dark:bg-prowler-blue-400">
-        <div className="flex items-center justify-between">
-          <h3 className="text-lg font-bold text-gray-800 dark:text-prowler-theme-pale/90">
-            Finding details
-          </h3>
-          <SeverityBadge severity={attributes.severity} />
-        </div>
-        {attributes.status === "FAIL" && (
-          <Snippet
-            className="max-w-full py-4"
-            color="danger"
-            hideCopyButton
-            hideSymbol
-          >
-            <p className="text-sm font-semibold dark:text-prowler-theme-pale">
-              Risk
-            </p>
-            <p className="whitespace-pre-line text-gray-800 dark:text-prowler-theme-pale/90">
-              {attributes.check_metadata.risk}
-            </p>
-          </Snippet>
-        )}
-
-        <div className="flex flex-col gap-2">
-          <p className="text-sm font-semibold dark:text-prowler-theme-pale">
-            Description
-          </p>
-          <p className="text-gray-800 dark:text-prowler-theme-pale/90">
-            {attributes.check_metadata.description}
-          </p>
-        </div>
-
-        <div className="flex flex-col gap-2">
-          <h3 className="text-sm font-semibold dark:text-prowler-theme-pale">
-            Remediation
-          </h3>
-          <div className="text-gray-800 dark:text-prowler-theme-pale/90">
-            {remediation.recommendation && (
-              <>
-                <p className="text-sm font-semibold">Recommendation:</p>
-                <p>{remediation.recommendation.text}</p>
-                <Link
-                  target="_blank"
-                  href={remediation.recommendation.url}
-                  className="mt-2 inline-block text-sm text-blue-500 underline"
-                >
-                  Learn more
-                </Link>
-              </>
-            )}
-            {remediation.code &&
-              Object.values(remediation.code).some(Boolean) && (
-                <div className="flex flex-col gap-2">
-                  <p className="mt-4 text-sm font-semibold">
-                    Reference Information:
-                  </p>
-                  <div className="flex flex-col gap-2">
-                    {remediation.code.cli && (
-                      <div>
-                        <p className="text-sm font-semibold">CLI Command:</p>
-                        <Snippet
-                          hideSymbol
-                          size="sm"
-                          className="max-w-full bg-gray-50 py-1 dark:bg-slate-800"
-                        >
-                          <p className="whitespace-pre-line">
-                            {remediation.code.cli}
-                          </p>
-                        </Snippet>
-                      </div>
-                    )}
-                    <div className="flex flex-row gap-4">
-                      {Object.entries(remediation.code)
-                        .filter(([key]) => key !== "cli")
-                        .map(([key, value]) =>
-                          value ? (
-                            <Link
-                              key={key}
-                              href={value}
-                              target="_blank"
-                              className="text-sm font-medium text-blue-500"
-                            >
-                              {key === "other"
-                                ? "External doc"
-                                : key.charAt(0).toUpperCase() +
-                                  key.slice(1).toLowerCase()}
-                            </Link>
-                          ) : null,
-                        )}
-                    </div>
-                  </div>
-                </div>
-              )}
-          </div>
-        </div>
-      </div>
-
-      {/* Resources Section */}
-      <div className="flex flex-col gap-4 rounded-lg p-4 shadow dark:bg-prowler-blue-400">
-        <h3 className="text-lg font-bold text-gray-800 dark:text-prowler-theme-pale/90">
-          Resource Details
-        </h3>
-        <div className="grid grid-cols-2 gap-6">
-          <div className="col-span-2">
-            <p className="text-sm font-semibold dark:text-prowler-theme-pale">
-              Resource ID
-            </p>
-            <Snippet
-              size="sm"
-              hideSymbol
-              className="max-w-full bg-gray-50 py-1 dark:bg-slate-800"
-            >
-              <p className="whitespace-pre-line">{resource.uid}</p>
-            </Snippet>
-          </div>
-          <div>
-            <p className="text-sm font-semibold dark:text-prowler-theme-pale">
-              Resource Name
-            </p>
-            <p className="text-gray-800 dark:text-prowler-theme-pale/90">
-              {resource.name}
-            </p>
-          </div>
-          <div>
-            <p className="text-sm font-semibold dark:text-prowler-theme-pale">
-              Region
-            </p>
-            <p className="text-gray-800 dark:text-prowler-theme-pale/90">
-              {resource.region}
-            </p>
-          </div>
-          <div>
-            <p className="text-sm font-semibold dark:text-prowler-theme-pale">
-              Resource Type
-            </p>
-            <p className="text-gray-800 dark:text-prowler-theme-pale/90">
-              {resource.type}
-            </p>
-          </div>
-          <div>
-            <p className="text-sm font-semibold dark:text-prowler-theme-pale">
-              Severity
-            </p>
-            <SeverityBadge severity={attributes.severity} />
-          </div>
-          {resource.tags &&
-            Object.entries(resource.tags).map(([key, value]) => (
-              <div key={key}>
-                <p className="text-sm font-semibold dark:text-prowler-theme-pale">
-                  Tag: {key}
-                </p>
-                <SnippetId
-                  entityId={value}
-                  hideSymbol
-                  size="sm"
-                  className="max-w-full"
-                >
-                  <p className="whitespace-pre-line">{value}</p>
-                </SnippetId>
-              </div>
-            ))}
-          <div className="col-span-2 grid grid-cols-2 gap-6">
-            <div>
-              <p className="text-sm font-semibold dark:text-prowler-theme-pale">
-                First seen
-              </p>
-              <DateWithTime inline dateTime={resource.inserted_at} />
-            </div>
-            <div>
-              <p className="text-sm font-semibold dark:text-prowler-theme-pale">
-                Last seen
-              </p>
-              <DateWithTime inline dateTime={resource.updated_at} />
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-};