diff --git a/.github/workflows/manual-deploy-obscuro-scan-3.yml b/.github/workflows/manual-deploy-obscuro-scan-3.yml
index 46bc9d8855..6f60712ace 100644
--- a/.github/workflows/manual-deploy-obscuro-scan-3.yml
+++ b/.github/workflows/manual-deploy-obscuro-scan-3.yml
@@ -1,8 +1,8 @@
-# Deploys Ten Scan on Azure for Testnet
-# Builds the Ten Scan image, pushes the image to dockerhub and starts the Ten Scan on Azure
+# Deploys Tenscan on Azure for Testnet
+# Builds the Tenscan image, pushes the image to dockerhub and starts the Tenscan on Azure
 
-name: "[M] Deploy Ten Scan 3 Testnet"
-run-name: "[M] Deploy Ten Scan Testnet ( ${{ github.event.inputs.testnet_type }} )"
+name: "[M] Deploy Tenscan 3 Testnet"
+run-name: "[M] Deploy Tenscan Testnet ( ${{ github.event.inputs.testnet_type }} )"
 on:
   workflow_dispatch:
     inputs:
diff --git a/tools/obscuroscan_v3/frontend/pages/_app.tsx b/tools/obscuroscan_v3/frontend/pages/_app.tsx
index a345b336ae..287ecf806d 100644
--- a/tools/obscuroscan_v3/frontend/pages/_app.tsx
+++ b/tools/obscuroscan_v3/frontend/pages/_app.tsx
@@ -9,30 +9,25 @@ import {
 import "@/styles/globals.css";
 import type { AppProps } from "next/app";
 import { Toaster } from "@/src/components/ui/toaster";
-import { useToast } from "@/src/components/ui/use-toast";
 import { WalletConnectionProvider } from "@/src/components/providers/wallet-provider";
 import { NetworkStatus } from "@/src/components/modules/common/network-status";
 import HeadSeo from "@/src/components/head-seo";
 import { siteMetadata } from "@/src/lib/siteMetadata";
 import Script from "next/script";
 import { GOOGLE_ANALYTICS_ID } from "@/src/lib/constants";
+import { showToast } from "@/src/components/ui/use-toast";
+import { ToastType } from "@/src/types/interfaces";
 
 export default function App({ Component, pageProps }: AppProps) {
-  const { toast } = useToast();
-
   const mutationCache = new MutationCache({
     onSuccess: (mutation: any) => {
       if (mutation?.message) {
-        toast({
-          description: mutation?.message,
-        });
+        showToast(ToastType.SUCCESS, mutation?.message);
       }
     },
     onError: (error: any, mutation: any) => {
       if (error?.response?.data?.message) {
-        toast({
-          description: mutation?.message,
-        });
+        showToast(ToastType.DESTRUCTIVE, error?.response?.data?.message);
       }
     },
   });
diff --git a/tools/obscuroscan_v3/frontend/pages/batches/[hash].tsx b/tools/obscuroscan_v3/frontend/pages/batches/[hash].tsx
index 1e8d2e29a8..964444aa77 100644
--- a/tools/obscuroscan_v3/frontend/pages/batches/[hash].tsx
+++ b/tools/obscuroscan_v3/frontend/pages/batches/[hash].tsx
@@ -30,9 +30,9 @@ export default function Batch() {
       ) : batchDetails ? (
         <Card className="col-span-3">
           <CardHeader>
-            <CardTitle>Batch #{batchDetails?.Header?.number}</CardTitle>
+            <CardTitle>Batch #{Number(batchDetails?.Header?.number)}</CardTitle>
             <CardDescription>
-              Overview of the batch #{batchDetails?.Header?.number}
+              Overview of the batch #{Number(batchDetails?.Header?.number)}
             </CardDescription>
           </CardHeader>
           <CardContent>
diff --git a/tools/obscuroscan_v3/frontend/pages/blocks/index.tsx b/tools/obscuroscan_v3/frontend/pages/blocks/index.tsx
index 4570a4f32f..8e3af812c0 100644
--- a/tools/obscuroscan_v3/frontend/pages/blocks/index.tsx
+++ b/tools/obscuroscan_v3/frontend/pages/blocks/index.tsx
@@ -19,6 +19,7 @@ export default function Blocks() {
 
   React.useEffect(() => {
     setNoPolling(true);
+    return () => setNoPolling(false);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
diff --git a/tools/obscuroscan_v3/frontend/pages/docs/[id].tsx b/tools/obscuroscan_v3/frontend/pages/docs/[id].tsx
index 022609528d..3400f95f5b 100644
--- a/tools/obscuroscan_v3/frontend/pages/docs/[id].tsx
+++ b/tools/obscuroscan_v3/frontend/pages/docs/[id].tsx
@@ -1,10 +1,11 @@
 import Layout from "@/src/components/layouts/default-layout";
 import Spinner from "@/src/components/ui/spinner";
-import { useToast } from "@/src/components/ui/use-toast";
 import { siteMetadata } from "@/src/lib/siteMetadata";
 import { useRouter } from "next/router";
 import React from "react";
 import Custom404Error from "../404";
+import { showToast } from "@/src/components/ui/use-toast";
+import { ToastType } from "@/src/types/interfaces";
 
 type Document = {
   title: string;
@@ -16,7 +17,6 @@ type Document = {
 };
 
 const Document = () => {
-  const { toast } = useToast();
   const { query } = useRouter();
   const { id } = query;
 
@@ -45,10 +45,7 @@ const Document = () => {
       };
       setDocument(processedData);
     } catch (error) {
-      toast({
-        variant: "destructive",
-        description: "Error fetching document",
-      });
+      showToast(ToastType.DESTRUCTIVE, "Error fetching document");
     } finally {
       setLoading(false);
     }
diff --git a/tools/obscuroscan_v3/frontend/pages/personal/index.tsx b/tools/obscuroscan_v3/frontend/pages/personal/index.tsx
index 7c99c906f0..ba87befdfd 100644
--- a/tools/obscuroscan_v3/frontend/pages/personal/index.tsx
+++ b/tools/obscuroscan_v3/frontend/pages/personal/index.tsx
@@ -2,16 +2,29 @@ import React from "react";
 import Layout from "@/src/components/layouts/default-layout";
 import { Metadata } from "next";
 import PersonalTransactions from "@/src/components/modules/personal";
+import { useWalletConnection } from "@/src/components/providers/wallet-provider";
+import ConnectWalletButton from "@/src/components/modules/common/connect-wallet";
+import EmptyState from "@/src/components/modules/common/empty-state";
 
 export const metadata: Metadata = {
   title: "Personal Transactions",
-  description: "ObscuroScan Personal Transactions",
+  description: "Tenscan Personal Transactions",
 };
 
 export default function PersonalPage() {
+  const { walletConnected } = useWalletConnection();
+
   return (
     <Layout>
-      <PersonalTransactions />
+      {walletConnected ? (
+        <PersonalTransactions />
+      ) : (
+        <EmptyState
+          title="Connect your wallet"
+          description="Connect your wallet to view your personal transactions."
+          action={<ConnectWalletButton />}
+        />
+      )}
     </Layout>
   );
 }
diff --git a/tools/obscuroscan_v3/frontend/src/components/main-nav.tsx b/tools/obscuroscan_v3/frontend/src/components/main-nav.tsx
index eb116fde7b..1e422c897c 100644
--- a/tools/obscuroscan_v3/frontend/src/components/main-nav.tsx
+++ b/tools/obscuroscan_v3/frontend/src/components/main-nav.tsx
@@ -59,7 +59,7 @@ const NavItem = ({ navLink }: { navLink: NavLink }) => {
       <a
         href={navLink.href}
         key={navLink.label}
-        className="text-sm font-medium transition-colors hover:text-primary"
+        className="text-sm font-medium transition-colors hover:text-primary w-full"
       >
         {navLink.label}
       </a>
@@ -70,7 +70,7 @@ const NavItem = ({ navLink }: { navLink: NavLink }) => {
         href={navLink.href || ""}
         key={navLink.label}
         className={cn(
-          "text-sm font-medium text-muted-foreground transition-colors hover:text-primary",
+          "text-sm font-medium text-muted-foreground transition-colors hover:text-primary w-full",
           {
             "text-primary": router.pathname === navLink.href,
           }
diff --git a/tools/obscuroscan_v3/frontend/src/components/modules/batches/batch-details.tsx b/tools/obscuroscan_v3/frontend/src/components/modules/batches/batch-details.tsx
index a5f2903353..c6c2edf8d5 100644
--- a/tools/obscuroscan_v3/frontend/src/components/modules/batches/batch-details.tsx
+++ b/tools/obscuroscan_v3/frontend/src/components/modules/batches/batch-details.tsx
@@ -15,7 +15,7 @@ export function BatchDetailsComponent({
       <KeyValueList>
         <KeyValueItem
           label="Batch Number"
-          value={"#" + batchDetails?.Header?.number}
+          value={"#" + Number(batchDetails?.Header?.number)}
         />
         <KeyValueItem
           label="Hash"
@@ -59,10 +59,16 @@ export function BatchDetailsComponent({
         />
         <KeyValueItem
           label="Gas Limit"
-          value={batchDetails?.Header?.gasLimit}
+          value={Number(batchDetails?.Header?.gasLimit)}
+        />
+        <KeyValueItem
+          label="Gas Used"
+          value={Number(batchDetails?.Header?.gasUsed)}
+        />
+        <KeyValueItem
+          label="Base Fee"
+          value={batchDetails?.Header?.baseFee || "-"}
         />
-        <KeyValueItem label="Gas Used" value={batchDetails?.Header?.gasUsed} />
-        <KeyValueItem label="Base Fee" value={batchDetails?.Header?.baseFee} />
         <KeyValueItem
           label="Inbound Cross Chain Hash"
           value={
@@ -87,7 +93,7 @@ export function BatchDetailsComponent({
         />
         <KeyValueItem
           label="Base Fee Per Gas"
-          value={batchDetails?.Header?.baseFeePerGas}
+          value={Number(batchDetails?.Header?.baseFeePerGas)}
           isLastItem
         />
       </KeyValueList>
@@ -95,7 +101,7 @@ export function BatchDetailsComponent({
       <KeyValueList>
         <KeyValueItem
           label="No. of Transactions"
-          value={batchDetails?.TxHashes?.length || 0}
+          value={batchDetails?.TxHashes?.length || "-"}
           isLastItem
         />
       </KeyValueList>
diff --git a/tools/obscuroscan_v3/frontend/src/components/modules/batches/columns.tsx b/tools/obscuroscan_v3/frontend/src/components/modules/batches/columns.tsx
index 9935eb1142..76ea0eafa7 100644
--- a/tools/obscuroscan_v3/frontend/src/components/modules/batches/columns.tsx
+++ b/tools/obscuroscan_v3/frontend/src/components/modules/batches/columns.tsx
@@ -1,9 +1,7 @@
 "use client";
 
 import { ColumnDef } from "@tanstack/react-table";
-import { Checkbox } from "@/src/components/ui/checkbox";
 
-import { labels, statuses } from "./constants";
 import { DataTableColumnHeader } from "../common/data-table/data-table-column-header";
 import TruncatedAddress from "../common/truncated-address";
 import { formatTimeAgo } from "@/src/lib/utils";
@@ -12,27 +10,6 @@ import { EyeOpenIcon } from "@radix-ui/react-icons";
 import Link from "next/link";
 
 export const columns: ColumnDef<Batch>[] = [
-  {
-    id: "select",
-    header: ({ table }) => (
-      <Checkbox
-        checked={table.getIsAllPageRowsSelected()}
-        onCheckedChange={(value) => table.toggleAllPageRowsSelected(!!value)}
-        aria-label="Select all"
-        className="translate-y-[2px]"
-      />
-    ),
-    cell: ({ row }) => (
-      <Checkbox
-        checked={row.getIsSelected()}
-        onCheckedChange={(value) => row.toggleSelected(!!value)}
-        aria-label="Select row"
-        className="translate-y-[2px]"
-      />
-    ),
-    enableSorting: false,
-    enableHiding: false,
-  },
   {
     accessorKey: "number",
     header: ({ column }) => (
@@ -41,8 +18,8 @@ export const columns: ColumnDef<Batch>[] = [
     cell: ({ row }) => {
       return (
         <div className="flex space-x-2">
-          <span className="max-w-[500px] truncate font-medium">
-            {row.getValue("number")}
+          <span className="max-w-[500px] truncate">
+            {Number(row.getValue("number"))}
           </span>
         </div>
       );
@@ -58,7 +35,7 @@ export const columns: ColumnDef<Batch>[] = [
     cell: ({ row }) => {
       return (
         <div className="flex space-x-2">
-          <span className="max-w-[500px] truncate font-medium">
+          <span className="max-w-[500px] truncate">
             {row.getValue("timestamp")
               ? formatTimeAgo(row.getValue("timestamp"))
               : "N/A"}
@@ -77,8 +54,8 @@ export const columns: ColumnDef<Batch>[] = [
     cell: ({ row }) => {
       return (
         <div className="flex space-x-2">
-          <span className="max-w-[500px] truncate font-medium">
-            {row.getValue("gasUsed")}
+          <span className="max-w-[500px] truncate">
+            {Number(row.getValue("gasUsed"))}
           </span>
         </div>
       );
@@ -94,8 +71,8 @@ export const columns: ColumnDef<Batch>[] = [
     cell: ({ row }) => {
       return (
         <div className="flex space-x-2">
-          <span className="max-w-[500px] truncate font-medium">
-            {row.getValue("gasLimit")}
+          <span className="max-w-[500px] truncate">
+            {Number(row.getValue("gasLimit"))}
           </span>
         </div>
       );
@@ -137,31 +114,15 @@ export const columns: ColumnDef<Batch>[] = [
     enableHiding: false,
   },
   {
-    accessorKey: "difficulty",
+    accessorKey: "miner",
     header: ({ column }) => (
-      <DataTableColumnHeader column={column} title="Difficulty" />
+      <DataTableColumnHeader column={column} title="Miner" />
     ),
     cell: ({ row }) => {
-      const finality = statuses.find(
-        (finality) => finality.value === row.getValue("difficulty")
-      );
-
-      if (!finality) {
-        return null;
-      }
-
-      return (
-        <div className="flex items-center">
-          {finality.icon && (
-            <finality.icon className="mr-2 h-4 w-4 text-muted-foreground" />
-          )}
-          <span>{finality.label || "N/A"}</span>
-        </div>
-      );
-    },
-    filterFn: (row, id, value) => {
-      return value.includes(row.getValue(id));
+      return <TruncatedAddress address={row.original.miner} />;
     },
+    enableSorting: false,
+    enableHiding: false,
   },
   {
     id: "actions",
diff --git a/tools/obscuroscan_v3/frontend/src/components/modules/blocks/columns.tsx b/tools/obscuroscan_v3/frontend/src/components/modules/blocks/columns.tsx
index 88cf5c286a..edf1db25db 100644
--- a/tools/obscuroscan_v3/frontend/src/components/modules/blocks/columns.tsx
+++ b/tools/obscuroscan_v3/frontend/src/components/modules/blocks/columns.tsx
@@ -1,37 +1,17 @@
 "use client";
 
 import { ColumnDef } from "@tanstack/react-table";
-import { Checkbox } from "@/src/components/ui/checkbox";
 
-import { labels, statuses } from "./constants";
 import { DataTableColumnHeader } from "../common/data-table/data-table-column-header";
-import { DataTableRowActions } from "../common/data-table/data-table-row-actions";
 import { Block, BlockHeader } from "@/src/types/interfaces/BlockInterfaces";
 import TruncatedAddress from "../common/truncated-address";
 import { formatTimeAgo } from "@/src/lib/utils";
+import { Badge } from "../../ui/badge";
+import ExternalLink from "../../ui/external-link";
+import { externalLinks } from "@/src/routes";
+import { EyeOpenIcon } from "@radix-ui/react-icons";
 
 export const columns: ColumnDef<Block>[] = [
-  {
-    id: "select",
-    header: ({ table }) => (
-      <Checkbox
-        checked={table.getIsAllPageRowsSelected()}
-        onCheckedChange={(value) => table.toggleAllPageRowsSelected(!!value)}
-        aria-label="Select all"
-        className="translate-y-[2px]"
-      />
-    ),
-    cell: ({ row }) => (
-      <Checkbox
-        checked={row.getIsSelected()}
-        onCheckedChange={(value) => row.toggleSelected(!!value)}
-        aria-label="Select row"
-        className="translate-y-[2px]"
-      />
-    ),
-    enableSorting: false,
-    enableHiding: false,
-  },
   {
     accessorKey: "number",
     header: ({ column }) => (
@@ -41,8 +21,8 @@ export const columns: ColumnDef<Block>[] = [
       const blockHeader = row.original.blockHeader as BlockHeader;
       return (
         <div className="flex space-x-2">
-          <span className="max-w-[500px] truncate font-medium">
-            {+blockHeader?.number}
+          <span className="max-w-[500px] truncate">
+            {Number(blockHeader?.number)}
           </span>
         </div>
       );
@@ -59,7 +39,7 @@ export const columns: ColumnDef<Block>[] = [
       const blockHeader = row.original.blockHeader as BlockHeader;
       return (
         <div className="flex space-x-2">
-          <span className="max-w-[500px] truncate font-medium">
+          <span className="max-w-[500px] truncate">
             {blockHeader?.timestamp
               ? formatTimeAgo(blockHeader?.timestamp)
               : "N/A"}
@@ -70,17 +50,33 @@ export const columns: ColumnDef<Block>[] = [
     enableSorting: false,
     enableHiding: false,
   },
+
+  {
+    accessorKey: "rollupHash",
+    header: ({ column }) => (
+      <DataTableColumnHeader column={column} title="Rollup Hash" />
+    ),
+    cell: ({ row }) => {
+      return Number(row.original.rollupHash) === 0 ? (
+        <Badge>No rollup</Badge>
+      ) : (
+        <TruncatedAddress address={row.original.rollupHash} />
+      );
+    },
+    enableSorting: false,
+    enableHiding: false,
+  },
   {
     accessorKey: "blockHeader.gasUsed",
     header: ({ column }) => (
-      <DataTableColumnHeader column={column} title="Gas Used" />
+      <DataTableColumnHeader column={column} title="Rollup Gas Used" />
     ),
     cell: ({ row }) => {
       const blockHeader = row.original.blockHeader as BlockHeader;
       return (
         <div className="flex space-x-2">
-          <span className="max-w-[500px] truncate font-medium">
-            {+blockHeader?.gasUsed}
+          <span className="max-w-[500px] truncate">
+            <Badge variant={"outline"}>{Number(blockHeader?.gasUsed)}</Badge>
           </span>
         </div>
       );
@@ -97,8 +93,8 @@ export const columns: ColumnDef<Block>[] = [
       const blockHeader = row.original.blockHeader as BlockHeader;
       return (
         <div className="flex space-x-2">
-          <span className="max-w-[500px] truncate font-medium">
-            {+blockHeader?.gasLimit}
+          <span className="max-w-[500px] truncate">
+            {Number(blockHeader?.gasLimit)}
           </span>
         </div>
       );
@@ -130,46 +126,30 @@ export const columns: ColumnDef<Block>[] = [
     enableSorting: false,
     enableHiding: false,
   },
+
   {
-    accessorKey: "rollupHash",
+    accessorKey: "miner",
     header: ({ column }) => (
-      <DataTableColumnHeader column={column} title="Rollup Hash" />
+      <DataTableColumnHeader column={column} title="Miner" />
     ),
     cell: ({ row }) => {
-      return <TruncatedAddress address={row.original.rollupHash} />;
+      const blockHeader = row.original.blockHeader as BlockHeader;
+      return <TruncatedAddress address={blockHeader?.miner} />;
     },
     enableSorting: false,
     enableHiding: false,
   },
   {
-    accessorKey: "Finality",
-    header: ({ column }) => (
-      <DataTableColumnHeader column={column} title="Finality" />
-    ),
+    id: "actions",
     cell: ({ row }) => {
-      const finality = statuses.find(
-        (finality) => finality.value === row.getValue("Finality")
-      );
-
-      if (!finality) {
-        return null;
-      }
-
+      const blockHeader = row.original.blockHeader as BlockHeader;
       return (
-        <div className="flex items-center">
-          {finality.icon && (
-            <finality.icon className="mr-2 h-4 w-4 text-muted-foreground" />
-          )}
-          <span>{finality.label}</span>
-        </div>
+        <ExternalLink
+          href={`${externalLinks.etherscanBlock}${blockHeader?.hash}`}
+        >
+          <EyeOpenIcon className="h-5 w-5 text-muted-foreground hover:text-primary transition-colors cursor-pointer mr-2" />
+        </ExternalLink>
       );
     },
-    filterFn: (row, id, value) => {
-      return value.includes(row.getValue(id));
-    },
-  },
-  {
-    id: "actions",
-    cell: ({ row }) => <DataTableRowActions row={row} labels={labels} />,
   },
 ];
diff --git a/tools/obscuroscan_v3/frontend/src/components/modules/blocks/constants.tsx b/tools/obscuroscan_v3/frontend/src/components/modules/blocks/constants.tsx
index 395dc4771b..eca2d7c2b5 100644
--- a/tools/obscuroscan_v3/frontend/src/components/modules/blocks/constants.tsx
+++ b/tools/obscuroscan_v3/frontend/src/components/modules/blocks/constants.tsx
@@ -2,24 +2,8 @@ import {
   ArrowDownIcon,
   ArrowRightIcon,
   ArrowUpIcon,
-  CheckCircledIcon,
 } from "@radix-ui/react-icons";
 
-export const labels = [
-  {
-    value: "Final",
-    label: "Final",
-  },
-];
-
-export const statuses = [
-  {
-    value: "Final",
-    label: "Final",
-    icon: CheckCircledIcon,
-  },
-];
-
 export const priorities = [
   {
     label: "Low",
diff --git a/tools/obscuroscan_v3/frontend/src/components/modules/common/connect-wallet.tsx b/tools/obscuroscan_v3/frontend/src/components/modules/common/connect-wallet.tsx
index 4d5d1fb258..ce29123e27 100644
--- a/tools/obscuroscan_v3/frontend/src/components/modules/common/connect-wallet.tsx
+++ b/tools/obscuroscan_v3/frontend/src/components/modules/common/connect-wallet.tsx
@@ -2,8 +2,9 @@ import { useWalletConnection } from "@/src/components/providers/wallet-provider"
 import { Button } from "@/src/components/ui/button";
 import { Link2Icon, LinkBreak2Icon } from "@radix-ui/react-icons";
 import React from "react";
+import TruncatedAddress from "./truncated-address";
 const ConnectWalletButton = () => {
-  const { walletConnected, connectWallet, disconnectWallet } =
+  const { walletConnected, walletAddress, connectWallet, disconnectWallet } =
     useWalletConnection();
 
   return (
@@ -15,7 +16,11 @@ const ConnectWalletButton = () => {
       {walletConnected ? (
         <>
           <LinkBreak2Icon className="h-4 w-4 mr-1" />
-          Disconnect
+          {walletAddress ? (
+            <TruncatedAddress address={walletAddress} showCopy={false} />
+          ) : (
+            "Wallet"
+          )}
         </>
       ) : (
         <>
diff --git a/tools/obscuroscan_v3/frontend/src/components/modules/common/data-table/data-table-row-actions.tsx b/tools/obscuroscan_v3/frontend/src/components/modules/common/data-table/data-table-row-actions.tsx
index 74d159b81f..0f8c652451 100644
--- a/tools/obscuroscan_v3/frontend/src/components/modules/common/data-table/data-table-row-actions.tsx
+++ b/tools/obscuroscan_v3/frontend/src/components/modules/common/data-table/data-table-row-actions.tsx
@@ -18,7 +18,7 @@ import {
 
 interface DataTableRowActionsProps<TData> {
   row: Row<TData>;
-  labels: { label: string; value: string }[];
+  labels: { label: string; value: string }[] | null;
 }
 
 export function DataTableRowActions<TData>({
@@ -38,20 +38,25 @@ export function DataTableRowActions<TData>({
       </DropdownMenuTrigger>
       <DropdownMenuContent align="end" className="w-[160px]">
         <DropdownMenuItem>View</DropdownMenuItem>
-        <DropdownMenuSeparator />
-        {labels && (
-          <DropdownMenuSub>
-            <DropdownMenuSubTrigger>Labels</DropdownMenuSubTrigger>
-            <DropdownMenuSubContent>
-              <DropdownMenuRadioGroup value={row.original.label}>
-                {labels?.map((label) => (
-                  <DropdownMenuRadioItem key={label.value} value={label.value}>
-                    {label.label}
-                  </DropdownMenuRadioItem>
-                ))}
-              </DropdownMenuRadioGroup>
-            </DropdownMenuSubContent>
-          </DropdownMenuSub>
+        {labels === null ? null : (
+          <>
+            <DropdownMenuSeparator />
+            <DropdownMenuSub>
+              <DropdownMenuSubTrigger>Labels</DropdownMenuSubTrigger>
+              <DropdownMenuSubContent>
+                <DropdownMenuRadioGroup value={row.original.label}>
+                  {labels?.map((label) => (
+                    <DropdownMenuRadioItem
+                      key={label.value}
+                      value={label.value}
+                    >
+                      {label.label}
+                    </DropdownMenuRadioItem>
+                  ))}
+                </DropdownMenuRadioGroup>
+              </DropdownMenuSubContent>
+            </DropdownMenuSub>
+          </>
         )}
         <DropdownMenuSeparator />
       </DropdownMenuContent>
diff --git a/tools/obscuroscan_v3/frontend/src/components/modules/common/data-table/data-table.tsx b/tools/obscuroscan_v3/frontend/src/components/modules/common/data-table/data-table.tsx
index ad76fc92bb..477ebbd53e 100644
--- a/tools/obscuroscan_v3/frontend/src/components/modules/common/data-table/data-table.tsx
+++ b/tools/obscuroscan_v3/frontend/src/components/modules/common/data-table/data-table.tsx
@@ -87,13 +87,13 @@ export function DataTable<TData, TValue>({
   });
 
   const { query, push, pathname } = useRouter();
+  const { pageIndex, pageSize } = table.getState().pagination;
 
   React.useEffect(() => {
-    const { pageIndex, pageSize } = table.getState().pagination;
     const params = { ...query, page: pageIndex + 1, size: pageSize };
     push({ pathname, query: params });
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [table.getState().pagination]);
+  }, [pageIndex, pageSize]);
 
   return (
     <div className="space-y-4">
@@ -119,7 +119,7 @@ export function DataTable<TData, TValue>({
             ))}
           </TableHeader>
           <TableBody>
-            {table?.getRowModel()?.rows?.length || data ? (
+            {table?.getRowModel()?.rows?.length && data ? (
               table.getRowModel().rows.map((row) => (
                 <TableRow
                   key={row.id}
diff --git a/tools/obscuroscan_v3/frontend/src/components/modules/common/empty-state.tsx b/tools/obscuroscan_v3/frontend/src/components/modules/common/empty-state.tsx
new file mode 100644
index 0000000000..395376f86c
--- /dev/null
+++ b/tools/obscuroscan_v3/frontend/src/components/modules/common/empty-state.tsx
@@ -0,0 +1,32 @@
+import React from "react";
+
+const EmptyState = ({
+  title,
+  description,
+  icon,
+  action,
+}: {
+  title?: string;
+  description?: string;
+  icon?: React.ReactNode;
+  action?: React.ReactNode;
+}) => {
+  return (
+    <div className="flex flex-col items-center justify-center h-full">
+      <div className="flex flex-col items-center justify-center space-y-4">
+        {icon && <div className="w-24 h-24">{icon}</div>}
+        {title && (
+          <h3 className="text-2xl font-semibold leading-none tracking-tight">
+            {title}
+          </h3>
+        )}
+        {description && (
+          <p className="text-sm text-muted-foreground">{description}</p>
+        )}
+        {action && <div className="flex items-center">{action}</div>}
+      </div>
+    </div>
+  );
+};
+
+export default EmptyState;
diff --git a/tools/obscuroscan_v3/frontend/src/components/modules/common/network-status.tsx b/tools/obscuroscan_v3/frontend/src/components/modules/common/network-status.tsx
index 9fa5815233..6f9be08af4 100644
--- a/tools/obscuroscan_v3/frontend/src/components/modules/common/network-status.tsx
+++ b/tools/obscuroscan_v3/frontend/src/components/modules/common/network-status.tsx
@@ -1,3 +1,4 @@
+import { cn } from "@/src/lib/utils";
 import React from "react";
 
 const MessageContent = (
@@ -26,14 +27,12 @@ export const NetworkStatus = ({ message = MessageContent }) => {
 
   return (
     <div
-      className={`fixed z-50 right-0 bottom-0 p-4 transform transition-transform ${
+      className={cn(
+        "fixed z-50 right-0 bottom-0 p-4 transform transition-transform",
         isOnline ? "translate-x-full" : "translate-x-0"
-      }`}
+      )}
     >
-      <div
-        className="bg-red-500 text-white p-4 rounded-md shadow-lg ring-1 ring-gray-800 backdrop-blur transition dark:bg-gray-800/90 dark:ring-white/10 dark:hover:ring-white/20 cursor-pointer"
-        onClick={() => setIsOnline(true)}
-      >
+      <div className="bg-red-500 text-white p-4 rounded-md shadow-lg ring-1 ring-gray-800 backdrop-blur transition dark:bg-gray-800/90 dark:ring-white/10 dark:hover:ring-white/20 cursor-pointer">
         {message}
       </div>
     </div>
diff --git a/tools/obscuroscan_v3/frontend/src/components/modules/common/truncated-address.tsx b/tools/obscuroscan_v3/frontend/src/components/modules/common/truncated-address.tsx
index 5e0199c865..a72a0f1392 100644
--- a/tools/obscuroscan_v3/frontend/src/components/modules/common/truncated-address.tsx
+++ b/tools/obscuroscan_v3/frontend/src/components/modules/common/truncated-address.tsx
@@ -13,10 +13,12 @@ const TruncatedAddress = ({
   address,
   prefixLength,
   suffixLength,
+  showCopy = true,
 }: {
   address: string;
   prefixLength?: number;
   suffixLength?: number;
+  showCopy?: boolean;
 }) => {
   const truncatedAddress = `${address?.substring(
     0,
@@ -35,7 +37,7 @@ const TruncatedAddress = ({
               </TooltipContent>
             </Tooltip>
           </TooltipProvider>
-          <Copy value={address} />
+          {showCopy && <Copy value={address} />}
         </div>
       ) : (
         <div>N/A</div>
diff --git a/tools/obscuroscan_v3/frontend/src/components/modules/dashboard/index.tsx b/tools/obscuroscan_v3/frontend/src/components/modules/dashboard/index.tsx
index a9faeac6b5..ed13bd8c5f 100644
--- a/tools/obscuroscan_v3/frontend/src/components/modules/dashboard/index.tsx
+++ b/tools/obscuroscan_v3/frontend/src/components/modules/dashboard/index.tsx
@@ -39,7 +39,7 @@ export default function Dashboard() {
   const DASHBOARD_DATA = [
     {
       title: "Ether Price",
-      value: `$${price?.ethereum?.usd}` || "N/A",
+      value: price?.ethereum?.usd || "N/A",
       // TODO: add change
       // change: "+20.1%",
       icon: RocketIcon,
diff --git a/tools/obscuroscan_v3/frontend/src/components/modules/dashboard/recent-batches.tsx b/tools/obscuroscan_v3/frontend/src/components/modules/dashboard/recent-batches.tsx
index b839b5fe93..34c40547b0 100644
--- a/tools/obscuroscan_v3/frontend/src/components/modules/dashboard/recent-batches.tsx
+++ b/tools/obscuroscan_v3/frontend/src/components/modules/dashboard/recent-batches.tsx
@@ -1,10 +1,7 @@
-import { Button } from "@/src/components/ui/button";
 import TruncatedAddress from "../common/truncated-address";
 import { formatTimeAgo } from "@/src/lib/utils";
 import { Batch } from "@/src/types/interfaces/BatchInterfaces";
 import { Avatar, AvatarFallback } from "@/src/components/ui/avatar";
-import { EyeOpenIcon } from "@radix-ui/react-icons";
-import Link from "next/link";
 
 export function RecentBatches({ batches }: { batches: any }) {
   return (
@@ -15,7 +12,9 @@ export function RecentBatches({ batches }: { batches: any }) {
             <AvatarFallback>BN</AvatarFallback>
           </Avatar>
           <div className="ml-4 space-y-1">
-            <p className="text-sm font-medium leading-none">#{batch?.number}</p>
+            <p className="text-sm font-medium leading-none">
+              #{+batch?.number}
+            </p>
             <p className="text-sm text-muted-foreground word-break-all">
               {formatTimeAgo(batch?.timestamp)}
             </p>
diff --git a/tools/obscuroscan_v3/frontend/src/components/modules/dashboard/recent-blocks.tsx b/tools/obscuroscan_v3/frontend/src/components/modules/dashboard/recent-blocks.tsx
index f869bc720f..ef30f44956 100644
--- a/tools/obscuroscan_v3/frontend/src/components/modules/dashboard/recent-blocks.tsx
+++ b/tools/obscuroscan_v3/frontend/src/components/modules/dashboard/recent-blocks.tsx
@@ -13,7 +13,7 @@ export function RecentBlocks({ blocks }: { blocks: any }) {
           </Avatar>
           <div className="ml-4 space-y-1">
             <p className="text-sm font-medium leading-none">
-              #{block?.blockHeader?.number}
+              #{+block?.blockHeader?.number}
             </p>
             <p className="text-sm text-muted-foreground word-break-all">
               {formatTimeAgo(block?.blockHeader?.timestamp)}
diff --git a/tools/obscuroscan_v3/frontend/src/components/modules/personal/columns.tsx b/tools/obscuroscan_v3/frontend/src/components/modules/personal/columns.tsx
index 0044e6eb24..466fbe8d59 100644
--- a/tools/obscuroscan_v3/frontend/src/components/modules/personal/columns.tsx
+++ b/tools/obscuroscan_v3/frontend/src/components/modules/personal/columns.tsx
@@ -1,47 +1,26 @@
 "use client";
 
 import { ColumnDef } from "@tanstack/react-table";
-import { Checkbox } from "@/src/components/ui/checkbox";
 import { Badge, badgeVariants } from "@/src/components/ui/badge";
 
-import { statuses } from "./data";
+import { statuses, types } from "./data";
 import { DataTableColumnHeader } from "../common/data-table/data-table-column-header";
-import { DataTableRowActions } from "../common/data-table/data-table-row-actions";
 import { PersonalTransactions } from "@/src/types/interfaces/TransactionInterfaces";
 import TruncatedAddress from "../common/truncated-address";
+import Link from "next/link";
+import { EyeOpenIcon } from "@radix-ui/react-icons";
 
 export const columns: ColumnDef<PersonalTransactions>[] = [
-  {
-    id: "select",
-    header: ({ table }) => (
-      <Checkbox
-        checked={table.getIsAllPageRowsSelected()}
-        onCheckedChange={(value) => table.toggleAllPageRowsSelected(!!value)}
-        aria-label="Select all"
-        className="translate-y-[2px]"
-      />
-    ),
-    cell: ({ row }) => (
-      <Checkbox
-        checked={row.getIsSelected()}
-        onCheckedChange={(value) => row.toggleSelected(!!value)}
-        aria-label="Select row"
-        className="translate-y-[2px]"
-      />
-    ),
-    enableSorting: false,
-    enableHiding: false,
-  },
   {
     accessorKey: "blockNumber",
     header: ({ column }) => (
-      <DataTableColumnHeader column={column} title="Block Number" />
+      <DataTableColumnHeader column={column} title="Ten Batch" />
     ),
     cell: ({ row }) => {
       return (
         <div className="flex space-x-2">
-          <span className="max-w-[500px] truncate font-medium">
-            {row.getValue("blockNumber")}
+          <span className="max-w-[500px] truncate">
+            {Number(row.getValue("blockNumber"))}
           </span>
         </div>
       );
@@ -49,7 +28,17 @@ export const columns: ColumnDef<PersonalTransactions>[] = [
     enableSorting: false,
     enableHiding: false,
   },
-
+  {
+    accessorKey: "blockHash",
+    header: ({ column }) => (
+      <DataTableColumnHeader column={column} title="Ten Batch Hash" />
+    ),
+    cell: ({ row }) => {
+      return <TruncatedAddress address={row.getValue("blockHash")} />;
+    },
+    enableSorting: false,
+    enableHiding: false,
+  },
   {
     accessorKey: "transactionHash",
     header: ({ column }) => (
@@ -69,8 +58,8 @@ export const columns: ColumnDef<PersonalTransactions>[] = [
     cell: ({ row }) => {
       return (
         <div className="flex space-x-2">
-          <span className="max-w-[500px] truncate font-medium">
-            {row.getValue("gasUsed")}
+          <span className="max-w-[500px] truncate">
+            {Number(row.getValue("gasUsed"))}
           </span>
         </div>
       );
@@ -79,21 +68,30 @@ export const columns: ColumnDef<PersonalTransactions>[] = [
     enableHiding: false,
   },
   {
-    accessorKey: "blockHash",
+    accessorKey: "type",
     header: ({ column }) => (
-      <DataTableColumnHeader column={column} title="Block Hash" />
+      <DataTableColumnHeader column={column} title="Type" />
     ),
     cell: ({ row }) => {
+      const type = types.find((type) => {
+        return type.value === row.getValue("type");
+      });
+
+      if (!type) {
+        return null;
+      }
+
       return (
-        <div className="flex space-x-2">
-          <span className="max-w-[500px] truncate font-medium">
-            {row.getValue("blockHash")}
-          </span>
+        <div className="flex items-center">
+          <Badge variant={type.variant as keyof typeof badgeVariants}>
+            {type.label}
+          </Badge>
         </div>
       );
     },
-    enableSorting: false,
-    enableHiding: false,
+    filterFn: (row, id, value) => {
+      return value.includes(row.getValue(id));
+    },
   },
   {
     accessorKey: "status",
@@ -102,7 +100,7 @@ export const columns: ColumnDef<PersonalTransactions>[] = [
     ),
     cell: ({ row }) => {
       const status = statuses.find(
-        (status) => status.value === row.getValue("Status")
+        (status) => status.value === row.getValue("status")
       );
 
       if (!status) {
@@ -124,8 +122,14 @@ export const columns: ColumnDef<PersonalTransactions>[] = [
       return value.includes(row.getValue(id));
     },
   },
-  {
-    id: "actions",
-    cell: ({ row }) => <DataTableRowActions row={row} labels={statuses} />,
-  },
+  // {
+  //   id: "actions",
+  //   cell: ({ row }) => {
+  //     return (
+  //       <Link href={`/batches/${row.original.hash}`}>
+  //         <EyeOpenIcon className="h-5 w-5 text-muted-foreground hover:text-primary transition-colors cursor-pointer" />
+  //       </Link>
+  //     );
+  //   },
+  // },
 ];
diff --git a/tools/obscuroscan_v3/frontend/src/components/modules/personal/data.tsx b/tools/obscuroscan_v3/frontend/src/components/modules/personal/data.tsx
index 869920edb1..a1797c82a9 100644
--- a/tools/obscuroscan_v3/frontend/src/components/modules/personal/data.tsx
+++ b/tools/obscuroscan_v3/frontend/src/components/modules/personal/data.tsx
@@ -2,23 +2,38 @@ import { CheckIcon, Cross2Icon } from "@radix-ui/react-icons";
 
 export const statuses = [
   {
-    value: "Success",
+    value: "0x1",
     label: "Success",
     icon: CheckIcon,
     variant: "success",
   },
   {
-    value: "Failure",
+    value: "0x0",
     label: "Failure",
     icon: Cross2Icon,
     variant: "destructive",
   },
 ];
 
-export const toolbar = [
+export const types = [
   {
-    column: "status",
-    title: "Status",
-    options: statuses,
+    value: "0x0",
+    label: "Legacy",
+    variant: "primary",
+  },
+  {
+    value: "0x1",
+    label: "Access List",
+    variant: "secondary",
+  },
+  {
+    value: "0x2",
+    label: "Dynamic Fee",
+    variant: "outline",
+  },
+  {
+    value: "0x3",
+    label: "Blob",
+    variant: "outline",
   },
 ];
diff --git a/tools/obscuroscan_v3/frontend/src/components/modules/personal/index.tsx b/tools/obscuroscan_v3/frontend/src/components/modules/personal/index.tsx
index 103dfcbe88..473b0334b4 100644
--- a/tools/obscuroscan_v3/frontend/src/components/modules/personal/index.tsx
+++ b/tools/obscuroscan_v3/frontend/src/components/modules/personal/index.tsx
@@ -2,11 +2,21 @@ import React from "react";
 import { columns } from "@/src/components/modules/personal/columns";
 import { DataTable } from "@/src/components/modules/common/data-table/data-table";
 import { useTransactionsService } from "@/src/services/useTransactionsService";
-import { toolbar } from "./data";
 import { Skeleton } from "@/src/components/ui/skeleton";
 
 export default function PersonalTransactions() {
-  const { personalTxns, personalTxnsLoading } = useTransactionsService();
+  const { personalTxns, setNoPolling, personalTxnsLoading } =
+    useTransactionsService();
+  const { Receipts, Total } = personalTxns || {
+    Receipts: [],
+    Total: 0,
+  };
+
+  React.useEffect(() => {
+    setNoPolling(true);
+    return () => setNoPolling(false);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
 
   return (
     <>
@@ -16,19 +26,14 @@ export default function PersonalTransactions() {
             Personal Transactions
           </h2>
           <p className="text-muted-foreground">
-            A table of personal transactions.
+            {Total} personal transaction(s).
           </p>
         </div>
       </div>
       {personalTxnsLoading ? (
         <Skeleton className="h-96" />
-      ) : personalTxns?.Results ? (
-        <DataTable
-          columns={columns}
-          data={personalTxns?.Results}
-          toolbar={toolbar}
-          total={personalTxns?.Total}
-        />
+      ) : Receipts ? (
+        <DataTable columns={columns} data={Receipts} total={Total} />
       ) : (
         <p>No transactions found.</p>
       )}
diff --git a/tools/obscuroscan_v3/frontend/src/components/modules/transactions/columns.tsx b/tools/obscuroscan_v3/frontend/src/components/modules/transactions/columns.tsx
index 1b2274129b..e27cb0d590 100644
--- a/tools/obscuroscan_v3/frontend/src/components/modules/transactions/columns.tsx
+++ b/tools/obscuroscan_v3/frontend/src/components/modules/transactions/columns.tsx
@@ -1,37 +1,14 @@
 "use client";
 
 import { ColumnDef } from "@tanstack/react-table";
-import { Checkbox } from "@/src/components/ui/checkbox";
 import { Badge } from "@/src/components/ui/badge";
 
-import { labels, statuses } from "./constants";
+import { statuses } from "./constants";
 import { DataTableColumnHeader } from "../common/data-table/data-table-column-header";
-import { DataTableRowActions } from "../common/data-table/data-table-row-actions";
 import { Transaction } from "@/src/types/interfaces/TransactionInterfaces";
 import TruncatedAddress from "../common/truncated-address";
 
 export const columns: ColumnDef<Transaction>[] = [
-  {
-    id: "select",
-    header: ({ table }) => (
-      <Checkbox
-        checked={table.getIsAllPageRowsSelected()}
-        onCheckedChange={(value) => table.toggleAllPageRowsSelected(!!value)}
-        aria-label="Select all"
-        className="translate-y-[2px]"
-      />
-    ),
-    cell: ({ row }) => (
-      <Checkbox
-        checked={row.getIsSelected()}
-        onCheckedChange={(value) => row.toggleSelected(!!value)}
-        aria-label="Select row"
-        className="translate-y-[2px]"
-      />
-    ),
-    enableSorting: false,
-    enableHiding: false,
-  },
   {
     accessorKey: "BatchHeight",
     header: ({ column }) => (
@@ -40,7 +17,7 @@ export const columns: ColumnDef<Transaction>[] = [
     cell: ({ row }) => {
       return (
         <div className="flex space-x-2">
-          <span className="max-w-[500px] truncate font-medium">
+          <span className="max-w-[500px] truncate">
             {row.getValue("BatchHeight")}
           </span>
         </div>
@@ -88,8 +65,4 @@ export const columns: ColumnDef<Transaction>[] = [
       return value.includes(row.getValue(id));
     },
   },
-  {
-    id: "actions",
-    cell: ({ row }) => <DataTableRowActions row={row} labels={labels} />,
-  },
 ];
diff --git a/tools/obscuroscan_v3/frontend/src/components/providers/wallet-provider.tsx b/tools/obscuroscan_v3/frontend/src/components/providers/wallet-provider.tsx
index fb9e73531a..f7772769b9 100644
--- a/tools/obscuroscan_v3/frontend/src/components/providers/wallet-provider.tsx
+++ b/tools/obscuroscan_v3/frontend/src/components/providers/wallet-provider.tsx
@@ -4,7 +4,8 @@ import {
   WalletConnectionContextType,
   WalletConnectionProviderProps,
 } from "@/src/types/interfaces/WalletInterfaces";
-import { useToast } from "../ui/use-toast";
+import { showToast } from "../ui/use-toast";
+import { ToastType } from "@/src/types/interfaces";
 
 const WalletConnectionContext =
   createContext<WalletConnectionContextType | null>(null);
@@ -22,8 +23,6 @@ export const useWalletConnection = (): WalletConnectionContextType => {
 export const WalletConnectionProvider = ({
   children,
 }: WalletConnectionProviderProps) => {
-  const { toast } = useToast();
-
   const [walletConnected, setWalletConnected] = useState(false);
   const [walletAddress, setWalletAddress] = useState<string | null>(null);
   const [provider, setProvider] =
@@ -43,10 +42,16 @@ export const WalletConnectionProvider = ({
         setWalletAddress(address);
         setWalletConnected(true);
       } catch (error: any) {
-        toast({ description: "Error connecting to wallet:" + error.message });
+        showToast(
+          ToastType.DESTRUCTIVE,
+          "Error connecting to wallet:" + error.message
+        );
       }
     } else {
-      toast({ description: "No ethereum object found." });
+      showToast(
+        ToastType.DESTRUCTIVE,
+        "No ethereum object found. Please install MetaMask!"
+      );
     }
   };
 
@@ -63,7 +68,7 @@ export const WalletConnectionProvider = ({
     const ethereum = (window as any).ethereum;
     const handleAccountsChanged = (accounts: string[]) => {
       if (accounts.length === 0) {
-        toast({ description: "Please connect to MetaMask." });
+        showToast(ToastType.DESTRUCTIVE, "Please connect to MetaMask.");
       } else if (accounts[0] !== walletAddress) {
         setWalletAddress(accounts[0]);
       }
diff --git a/tools/obscuroscan_v3/frontend/src/components/ui/external-link.tsx b/tools/obscuroscan_v3/frontend/src/components/ui/external-link.tsx
new file mode 100644
index 0000000000..13366137ea
--- /dev/null
+++ b/tools/obscuroscan_v3/frontend/src/components/ui/external-link.tsx
@@ -0,0 +1,25 @@
+import { ExternalLinkIcon } from "@radix-ui/react-icons";
+import React from "react";
+
+const ExternalLink = ({
+  href,
+  children,
+  className,
+}: {
+  href: string;
+  children: React.ReactNode;
+  className?: string;
+}) => {
+  return (
+    <a
+      href={href}
+      target="_blank"
+      rel="noopener noreferrer"
+      className={`flex items-center hover:underline ${className}`}
+    >
+      {children} <ExternalLinkIcon className="inline-block h-4 w-4" />
+    </a>
+  );
+};
+
+export default ExternalLink;
diff --git a/tools/obscuroscan_v3/frontend/src/components/ui/toast.tsx b/tools/obscuroscan_v3/frontend/src/components/ui/toast.tsx
index 310e41b5a7..939d32b2cd 100644
--- a/tools/obscuroscan_v3/frontend/src/components/ui/toast.tsx
+++ b/tools/obscuroscan_v3/frontend/src/components/ui/toast.tsx
@@ -1,11 +1,11 @@
-import * as React from 'react'
-import * as ToastPrimitives from '@radix-ui/react-toast'
-import { cva, type VariantProps } from 'class-variance-authority'
-import { X } from 'lucide-react'
+import * as React from "react";
+import * as ToastPrimitives from "@radix-ui/react-toast";
+import { cva, type VariantProps } from "class-variance-authority";
+import { X } from "lucide-react";
 
-import { cn } from '@/src/lib/utils'
+import { cn } from "@/src/lib/utils";
 
-const ToastProvider = ToastPrimitives.Provider
+const ToastProvider = ToastPrimitives.Provider;
 
 const ToastViewport = React.forwardRef<
   React.ElementRef<typeof ToastPrimitives.Viewport>,
@@ -14,33 +14,37 @@ const ToastViewport = React.forwardRef<
   <ToastPrimitives.Viewport
     ref={ref}
     className={cn(
-      'fixed top-0 z-[100] flex max-h-screen w-full flex-col-reverse p-4 sm:bottom-0 sm:right-0 sm:top-auto sm:flex-col md:max-w-[420px]',
+      "fixed top-0 z-[100] flex max-h-screen w-full flex-col-reverse p-4 sm:bottom-0 sm:right-0 sm:top-auto sm:flex-col md:max-w-[420px]",
       className
     )}
     {...props}
   />
-))
-ToastViewport.displayName = ToastPrimitives.Viewport.displayName
+));
+ToastViewport.displayName = ToastPrimitives.Viewport.displayName;
 
 const toastVariants = cva(
-  'group pointer-events-auto relative flex w-full items-center justify-between space-x-4 overflow-hidden rounded-md border p-6 pr-8 shadow-lg transition-all data-[swipe=cancel]:translate-x-0 data-[swipe=end]:translate-x-[var(--radix-toast-swipe-end-x)] data-[swipe=move]:translate-x-[var(--radix-toast-swipe-move-x)] data-[swipe=move]:transition-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[swipe=end]:animate-out data-[state=closed]:fade-out-80 data-[state=closed]:slide-out-to-right-full data-[state=open]:slide-in-from-top-full data-[state=open]:sm:slide-in-from-bottom-full',
+  "group pointer-events-auto relative flex w-full items-center justify-between space-x-4 overflow-hidden rounded-md border p-6 pr-8 shadow-lg transition-all data-[swipe=cancel]:translate-x-0 data-[swipe=end]:translate-x-[var(--radix-toast-swipe-end-x)] data-[swipe=move]:translate-x-[var(--radix-toast-swipe-move-x)] data-[swipe=move]:transition-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[swipe=end]:animate-out data-[state=closed]:fade-out-80 data-[state=closed]:slide-out-to-right-full data-[state=open]:slide-in-from-top-full data-[state=open]:sm:slide-in-from-bottom-full",
   {
     variants: {
       variant: {
-        default: 'border bg-background text-foreground',
+        default: "border bg-background text-foreground",
+        info: "border-info bg-info text-info-foreground",
+        success: "border-success bg-success text-success-foreground",
+        warning: "border-warning bg-warning text-foreground",
         destructive:
-          'destructive group border-destructive bg-destructive text-destructive-foreground'
-      }
+          "destructive group border-destructive bg-destructive text-destructive-foreground",
+      },
     },
     defaultVariants: {
-      variant: 'default'
-    }
+      variant: "default",
+    },
   }
-)
+);
 
 const Toast = React.forwardRef<
   React.ElementRef<typeof ToastPrimitives.Root>,
-  React.ComponentPropsWithoutRef<typeof ToastPrimitives.Root> & VariantProps<typeof toastVariants>
+  React.ComponentPropsWithoutRef<typeof ToastPrimitives.Root> &
+    VariantProps<typeof toastVariants>
 >(({ className, variant, ...props }, ref) => {
   return (
     <ToastPrimitives.Root
@@ -48,9 +52,9 @@ const Toast = React.forwardRef<
       className={cn(toastVariants({ variant }), className)}
       {...props}
     />
-  )
-})
-Toast.displayName = ToastPrimitives.Root.displayName
+  );
+});
+Toast.displayName = ToastPrimitives.Root.displayName;
 
 const ToastAction = React.forwardRef<
   React.ElementRef<typeof ToastPrimitives.Action>,
@@ -59,13 +63,13 @@ const ToastAction = React.forwardRef<
   <ToastPrimitives.Action
     ref={ref}
     className={cn(
-      'inline-flex h-8 shrink-0 items-center justify-center rounded-md border bg-transparent px-3 text-sm font-medium ring-offset-background transition-colors hover:bg-secondary focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 group-[.destructive]:border-muted/40 group-[.destructive]:hover:border-destructive/30 group-[.destructive]:hover:bg-destructive group-[.destructive]:hover:text-destructive-foreground group-[.destructive]:focus:ring-destructive',
+      "inline-flex h-8 shrink-0 items-center justify-center rounded-md border bg-transparent px-3 text-sm font-medium ring-offset-background transition-colors hover:bg-secondary focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 group-[.destructive]:border-muted/40 group-[.destructive]:hover:border-destructive/30 group-[.destructive]:hover:bg-destructive group-[.destructive]:hover:text-destructive-foreground group-[.destructive]:focus:ring-destructive",
       className
     )}
     {...props}
   />
-))
-ToastAction.displayName = ToastPrimitives.Action.displayName
+));
+ToastAction.displayName = ToastPrimitives.Action.displayName;
 
 const ToastClose = React.forwardRef<
   React.ElementRef<typeof ToastPrimitives.Close>,
@@ -74,7 +78,7 @@ const ToastClose = React.forwardRef<
   <ToastPrimitives.Close
     ref={ref}
     className={cn(
-      'absolute right-2 top-2 rounded-md p-1 text-foreground/50 opacity-0 transition-opacity hover:text-foreground focus:opacity-100 focus:outline-none focus:ring-2 group-hover:opacity-100 group-[.destructive]:text-red-300 group-[.destructive]:hover:text-red-50 group-[.destructive]:focus:ring-red-400 group-[.destructive]:focus:ring-offset-red-600',
+      "absolute right-2 top-2 rounded-md p-1 text-foreground/50 opacity-0 transition-opacity hover:text-foreground focus:opacity-100 focus:outline-none focus:ring-2 group-hover:opacity-100 group-[.destructive]:text-red-300 group-[.destructive]:hover:text-red-50 group-[.destructive]:focus:ring-red-400 group-[.destructive]:focus:ring-offset-red-600",
       className
     )}
     toast-close=""
@@ -82,16 +86,20 @@ const ToastClose = React.forwardRef<
   >
     <X className="h-4 w-4" />
   </ToastPrimitives.Close>
-))
-ToastClose.displayName = ToastPrimitives.Close.displayName
+));
+ToastClose.displayName = ToastPrimitives.Close.displayName;
 
 const ToastTitle = React.forwardRef<
   React.ElementRef<typeof ToastPrimitives.Title>,
   React.ComponentPropsWithoutRef<typeof ToastPrimitives.Title>
 >(({ className, ...props }, ref) => (
-  <ToastPrimitives.Title ref={ref} className={cn('text-sm font-semibold', className)} {...props} />
-))
-ToastTitle.displayName = ToastPrimitives.Title.displayName
+  <ToastPrimitives.Title
+    ref={ref}
+    className={cn("text-sm font-semibold", className)}
+    {...props}
+  />
+));
+ToastTitle.displayName = ToastPrimitives.Title.displayName;
 
 const ToastDescription = React.forwardRef<
   React.ElementRef<typeof ToastPrimitives.Description>,
@@ -99,15 +107,15 @@ const ToastDescription = React.forwardRef<
 >(({ className, ...props }, ref) => (
   <ToastPrimitives.Description
     ref={ref}
-    className={cn('text-sm opacity-90', className)}
+    className={cn("text-sm opacity-90", className)}
     {...props}
   />
-))
-ToastDescription.displayName = ToastPrimitives.Description.displayName
+));
+ToastDescription.displayName = ToastPrimitives.Description.displayName;
 
-type ToastProps = React.ComponentPropsWithoutRef<typeof Toast>
+type ToastProps = React.ComponentPropsWithoutRef<typeof Toast>;
 
-type ToastActionElement = React.ReactElement<typeof ToastAction>
+type ToastActionElement = React.ReactElement<typeof ToastAction>;
 
 export {
   type ToastProps,
@@ -118,5 +126,5 @@ export {
   ToastTitle,
   ToastDescription,
   ToastClose,
-  ToastAction
-}
+  ToastAction,
+};
diff --git a/tools/obscuroscan_v3/frontend/src/components/ui/use-toast.ts b/tools/obscuroscan_v3/frontend/src/components/ui/use-toast.ts
index 64c5440f45..63d55fec10 100644
--- a/tools/obscuroscan_v3/frontend/src/components/ui/use-toast.ts
+++ b/tools/obscuroscan_v3/frontend/src/components/ui/use-toast.ts
@@ -186,4 +186,11 @@ function useToast() {
   };
 }
 
-export { useToast, toast };
+const showToast = (variant: ToastProps["variant"], description: string) => {
+  toast({
+    variant,
+    description,
+  });
+};
+
+export { useToast, toast, showToast };
diff --git a/tools/obscuroscan_v3/frontend/src/hooks/useCopy.ts b/tools/obscuroscan_v3/frontend/src/hooks/useCopy.ts
index 30dbdd1ebf..d64850b444 100644
--- a/tools/obscuroscan_v3/frontend/src/hooks/useCopy.ts
+++ b/tools/obscuroscan_v3/frontend/src/hooks/useCopy.ts
@@ -1,22 +1,25 @@
-import { useToast } from "@/src/components/ui/use-toast";
 import React from "react";
+import { showToast } from "../components/ui/use-toast";
+import { ToastType } from "../types/interfaces";
+import { RESET_COPIED_TIMEOUT } from "../lib/constants";
 
 export const useCopy = () => {
-  const { toast } = useToast();
   const [copied, setCopied] = React.useState(false);
-
-  const copyToClipboard = (text: string, name?: string) => {
-    copyText(text)
+  const copyToClipboard = (text: string, name?: string): Promise<void> => {
+    return copyText(text)
       .catch(() => fallbackCopyTextToClipboard(text))
       .then(() => {
-        toast({ description: `${name ? name : ""} Copied!` });
+        showToast(ToastType.SUCCESS, `${name ? name : "Copied!"}`);
         setCopied(true);
       })
       .catch(() => {
-        toast({ description: `Couldn't copy ${name ? name : "Text"}!!!` });
+        showToast(
+          ToastType.DESTRUCTIVE,
+          `Couldn't copy ${name ? name : "Text"}!!!`
+        );
       })
       .finally(() => {
-        setTimeout(() => setCopied(false), 1000);
+        setTimeout(() => setCopied(false), RESET_COPIED_TIMEOUT);
       });
   };
 
diff --git a/tools/obscuroscan_v3/frontend/src/lib/constants.ts b/tools/obscuroscan_v3/frontend/src/lib/constants.ts
index b19c6d955d..c4047556f2 100644
--- a/tools/obscuroscan_v3/frontend/src/lib/constants.ts
+++ b/tools/obscuroscan_v3/frontend/src/lib/constants.ts
@@ -2,12 +2,36 @@ export const socialLinks = {
   github: "https://github.com/ten-protocol",
   discord: "https://discord.gg/2JQ2Z3r",
   twitter: "https://twitter.com/tenprotocol",
+  twitterHandle: "@tenprotocol",
 };
 
 export const pollingInterval = 5000;
 export const maxRetries = 3;
 export const pricePollingInterval = 60 * 1000;
 
+export const RESET_COPIED_TIMEOUT = 2000;
+
+export const getOptions = (query: {
+  page?: string | string[];
+  size?: string | string[];
+}) => {
+  const offset =
+    query.page && query.size
+      ? (parseInt(query.page as string, 10) - 1) *
+        parseInt(query.size as string, 10)
+      : 0;
+  const options = {
+    offset: Number.isNaN(offset) ? 0 : offset,
+    size: Number.isNaN(parseInt(query.size as string, 10))
+      ? 10
+      : parseInt(query.size as string, 10),
+    // sort: query.sort ? (query.sort as string) : "blockNumber",
+    // order: query.order ? (query.order as string) : "desc",
+    // filter: query.filter ? (query.filter as string) : "",
+  };
+  return options;
+};
+
 export const version = process.env.NEXT_PUBLIC_FE_VERSION;
 export const apiHost = process.env.NEXT_PUBLIC_API_HOST;
 
diff --git a/tools/obscuroscan_v3/frontend/src/lib/siteMetadata.ts b/tools/obscuroscan_v3/frontend/src/lib/siteMetadata.ts
index 764fb271c4..f6c47dae6a 100644
--- a/tools/obscuroscan_v3/frontend/src/lib/siteMetadata.ts
+++ b/tools/obscuroscan_v3/frontend/src/lib/siteMetadata.ts
@@ -1,16 +1,16 @@
 import { socialLinks } from "./constants";
 
 export const siteMetadata = {
-  companyName: "Ten Scan",
+  companyName: "Tenscan",
   metaTitle:
     "Ten, a decentralized Layer 2 Rollup protocol designed to hyper-scale and encrypt the Ethereum blockchain.",
   description:
-    "Ten, a decentralized Ethereum Layer 2 Rollup protocol designed to hyper-scale, encrypt and prevent negative MEV on the Ethereum blockchain using Secure Enclaves and ZKPs.",
+    "Tenscan allows you to explore and search activities taking place on the Ten Layer 2 blockchain",
   siteUrl: "https://obscu.ro",
   siteLogo: ``,
   siteLogoSquare: ``,
   email: "team@obscu.ro",
   twitter: socialLinks.twitter,
-  twitterHandle: "@obscuronet",
+  twitterHandle: socialLinks.twitterHandle,
   github: socialLinks.github,
 };
diff --git a/tools/obscuroscan_v3/frontend/src/routes/index.ts b/tools/obscuroscan_v3/frontend/src/routes/index.ts
index 591c1ce19d..ebd6e29ecd 100644
--- a/tools/obscuroscan_v3/frontend/src/routes/index.ts
+++ b/tools/obscuroscan_v3/frontend/src/routes/index.ts
@@ -25,6 +25,10 @@ export const apiRoutes = {
   decryptEncryptedRollup: "/actions/decryptTxBlob/",
 };
 
+export const ethMethods = {
+  getStorageAt: "eth_getStorageAt",
+};
+
 export const NavLinks: NavLink[] = [
   {
     href: "/",
@@ -78,3 +82,8 @@ export const NavLinks: NavLink[] = [
     ],
   },
 ];
+
+export const externalLinks = {
+  // Dev and UAT environments don't have etherscan, hence, we're hardcoding this to just Sepolia
+  etherscanBlock: "https://sepolia.etherscan.io/block/",
+};
diff --git a/tools/obscuroscan_v3/frontend/src/services/useBatchesService.ts b/tools/obscuroscan_v3/frontend/src/services/useBatchesService.ts
index 49679c861b..06ebc2982a 100644
--- a/tools/obscuroscan_v3/frontend/src/services/useBatchesService.ts
+++ b/tools/obscuroscan_v3/frontend/src/services/useBatchesService.ts
@@ -1,6 +1,6 @@
 import { fetchBatches, fetchLatestBatch } from "@/api/batches";
 import { useQuery } from "@tanstack/react-query";
-import { pollingInterval } from "../lib/constants";
+import { getOptions, pollingInterval } from "../lib/constants";
 import { useState } from "react";
 import { useRouter } from "next/router";
 
@@ -9,10 +9,7 @@ export const useBatchesService = () => {
 
   const [noPolling, setNoPolling] = useState(false);
 
-  const options = {
-    offset: query.page ? parseInt(query.page as string) : 1,
-    size: query.size ? parseInt(query.size as string) : 10,
-  };
+  const options = getOptions(query);
 
   const {
     data: batches,
diff --git a/tools/obscuroscan_v3/frontend/src/services/useBlocksService.ts b/tools/obscuroscan_v3/frontend/src/services/useBlocksService.ts
index b849715f67..1af7f9458d 100644
--- a/tools/obscuroscan_v3/frontend/src/services/useBlocksService.ts
+++ b/tools/obscuroscan_v3/frontend/src/services/useBlocksService.ts
@@ -1,6 +1,6 @@
 import { fetchBlocks } from "@/api/blocks";
 import { useQuery } from "@tanstack/react-query";
-import { pollingInterval } from "../lib/constants";
+import { getOptions, pollingInterval } from "../lib/constants";
 import { useRouter } from "next/router";
 import { useState } from "react";
 
@@ -9,10 +9,7 @@ export const useBlocksService = () => {
 
   const [noPolling, setNoPolling] = useState(false);
 
-  const options = {
-    offset: query.page ? parseInt(query.page as string) : 1,
-    size: query.size ? parseInt(query.size as string) : 10,
-  };
+  const options = getOptions(query);
 
   const {
     data: blocks,
diff --git a/tools/obscuroscan_v3/frontend/src/services/useTransactionsService.ts b/tools/obscuroscan_v3/frontend/src/services/useTransactionsService.ts
index 9a2208ba8e..f51f7d7f79 100644
--- a/tools/obscuroscan_v3/frontend/src/services/useTransactionsService.ts
+++ b/tools/obscuroscan_v3/frontend/src/services/useTransactionsService.ts
@@ -6,14 +6,19 @@ import {
 import { useWalletConnection } from "@/src/components/providers/wallet-provider";
 import { useQuery } from "@tanstack/react-query";
 import { useEffect, useState } from "react";
-import { pollingInterval, pricePollingInterval } from "../lib/constants";
+import {
+  getOptions,
+  pollingInterval,
+  pricePollingInterval,
+} from "../lib/constants";
 import { PersonalTransactionsResponse } from "../types/interfaces/TransactionInterfaces";
-import { useToast } from "@/src/components/ui/use-toast";
 import { useRouter } from "next/router";
+import { showToast } from "../components/ui/use-toast";
+import { ToastType } from "../types/interfaces";
+import { ethMethods } from "../routes";
 
 export const useTransactionsService = () => {
   const { query } = useRouter();
-  const { toast } = useToast();
   const { walletAddress, provider } = useWalletConnection();
 
   const [personalTxnsLoading, setPersonalTxnsLoading] = useState(false);
@@ -27,13 +32,7 @@ export const useTransactionsService = () => {
 
   const [noPolling, setNoPolling] = useState(false);
 
-  const options = {
-    offset: query.page ? parseInt(query.page as string) : 1,
-    size: query.size ? parseInt(query.size as string) : 10,
-    // sort: query.sort ? (query.sort as string) : "blockNumber",
-    // order: query.order ? (query.order as string) : "desc",
-    // filter: query.filter ? (query.filter as string) : "",
-  };
+  const options = getOptions(query);
 
   const {
     data: transactions,
@@ -49,20 +48,20 @@ export const useTransactionsService = () => {
     useQuery({
       queryKey: ["transactionCount"],
       queryFn: () => fetchTransactionCount(),
-      refetchInterval: pollingInterval,
+      refetchInterval: noPolling ? false : pollingInterval,
     });
 
-  const personalTransactions = async (payload?: {
-    pagination: { offset: number; size: number };
-  }) => {
+  const personalTransactions = async () => {
     try {
       setPersonalTxnsLoading(true);
       if (provider) {
         const requestPayload = {
           address: walletAddress,
-          ...payload,
+          pagination: {
+            ...options,
+          },
         };
-        const personalTxData = await provider.send("eth_getStorageAt", [
+        const personalTxData = await provider.send(ethMethods.getStorageAt, [
           "listPersonalTransactions",
           requestPayload,
           null,
@@ -70,9 +69,10 @@ export const useTransactionsService = () => {
         setPersonalTxns(personalTxData);
       }
     } catch (error) {
-      toast({
-        description: "Error fetching personal transactions",
-      });
+      console.error("Error fetching personal transactions:", error);
+      setPersonalTxns(undefined);
+      showToast(ToastType.DESTRUCTIVE, "Error fetching personal transactions");
+      throw error;
     } finally {
       setPersonalTxnsLoading(false);
     }
diff --git a/tools/obscuroscan_v3/frontend/src/types/interfaces/TransactionInterfaces.ts b/tools/obscuroscan_v3/frontend/src/types/interfaces/TransactionInterfaces.ts
index eacedb1055..8f3eca5ad9 100644
--- a/tools/obscuroscan_v3/frontend/src/types/interfaces/TransactionInterfaces.ts
+++ b/tools/obscuroscan_v3/frontend/src/types/interfaces/TransactionInterfaces.ts
@@ -22,15 +22,25 @@ export type TransactionResponse = {
 };
 
 export type PersonalTransactionsResponse = {
-  Results: PersonalTransactions[];
+  Receipts: PersonalTransactions[];
   Total: number;
 };
 
+export type TransactionType = 0x0 | 0x1 | 0x2 | 0x3;
+
 export type PersonalTransactions = {
   id: number;
   blockNumber: string;
   transactionHash: string;
-  status: "Success" | "Failed";
+  status: string;
   gasUsed: string;
   blockHash: string;
+  contractAddress: string;
+  cumulativeGasUsed: string;
+  effectiveGasPrice: string;
+  logs: any[];
+  logsBloom: string;
+  root: string;
+  transactionIndex: string;
+  type: TransactionType;
 };
diff --git a/tools/obscuroscan_v3/frontend/src/types/interfaces/index.ts b/tools/obscuroscan_v3/frontend/src/types/interfaces/index.ts
index 6ffaec20a8..5f626114df 100644
--- a/tools/obscuroscan_v3/frontend/src/types/interfaces/index.ts
+++ b/tools/obscuroscan_v3/frontend/src/types/interfaces/index.ts
@@ -70,3 +70,11 @@ export type NavLink = {
   isExternal?: boolean;
   subNavLinks?: NavLink[];
 };
+
+export enum ToastType {
+  INFO = "info",
+  SUCCESS = "success",
+  WARNING = "warning",
+  DESTRUCTIVE = "destructive",
+  DEFAULT = "default",
+}