diff --git a/app/components/general-layout.tsx b/app/components/general-layout.tsx
index eab243f..a61ff90 100644
--- a/app/components/general-layout.tsx
+++ b/app/components/general-layout.tsx
@@ -110,7 +110,7 @@ export const GeneralLayout = ({ children }: React.PropsWithChildren) => {
             </Button>
 
             <DropdownMenu>
-              <DropdownMenuTrigger>
+              <DropdownMenuTrigger asChild>
                 <Button className="border rounded-full h-auto p-2 gap-x-2 text-ring font-semibold">
                   <Avatar className="bg-ring h-7 w-7 rounded-full" />
                   {`${identity?.firstName} ${identity?.lastName}`}
diff --git a/app/components/pinning-network-banner.tsx b/app/components/pinning-network-banner.tsx
index 91e12af..9aeb7df 100644
--- a/app/components/pinning-network-banner.tsx
+++ b/app/components/pinning-network-banner.tsx
@@ -1,4 +1,4 @@
-import { useMemo } from "react";
+import { useContext, useMemo } from "react";
 import {
   Accordion,
   AccordionContent,
@@ -10,25 +10,33 @@ import { usePinning } from "~/hooks/usePinning";
 import { Tabs, TabsTrigger, TabsList, TabsContent } from "./ui/tabs";
 import { Button } from "./ui/button";
 import { Cross2Icon } from "@radix-ui/react-icons";
-import { PinningStatus } from "~/data/pinning";
+import type { PinningStatus } from "~/data/pinning";
+import { PinningContext } from "~/providers/PinningProvider";
 
 export const PinningNetworkBanner = () => {
+  // const context = useContext(PinningContext);
   const { data } = usePinning();
 
   // TODO: Adapt to real API
   const itemsLeft = useMemo(
-    () => data?.items.filter((item: PinningStatus) => item.status.includes("inprogress")) || [],
+    () =>
+      data?.items.filter((item: PinningStatus) =>
+        item.status.includes("inprogress"),
+      ) || [],
     [data],
   );
 
   const completedItems = useMemo(
-    () => data?.items.filter((item: PinningStatus) => item.status.includes("completed")) || [],
+    () =>
+      data?.items.filter((item: PinningStatus) =>
+        item.status.includes("completed"),
+      ) || [],
     [data],
   );
 
   return (
     <div
-      className={`border border-border rounded-lg absolute w-1/3 bottom-4 right-4 ${
+      className={`bg-background border border-border rounded-lg absolute w-1/3 bottom-4 right-4 ${
         !data?.items.length ? "hidden" : "block"
       }`}>
       <Accordion type="single" defaultValue="item-1" collapsible>
@@ -73,29 +81,27 @@ export const PinningNetworkBanner = () => {
 };
 
 const PinCidItem = ({ item }: { item: PinningStatus }) => {
-  const { mutate } = usePinning();
+  const { unpin } = usePinning();
 
   return (
     <div className="px-4 mb-4">
-      <div className="flex justify-between items-center rounded-lg h-10 py-2 px-4 hover:bg-primary/50 group">
-        <span className="font-semibold">{item.id}</span>
-        <span className="group-hover:hidden">{item.progress}%</span>
-        <div className="gap-x-2 hidden group-hover:flex">
+      <div className="relative flex flex-col items-center rounded-lg py-2 px-4 hover:bg-primary/50 group">
+        <div className="flex justify-between items-center w-full">
+          <span className="font-semibold">{item.id}</span>
+          <span className="group-hover:hidden">{item.progress}%</span>
           <Button
             variant="ghost"
-            className="p-2 rounded-full h-6"
-            onClick={() => mutate({
-              cid: item.id,
-              type: "unpin"
-            })}>
+            className="absolute top-2 right-2 hidden group-hover:flex rounded-full h-3"
+            onClick={() =>
+              unpin({
+                cid: item.id,
+              })
+            }>
             <Cross2Icon />
           </Button>
         </div>
+        <Progress value={item.progress} className="h-2" />
       </div>
-      <Progress
-        value={item.progress}
-        className="h-2 w-[calc(100%-1rem)] ml-2"
-      />
     </div>
   );
 };
diff --git a/app/routes/_index.tsx b/app/routes/_index.tsx
index f8372ce..b8c379f 100644
--- a/app/routes/_index.tsx
+++ b/app/routes/_index.tsx
@@ -3,7 +3,7 @@ import {Navigate} from "@remix-run/react";
 
 export default function Index() {
     return (
-        <Authenticated v3LegacyAuthProviderCompatible key={"index"} loading={
+        <Authenticated key={"index"} loading={
             <>Checking Login Status</>
         }>
             <Navigate to="/dashboard" replace/>
diff --git a/app/routes/file-manager/index.tsx b/app/routes/file-manager/index.tsx
index 12752af..1c760e4 100644
--- a/app/routes/file-manager/index.tsx
+++ b/app/routes/file-manager/index.tsx
@@ -21,7 +21,7 @@ import { usePinning } from "~/hooks/usePinning";
 
 export default function FileManager() {
   return (
-    <Authenticated key="dashboard" v3LegacyAuthProviderCompatible>
+    <Authenticated key="file-manager">
       <GeneralLayout>
         <Dialog>
           <h1 className="font-bold mb-4 text-lg">File Manager</h1>
@@ -98,6 +98,7 @@ const PinFilesForm = () => {
     },
     shouldValidate: "onSubmit",
     onSubmit(e, { submission }) {
+      e.preventDefault();
       if (submission?.status === "success") {
         const value = submission.value;