diff --git a/apps/console/src/pages/organizations/SettingsPage.tsx b/apps/console/src/pages/organizations/SettingsPage.tsx
index 1419348d1..6b69432a9 100644
--- a/apps/console/src/pages/organizations/SettingsPage.tsx
+++ b/apps/console/src/pages/organizations/SettingsPage.tsx
@@ -12,10 +12,6 @@ export function SettingsViewSkeleton() {
       description="Manage your details and personal preferences here"
     >
       <div className="space-y-6">
-        <div className="space-y-1">
-          <div className="h-8 w-48 bg-muted animate-pulse rounded" />
-          <div className="h-4 w-96 bg-muted animate-pulse rounded" />
-        </div>
         <div className="space-y-2">
           {[1, 2].map((i) => (
             <div key={i} className="h-64 bg-muted animate-pulse rounded-lg" />
diff --git a/apps/console/src/pages/organizations/policies/UpdatePolicyPage.tsx b/apps/console/src/pages/organizations/policies/UpdatePolicyPage.tsx
index 768749e00..0108b5a72 100644
--- a/apps/console/src/pages/organizations/policies/UpdatePolicyPage.tsx
+++ b/apps/console/src/pages/organizations/policies/UpdatePolicyPage.tsx
@@ -11,15 +11,6 @@ export function UpdatePolicyViewSkeleton() {
       title="Update Policy"
       description="Update an existing policy"
     >
-      <div className="flex items-center mb-6">
-        <div className="mr-4">
-          <div className="h-12 w-12 bg-muted animate-pulse rounded-lg" />
-        </div>
-        <div>
-          <div className="h-8 w-48 bg-muted animate-pulse rounded mb-2" />
-          <div className="h-4 w-64 bg-muted animate-pulse rounded" />
-        </div>
-      </div>
       <div className="bg-muted animate-pulse rounded-lg h-[600px]" />
     </PageTemplateSkeleton>
   );
diff --git a/apps/console/src/pages/organizations/vendors/VendorListPage.tsx b/apps/console/src/pages/organizations/vendors/VendorListPage.tsx
index 1b90ebe14..bb18bfb22 100644
--- a/apps/console/src/pages/organizations/vendors/VendorListPage.tsx
+++ b/apps/console/src/pages/organizations/vendors/VendorListPage.tsx
@@ -12,21 +12,22 @@ export function VendorListViewSkeleton() {
       description="Vendors are third-party services that your company uses. Add them to
       keep track of their risk and compliance status."
     >
-      <div>
-        <div className="h-8 w-48 bg-muted animate-pulse rounded" />
-        <div className="h-4 w-96 bg-muted animate-pulse rounded mt-1" />
-      </div>
-      <div className="rounded-xl border bg-card p-4 space-y-4">
-        <div className="h-5 w-32 bg-muted animate-pulse rounded" />
-        <div className="flex gap-2">
-          <div className="h-10 flex-1 bg-muted animate-pulse rounded" />
-          <div className="h-10 w-32 bg-muted animate-pulse rounded" />
+      <div className="space-y-6">
+        <div className="rounded-xl border bg-card p-4 space-y-4">
+          <div className="h-5 w-32 bg-muted animate-pulse rounded" />
+          <div className="flex gap-2">
+            <div className="h-10 flex-1 bg-muted animate-pulse rounded" />
+            <div className="h-10 w-32 bg-muted animate-pulse rounded" />
+          </div>
+        </div>
+        <div className="space-y-2">
+          {[1, 2, 3].map((i) => (
+            <div
+              key={i}
+              className="h-[72px] bg-muted animate-pulse rounded-xl"
+            />
+          ))}
         </div>
-      </div>
-      <div className="space-y-2">
-        {[1, 2, 3].map((i) => (
-          <div key={i} className="h-[72px] bg-muted animate-pulse rounded-xl" />
-        ))}
       </div>
     </PageTemplateSkeleton>
   );
diff --git a/apps/console/src/pages/organizations/vendors/VendorListView.tsx b/apps/console/src/pages/organizations/vendors/VendorListView.tsx
index d738dd854..0a430df6e 100644
--- a/apps/console/src/pages/organizations/vendors/VendorListView.tsx
+++ b/apps/console/src/pages/organizations/vendors/VendorListView.tsx
@@ -245,47 +245,86 @@ function VendorListContent({
       description="Vendors are third-party services that your company uses. Add them to
       keep track of their risk and compliance status."
     >
-      <div className="rounded-xl border bg-card p-4">
-        <div className="flex items-center gap-2 mb-4">
-          <Store className="h-5 w-5" />
-          <h3 className="font-medium">Add a vendor</h3>
-        </div>
-        <div className="flex gap-2 relative">
-          <Input
-            type="text"
-            placeholder="Type vendor's name"
-            value={searchTerm}
-            style={{ borderRadius: "0.3rem" }}
-            onChange={(e) => {
-              const value = e.target.value;
-              setSearchTerm(value);
-              if (value.trim() === "") {
-                setFilteredVendors([]);
-              } else {
-                const results = fuse.search(value).map((result) => result.item);
-                setFilteredVendors(results);
-              }
-            }}
-          />
+      <div className="space-y-6">
+        <div className="rounded-xl border bg-card p-4">
+          <div className="flex items-center gap-2 mb-4">
+            <Store className="h-5 w-5" />
+            <h3 className="font-medium">Add a vendor</h3>
+          </div>
+          <div className="flex gap-2 relative">
+            <Input
+              type="text"
+              placeholder="Type vendor's name"
+              value={searchTerm}
+              style={{ borderRadius: "0.3rem" }}
+              onChange={(e) => {
+                const value = e.target.value;
+                setSearchTerm(value);
+                if (value.trim() === "") {
+                  setFilteredVendors([]);
+                } else {
+                  const results = fuse
+                    .search(value)
+                    .map((result) => result.item);
+                  setFilteredVendors(results);
+                }
+              }}
+            />
 
-          {searchTerm.trim() !== "" && (
-            <>
-              {filteredVendors.length > 0 ? (
-                <div
-                  style={{ borderRadius: "0.3rem" }}
-                  className="absolute top-full left-0 mt-1 w-[calc(100%-100px)] max-h-48 overflow-y-auto border bg-popover shadow-md z-10"
-                >
-                  {filteredVendors.map((vendor: VendorItem) => (
+            {searchTerm.trim() !== "" && (
+              <>
+                {filteredVendors.length > 0 ? (
+                  <div
+                    style={{ borderRadius: "0.3rem" }}
+                    className="absolute top-full left-0 mt-1 w-[calc(100%-100px)] max-h-48 overflow-y-auto border bg-popover shadow-md z-10"
+                  >
+                    {filteredVendors.map((vendor: VendorItem) => (
+                      <button
+                        key={vendor.id}
+                        className="w-full px-3 py-2 text-left hover:bg-accent"
+                        onClick={() => {
+                          createVendor({
+                            variables: {
+                              connections: [vendorsConnection.vendors.__id],
+                              input: {
+                                organizationId: data.organization.id,
+                                name: vendor.name,
+                                description: "",
+                                serviceStartAt: new Date().toISOString(),
+                                serviceCriticality: "LOW",
+                                riskTier: "GENERAL",
+                              },
+                            },
+                            onCompleted() {
+                              setSearchTerm("");
+                              setFilteredVendors([]);
+                              toast({
+                                title: "Vendor added",
+                                description:
+                                  "The vendor has been added successfully",
+                              });
+                            },
+                          });
+                        }}
+                      >
+                        {vendor.name}
+                      </button>
+                    ))}
+                  </div>
+                ) : (
+                  <div
+                    style={{ borderRadius: "0.3rem" }}
+                    className="absolute top-full left-0 mt-1 w-[calc(100%-100px)] border bg-popover shadow-md z-10"
+                  >
                     <button
-                      key={vendor.id}
-                      className="w-full px-3 py-2 text-left hover:bg-accent"
+                      className="w-full px-3 py-2 text-left hover:bg-accent flex items-center gap-2"
                       onClick={() => {
                         createVendor({
                           variables: {
                             connections: [vendorsConnection.vendors.__id],
                             input: {
                               organizationId: data.organization.id,
-                              name: vendor.name,
+                              name: searchTerm.trim(),
                               description: "",
                               serviceStartAt: new Date().toISOString(),
                               serviceCriticality: "LOW",
@@ -296,135 +335,100 @@ function VendorListContent({
                             setSearchTerm("");
                             setFilteredVendors([]);
                             toast({
-                              title: "Vendor added",
+                              title: "Vendor created",
                               description:
-                                "The vendor has been added successfully",
+                                "The new vendor has been created successfully",
                             });
                           },
                         });
                       }}
                     >
-                      {vendor.name}
+                      <span className="font-medium">Create new vendor:</span>{" "}
+                      {searchTerm}
                     </button>
-                  ))}
+                  </div>
+                )}
+              </>
+            )}
+          </div>
+        </div>
+
+        <div className="space-y-2">
+          {vendors.map((vendor) => (
+            <Link
+              key={vendor?.id}
+              to={`/organizations/${organizationId}/vendors/${vendor?.id}`}
+              className="block"
+            >
+              <div className="flex items-center justify-between p-4 rounded-xl border bg-card hover:bg-accent/5 transition-colors">
+                <div className="flex items-center gap-3">
+                  <Avatar className="h-8 w-8">
+                    <AvatarFallback>{vendor?.name?.[0]}</AvatarFallback>
+                  </Avatar>
+                  <div className="flex items-center gap-2">
+                    <p className="font-medium">{vendor?.name}</p>
+                    {vendor?.description && (
+                      <>
+                        <span className="text-muted-foreground">•</span>
+                        <p className="text-sm text-muted-foreground">
+                          {vendor.description}
+                        </p>
+                      </>
+                    )}
+                  </div>
                 </div>
-              ) : (
-                <div
-                  style={{ borderRadius: "0.3rem" }}
-                  className="absolute top-full left-0 mt-1 w-[calc(100%-100px)] border bg-popover shadow-md z-10"
-                >
-                  <button
-                    className="w-full px-3 py-2 text-left hover:bg-accent flex items-center gap-2"
-                    onClick={() => {
-                      createVendor({
-                        variables: {
-                          connections: [vendorsConnection.vendors.__id],
-                          input: {
-                            organizationId: data.organization.id,
-                            name: searchTerm.trim(),
-                            description: "",
-                            serviceStartAt: new Date().toISOString(),
-                            serviceCriticality: "LOW",
-                            riskTier: "GENERAL",
+                <div className="flex items-center gap-2">
+                  <Badge
+                    variant="secondary"
+                    className={
+                      vendor.riskTier === "CRITICAL"
+                        ? "bg-red-100 text-red-900 rounded-full px-3 py-0.5 text-xs font-medium"
+                        : vendor?.riskTier === "SIGNIFICANT"
+                        ? "bg-yellow-100 text-yellow-900 rounded-full px-3 py-0.5 text-xs font-medium"
+                        : "bg-green-100 text-green-900 rounded-full px-3 py-0.5 text-xs font-medium"
+                    }
+                  >
+                    {vendor.riskTier}
+                  </Badge>
+                  <Button
+                    variant="ghost"
+                    size="icon"
+                    className="h-8 w-8 text-muted-foreground hover:bg-transparent hover:[&>svg]:text-destructive"
+                    onClick={(e) => {
+                      e.preventDefault(); // Prevent navigation
+                      if (
+                        window.confirm(
+                          "Are you sure you want to delete this vendor?"
+                        )
+                      ) {
+                        deleteVendor({
+                          variables: {
+                            connections: [vendorsConnection.vendors.__id],
+                            input: {
+                              vendorId: vendor.id,
+                            },
                           },
-                        },
-                        onCompleted() {
-                          setSearchTerm("");
-                          setFilteredVendors([]);
-                          toast({
-                            title: "Vendor created",
-                            description:
-                              "The new vendor has been created successfully",
-                          });
-                        },
-                      });
+                          onCompleted() {
+                            toast({
+                              title: "Vendor deleted",
+                              description:
+                                "The vendor has been deleted successfully",
+                            });
+                          },
+                        });
+                      }
                     }}
                   >
-                    <span className="font-medium">Create new vendor:</span>{" "}
-                    {searchTerm}
-                  </button>
+                    <Trash2 className="h-4 w-4 transition-colors" />
+                  </Button>
+                  <ChevronRight className="h-4 w-4 text-muted-foreground" />
                 </div>
-              )}
-            </>
-          )}
+              </div>
+            </Link>
+          ))}
         </div>
       </div>
 
-      <div className="space-y-2">
-        {vendors.map((vendor) => (
-          <Link
-            key={vendor?.id}
-            to={`/organizations/${organizationId}/vendors/${vendor?.id}`}
-            className="block"
-          >
-            <div className="flex items-center justify-between p-4 rounded-xl border bg-card hover:bg-accent/5 transition-colors">
-              <div className="flex items-center gap-3">
-                <Avatar className="h-8 w-8">
-                  <AvatarFallback>{vendor?.name?.[0]}</AvatarFallback>
-                </Avatar>
-                <div className="flex items-center gap-2">
-                  <p className="font-medium">{vendor?.name}</p>
-                  {vendor?.description && (
-                    <>
-                      <span className="text-muted-foreground">•</span>
-                      <p className="text-sm text-muted-foreground">
-                        {vendor.description}
-                      </p>
-                    </>
-                  )}
-                </div>
-              </div>
-              <div className="flex items-center gap-2">
-                <Badge
-                  variant="secondary"
-                  className={
-                    vendor.riskTier === "CRITICAL"
-                      ? "bg-red-100 text-red-900 rounded-full px-3 py-0.5 text-xs font-medium"
-                      : vendor?.riskTier === "SIGNIFICANT"
-                      ? "bg-yellow-100 text-yellow-900 rounded-full px-3 py-0.5 text-xs font-medium"
-                      : "bg-green-100 text-green-900 rounded-full px-3 py-0.5 text-xs font-medium"
-                  }
-                >
-                  {vendor.riskTier}
-                </Badge>
-                <Button
-                  variant="ghost"
-                  size="icon"
-                  className="h-8 w-8 text-muted-foreground hover:bg-transparent hover:[&>svg]:text-destructive"
-                  onClick={(e) => {
-                    e.preventDefault(); // Prevent navigation
-                    if (
-                      window.confirm(
-                        "Are you sure you want to delete this vendor?"
-                      )
-                    ) {
-                      deleteVendor({
-                        variables: {
-                          connections: [vendorsConnection.vendors.__id],
-                          input: {
-                            vendorId: vendor.id,
-                          },
-                        },
-                        onCompleted() {
-                          toast({
-                            title: "Vendor deleted",
-                            description:
-                              "The vendor has been deleted successfully",
-                          });
-                        },
-                      });
-                    }
-                  }}
-                >
-                  <Trash2 className="h-4 w-4 transition-colors" />
-                </Button>
-                <ChevronRight className="h-4 w-4 text-muted-foreground" />
-              </div>
-            </div>
-          </Link>
-        ))}
-      </div>
-
       <LoadAboveButton
         isLoading={isLoadingPrevious}
         hasMore={hasPrevious}
diff --git a/apps/console/src/pages/organizations/vendors/VendorPage.tsx b/apps/console/src/pages/organizations/vendors/VendorPage.tsx
index f6c7ec0f9..fcd0f5ed9 100644
--- a/apps/console/src/pages/organizations/vendors/VendorPage.tsx
+++ b/apps/console/src/pages/organizations/vendors/VendorPage.tsx
@@ -8,10 +8,6 @@ const VendorView = lazy(() => import("./VendorView"));
 export function VendorViewSkeleton() {
   return (
     <PageTemplateSkeleton>
-      <div className="space-y-1">
-        <div className="h-8 w-48 bg-muted animate-pulse rounded" />
-        <div className="h-4 w-96 bg-muted animate-pulse rounded" />
-      </div>
       <div className="space-y-2">
         {[1, 2].map((i) => (
           <div key={i} className="h-20 bg-muted animate-pulse rounded-lg" />