diff --git a/tools/tenscan/frontend/pages/batch/txs/[fullHash].tsx b/tools/tenscan/frontend/pages/batch/txs/[hash].tsx
similarity index 66%
rename from tools/tenscan/frontend/pages/batch/txs/[fullHash].tsx
rename to tools/tenscan/frontend/pages/batch/txs/[hash].tsx
index 805d969d9c..4de42bc959 100644
--- a/tools/tenscan/frontend/pages/batch/txs/[fullHash].tsx
+++ b/tools/tenscan/frontend/pages/batch/txs/[hash].tsx
@@ -14,15 +14,17 @@ import {
 import { useQuery } from "@tanstack/react-query";
 import { useRouter } from "next/router";
 import { getOptions } from "../../../src/lib/constants";
+import { pathToUrl } from "@/src/routes/router";
+import { pageLinks } from "@/src/routes";
 
 export default function BatchTransactions() {
   const router = useRouter();
-  const { fullHash } = router.query;
+  const { hash } = router.query;
   const options = getOptions(router.query);
 
   const { data, isLoading, refetch } = useQuery({
-    queryKey: ["batchTransactions", { fullHash, options }],
-    queryFn: () => fetchBatchTransactions(fullHash as string, options),
+    queryKey: ["batchTransactions", { hash, options }],
+    queryFn: () => fetchBatchTransactions(hash as string, options),
   });
 
   const { TransactionsData, Total } = data?.result || {
@@ -35,14 +37,20 @@ export default function BatchTransactions() {
       <Card className="col-span-3">
         <CardHeader>
           <CardTitle>Transactions</CardTitle>
-          <CardDescription className="flex items-center space-x-2">
-            <p>Overview of all transactions in this batch:</p>
-            <TruncatedAddress
-              address={fullHash as string}
-              showCopy={false}
-              link={"/batch/" + fullHash}
-            />
-          </CardDescription>
+          <div className="flex space-x-2 wrap">
+            <CardDescription className="flex items-center space-x-2">
+              <span>
+                Overview of all transactions in this batch:
+                <TruncatedAddress
+                  address={hash as string}
+                  showCopy={false}
+                  link={pathToUrl(pageLinks.batchByHash, {
+                    hash: hash as string,
+                  })}
+                />
+              </span>
+            </CardDescription>
+          </div>
         </CardHeader>
         <CardContent>
           <DataTable
diff --git a/tools/tenscan/frontend/pages/batches/index.tsx b/tools/tenscan/frontend/pages/batches/index.tsx
index bb842127db..318460b4d6 100644
--- a/tools/tenscan/frontend/pages/batches/index.tsx
+++ b/tools/tenscan/frontend/pages/batches/index.tsx
@@ -15,22 +15,12 @@ export const metadata: Metadata = {
 };
 
 export default function Batches() {
-  const { batches, refetchBatches, isBatchesLoading, setNoPolling } =
-    useBatchesService();
+  const { batches, refetchBatches, isBatchesLoading } = useBatchesService();
   const { BatchesData, Total } = batches?.result || {
     BatchesData: [],
     Total: 0,
   };
 
-  React.useEffect(() => {
-    setNoPolling(true);
-
-    return () => {
-      setNoPolling(false);
-    };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
   const firstBatchHeight = Number(getItem(BatchesData, "height"));
   const lastBatchHeight = Number(
     getItem(BatchesData, "height", ItemPosition.LAST)
diff --git a/tools/tenscan/frontend/pages/blocks/index.tsx b/tools/tenscan/frontend/pages/blocks/index.tsx
index 996df2b082..4383266fe3 100644
--- a/tools/tenscan/frontend/pages/blocks/index.tsx
+++ b/tools/tenscan/frontend/pages/blocks/index.tsx
@@ -15,19 +15,12 @@ export const metadata: Metadata = {
 };
 
 export default function Blocks() {
-  const { blocks, setNoPolling, refetchBlocks, isBlocksLoading } =
-    useBlocksService();
+  const { blocks, refetchBlocks, isBlocksLoading } = useBlocksService();
   const { BlocksData, Total } = blocks?.result || {
     BlocksData: [],
     Total: 0,
   };
 
-  React.useEffect(() => {
-    setNoPolling(true);
-    return () => setNoPolling(false);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
   const firstBlockNumber = Number(getItem(BlocksData, "blockHeader.number"));
   const lastBlockNumber = Number(
     getItem(BlocksData, "blockHeader.number", ItemPosition.LAST)
diff --git a/tools/tenscan/frontend/pages/tx/personal/[hash].tsx b/tools/tenscan/frontend/pages/personal/tx/[hash].tsx
similarity index 100%
rename from tools/tenscan/frontend/pages/tx/personal/[hash].tsx
rename to tools/tenscan/frontend/pages/personal/tx/[hash].tsx
diff --git a/tools/tenscan/frontend/pages/rollups/index.tsx b/tools/tenscan/frontend/pages/rollups/index.tsx
index c41fb0ae67..7d8b6a19d1 100644
--- a/tools/tenscan/frontend/pages/rollups/index.tsx
+++ b/tools/tenscan/frontend/pages/rollups/index.tsx
@@ -15,22 +15,12 @@ export const metadata: Metadata = {
 };
 
 export default function Rollups() {
-  const { rollups, setNoPolling, isRollupsLoading, refetchRollups } =
-    useRollupsService();
+  const { rollups, isRollupsLoading, refetchRollups } = useRollupsService();
   const { RollupsData, Total } = rollups?.result || {
     RollupsData: [],
     Total: 0,
   };
 
-  React.useEffect(() => {
-    setNoPolling(true);
-
-    return () => {
-      setNoPolling(false);
-    };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
   const firstRollupID = Number(getItem(RollupsData, "ID"));
   const lastRollupID = Number(getItem(RollupsData, "ID", ItemPosition.LAST));
 
diff --git a/tools/tenscan/frontend/pages/transactions/index.tsx b/tools/tenscan/frontend/pages/transactions/index.tsx
index aba6a98503..5225b70d3d 100644
--- a/tools/tenscan/frontend/pages/transactions/index.tsx
+++ b/tools/tenscan/frontend/pages/transactions/index.tsx
@@ -15,26 +15,13 @@ export const metadata: Metadata = {
 };
 
 export default function Transactions() {
-  const {
-    transactions,
-    refetchTransactions,
-    setNoPolling,
-    isTransactionsLoading,
-  } = useTransactionsService();
+  const { transactions, refetchTransactions, isTransactionsLoading } =
+    useTransactionsService();
   const { TransactionsData, Total } = transactions?.result || {
     TransactionsData: [],
     Total: 0,
   };
 
-  React.useEffect(() => {
-    setNoPolling(true);
-
-    return () => {
-      setNoPolling(false);
-    };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
   const firstBatchHeight = getItem(TransactionsData, "BatchHeight");
   const lastBatchHeight = getItem(
     TransactionsData,
diff --git a/tools/tenscan/frontend/src/components/health-indicator.tsx b/tools/tenscan/frontend/src/components/health-indicator.tsx
index 20ee4deb24..c522ac2a5d 100644
--- a/tools/tenscan/frontend/src/components/health-indicator.tsx
+++ b/tools/tenscan/frontend/src/components/health-indicator.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import { Badge, badgeVariants } from "@repo/ui/components/shared/badge";
 import { useGeneralService } from "../services/useGeneralService";
-import { BarChart } from "lucide-react";
+import { BarChart } from "@repo/ui/components/shared/react-icons";
 import {
   TooltipProvider,
   TooltipTrigger,
diff --git a/tools/tenscan/frontend/src/components/layouts/header.tsx b/tools/tenscan/frontend/src/components/layouts/header.tsx
index c76b5f193f..b473e027c5 100644
--- a/tools/tenscan/frontend/src/components/layouts/header.tsx
+++ b/tools/tenscan/frontend/src/components/layouts/header.tsx
@@ -19,7 +19,6 @@ export default function Header() {
             width={150}
             height={40}
             className="cursor-pointer dark:hidden"
-            fetchPriority="auto"
           />
           <Image
             src="/assets/images/white_logotype.png"
@@ -27,7 +26,6 @@ export default function Header() {
             width={150}
             height={40}
             className="cursor-pointer hidden dark:block"
-            fetchPriority="auto"
           />
         </Link>
         <div className="hidden md:flex items-center space-x-2">
diff --git a/tools/tenscan/frontend/src/components/modules/batches/batch-hash-details.tsx b/tools/tenscan/frontend/src/components/modules/batches/batch-hash-details.tsx
index 6dd9d2e57c..159d9b146d 100644
--- a/tools/tenscan/frontend/src/components/modules/batches/batch-hash-details.tsx
+++ b/tools/tenscan/frontend/src/components/modules/batches/batch-hash-details.tsx
@@ -1,11 +1,15 @@
+import { useMemo, useState } from "react";
 import { Separator } from "@repo/ui/components/shared/separator";
 import TruncatedAddress from "@repo/ui/components/common/truncated-address";
 import KeyValueItem, {
   KeyValueList,
 } from "@repo/ui/components/shared/key-value";
-import { formatNumber, formatTimeAgo } from "@repo/ui/lib/utils";
+import {
+  formatNumber,
+  formatTimeAgo,
+  formatTimestampToDate,
+} from "@repo/ui/lib/utils";
 import { Badge } from "@repo/ui/components/shared/badge";
-import { BatchDetails } from "@/src/types/interfaces/BatchInterfaces";
 import Link from "next/link";
 import {
   EyeClosedIcon,
@@ -15,13 +19,15 @@ import { Button } from "@repo/ui/components/shared/button";
 import Copy from "@repo/ui/components/common/copy";
 import { useRollupsService } from "@/src/services/useRollupsService";
 import JSONPretty from "react-json-pretty";
-import { useState } from "react";
 import {
   Tooltip,
   TooltipContent,
   TooltipProvider,
   TooltipTrigger,
 } from "@repo/ui/components/shared/tooltip";
+import { pathToUrl } from "@/src/routes/router";
+import { pageLinks } from "@/src/routes";
+import { BatchDetails } from "@/src/types/interfaces/BatchInterfaces";
 
 export function BatchHashDetailsComponent({
   batchDetails,
@@ -31,6 +37,31 @@ export function BatchHashDetailsComponent({
   const { decryptedRollup, decryptEncryptedData } = useRollupsService();
   const [showDecryptedData, setShowDecryptedData] = useState(false);
 
+  const transactionHashes = useMemo(
+    () =>
+      batchDetails?.TxHashes.length > 0 ? (
+        <ul>
+          {batchDetails.TxHashes.map((txHash, index) => (
+            <li key={index} className="text-sm">
+              <TruncatedAddress
+                address={txHash}
+                link={pathToUrl(pageLinks.txByHash, { hash: txHash })}
+                showFullLength
+              />
+            </li>
+          ))}
+        </ul>
+      ) : (
+        "-"
+      ),
+    [batchDetails?.TxHashes]
+  );
+
+  const handleDecryptToggle = () => {
+    decryptEncryptedData({ StrData: batchDetails?.EncryptedTxBlob });
+    setShowDecryptedData(!showDecryptedData);
+  };
+
   return (
     <div className="space-y-8">
       <KeyValueList>
@@ -38,7 +69,9 @@ export function BatchHashDetailsComponent({
           label="Batch Height"
           value={
             <Link
-              href={`/batch/height/${Number(batchDetails?.Header?.number)}`}
+              href={pathToUrl(pageLinks.batchByHeight, {
+                height: +batchDetails?.Header?.number,
+              })}
               className="text-primary"
             >
               {"#" + Number(batchDetails?.Header?.number)}
@@ -47,47 +80,75 @@ export function BatchHashDetailsComponent({
         />
         <KeyValueItem
           label="Hash"
-          value={<TruncatedAddress address={batchDetails?.Header?.hash} />}
+          value={
+            <TruncatedAddress
+              address={batchDetails?.Header?.hash}
+              showFullLength
+            />
+          }
         />
         <KeyValueItem
           label="Parent Hash"
           value={
-            <TruncatedAddress address={batchDetails?.Header?.parentHash} />
+            <TruncatedAddress
+              address={batchDetails?.Header?.parentHash}
+              showFullLength
+            />
           }
         />
         <KeyValueItem
           label="State Root"
-          value={<TruncatedAddress address={batchDetails?.Header?.stateRoot} />}
+          value={
+            <TruncatedAddress
+              address={batchDetails?.Header?.stateRoot}
+              showFullLength
+            />
+          }
         />
         <KeyValueItem
           label="Transactions Root"
           value={
             <TruncatedAddress
               address={batchDetails?.Header?.transactionsRoot}
+              showFullLength
             />
           }
         />
         <KeyValueItem
           label="Receipts Root"
           value={
-            <TruncatedAddress address={batchDetails?.Header?.receiptsRoot} />
+            <TruncatedAddress
+              address={batchDetails?.Header?.receiptsRoot}
+              showFullLength
+            />
           }
         />
         <KeyValueItem
           label="Timestamp"
           value={
-            <Badge variant={"secondary"}>
-              {formatTimeAgo(batchDetails?.Header?.timestamp)}
+            <Badge variant="secondary">
+              {formatTimeAgo(batchDetails?.Header?.timestamp) +
+                " - " +
+                formatTimestampToDate(batchDetails?.Header?.timestamp)}
             </Badge>
           }
         />
         <KeyValueItem
           label="L1 Proof"
-          value={<TruncatedAddress address={batchDetails?.Header?.l1Proof} />}
+          value={
+            <TruncatedAddress
+              address={batchDetails?.Header?.l1Proof}
+              showFullLength
+            />
+          }
         />
         <KeyValueItem
           label="Gas Limit"
-          value={formatNumber(batchDetails?.Header?.gasLimit)}
+          value={
+            <Badge variant="secondary">
+              {formatNumber(batchDetails?.Header?.gasLimit)}
+            </Badge>
+          }
         />
         <KeyValueItem
           label="Gas Used"
@@ -95,13 +156,18 @@ export function BatchHashDetailsComponent({
         />
         <KeyValueItem
           label="Base Fee Per Gas"
-          value={batchDetails?.Header?.baseFeePerGas || "-"}
+          value={
+            <Badge variant="secondary">
+              {formatNumber(batchDetails?.Header?.baseFeePerGas)}
+            </Badge>
+          }
         />
         <KeyValueItem
           label="Inbound Cross Chain Hash"
           value={
             <TruncatedAddress
               address={batchDetails?.Header?.inboundCrossChainHash}
+              showFullLength
             />
           }
         />
@@ -111,73 +177,54 @@ export function BatchHashDetailsComponent({
         />
         <KeyValueItem
           label="Miner"
-          value={<TruncatedAddress address={batchDetails?.Header?.miner} />}
-        />
-        <KeyValueItem
-          label="Base Fee Per Gas"
-          value={formatNumber(batchDetails?.Header?.baseFeePerGas)}
-          isLastItem
+          value={
+            <TruncatedAddress
+              address={batchDetails?.Header?.miner}
+              showFullLength
+            />
+          }
         />
-      </KeyValueList>
-      <Separator />
-      <KeyValueList>
+
         <KeyValueItem
           label="Transaction Hashes"
-          value={
-            batchDetails?.TxHashes ? (
-              <ul>
-                {batchDetails?.TxHashes?.map((txHash, index) => (
-                  <li key={index} className="text-sm">
-                    <TruncatedAddress address={txHash} link={`/tx/${txHash}`} />
-                  </li>
-                ))}
-              </ul>
-            ) : (
-              "-"
-            )
-          }
+          value={transactionHashes}
           isLastItem
         />
       </KeyValueList>
+
       <Separator />
+
       <KeyValueList>
         <KeyValueItem
           label="Encrypted Tx Blob"
           value={
             <>
               <div className="flex items-center space-x-2">
-                <TruncatedAddress address={batchDetails?.EncryptedTxBlob} />{" "}
+                <TruncatedAddress address={batchDetails?.EncryptedTxBlob} />
                 <Button
                   className="text-sm font-bold leading-none hover:text-primary hover:bg-transparent"
                   variant="ghost"
-                  onClick={() => {
-                    decryptEncryptedData({
-                      StrData: batchDetails?.EncryptedTxBlob,
-                    });
-                    setShowDecryptedData(!showDecryptedData);
-                  }}
+                  onClick={handleDecryptToggle}
                 >
-                  {showDecryptedData && decryptedRollup ? (
-                    <TooltipProvider>
-                      <Tooltip>
-                        <TooltipTrigger>
+                  <TooltipProvider>
+                    <Tooltip>
+                      <TooltipTrigger>
+                        {showDecryptedData ? (
                           <EyeClosedIcon className="h-5 w-5 text-muted-foreground hover:text-primary transition-colors cursor-pointer ml-2" />
-                        </TooltipTrigger>
-                        <TooltipContent>Hide Encrypted Data</TooltipContent>
-                      </Tooltip>
-                    </TooltipProvider>
-                  ) : (
-                    <TooltipProvider>
-                      <Tooltip>
-                        <TooltipTrigger>
+                        ) : (
                           <EyeOpenIcon className="h-5 w-5 text-muted-foreground hover:text-primary transition-colors cursor-pointer ml-2" />
-                        </TooltipTrigger>
-                        <TooltipContent>Show Encrypted Data</TooltipContent>
-                      </Tooltip>
-                    </TooltipProvider>
-                  )}
+                        )}
+                      </TooltipTrigger>
+                      <TooltipContent>
+                        {showDecryptedData
+                          ? "Hide Encrypted Data"
+                          : "Show Encrypted Data"}
+                      </TooltipContent>
+                    </Tooltip>
+                  </TooltipProvider>
                 </Button>
-                {showDecryptedData && decryptedRollup ? (
+
+                {showDecryptedData && decryptedRollup && (
                   <TooltipProvider>
                     <Tooltip>
                       <TooltipTrigger>
@@ -188,14 +235,14 @@ export function BatchHashDetailsComponent({
                       </TooltipContent>
                     </Tooltip>
                   </TooltipProvider>
-                ) : null}
+                )}
               </div>
-              {decryptedRollup && showDecryptedData ? (
+              {showDecryptedData && decryptedRollup && (
                 <>
                   <Separator className="my-4" />
                   <JSONPretty id="json-pretty" data={decryptedRollup} />
                 </>
-              ) : null}
+              )}
             </>
           }
           isLastItem
diff --git a/tools/tenscan/frontend/src/components/modules/batches/batch-height-details.tsx b/tools/tenscan/frontend/src/components/modules/batches/batch-height-details.tsx
index 81f37e3c28..4c58f4654f 100644
--- a/tools/tenscan/frontend/src/components/modules/batches/batch-height-details.tsx
+++ b/tools/tenscan/frontend/src/components/modules/batches/batch-height-details.tsx
@@ -3,7 +3,11 @@ import TruncatedAddress from "@repo/ui/components/common/truncated-address";
 import KeyValueItem, {
   KeyValueList,
 } from "@repo/ui/components/shared/key-value";
-import { formatNumber, formatTimeAgo } from "@repo/ui/lib/utils";
+import {
+  formatNumber,
+  formatTimeAgo,
+  formatTimestampToDate,
+} from "@repo/ui/lib/utils";
 import { Badge } from "@repo/ui/components/shared/badge";
 import { Batch } from "@/src/types/interfaces/BatchInterfaces";
 import Link from "next/link";
@@ -14,13 +18,15 @@ import {
 import { Button } from "@repo/ui/components/shared/button";
 import { useRollupsService } from "@/src/services/useRollupsService";
 import JSONPretty from "react-json-pretty";
-import { useState } from "react";
+import React, { useState } from "react";
 import {
   Tooltip,
   TooltipContent,
   TooltipProvider,
   TooltipTrigger,
 } from "@repo/ui/components/shared/tooltip";
+import { pageLinks } from "@/src/routes";
+import { pathToUrl } from "@/src/routes/router";
 
 export function BatchHeightDetailsComponent({
   batchDetails,
@@ -46,45 +52,67 @@ export function BatchHeightDetailsComponent({
           value={
             <TruncatedAddress
               address={batchDetails?.header?.hash}
-              link={`/batch/${batchDetails?.header?.hash}`}
+              link={pathToUrl(pageLinks.batchByHash, {
+                hash: batchDetails?.header?.hash,
+              })}
+              showFullLength
             />
           }
         />
         <KeyValueItem
           label="Parent Hash"
           value={
-            <TruncatedAddress address={batchDetails?.header?.parentHash} />
+            <TruncatedAddress
+              address={batchDetails?.header?.parentHash}
+              showFullLength
+            />
           }
         />
         <KeyValueItem
           label="State Root"
-          value={<TruncatedAddress address={batchDetails?.header?.stateRoot} />}
+          value={
+            <TruncatedAddress
+              address={batchDetails?.header?.stateRoot}
+              showFullLength
+            />
+          }
         />
         <KeyValueItem
           label="Transactions Root"
           value={
             <TruncatedAddress
               address={batchDetails?.header?.transactionsRoot}
+              showFullLength
             />
           }
         />
         <KeyValueItem
           label="Receipts Root"
           value={
-            <TruncatedAddress address={batchDetails?.header?.receiptsRoot} />
+            <TruncatedAddress
+              address={batchDetails?.header?.receiptsRoot}
+              showFullLength
+            />
           }
         />
         <KeyValueItem
           label="Timestamp"
           value={
             <Badge variant={"secondary"}>
-              {formatTimeAgo(batchDetails?.header?.timestamp)}
+              {formatTimeAgo(batchDetails?.header?.timestamp) +
+                " - " +
+                formatTimestampToDate(batchDetails?.header?.timestamp)}
             </Badge>
           }
         />
         <KeyValueItem
           label="L1 Proof"
-          value={<TruncatedAddress address={batchDetails?.header?.l1Proof} />}
+          value={
+            <TruncatedAddress
+              address={batchDetails?.header?.l1Proof}
+              showFullLength
+            />
+          }
         />
         <KeyValueItem
           label="Gas Limit"
@@ -111,6 +139,7 @@ export function BatchHeightDetailsComponent({
           value={
             <TruncatedAddress
               address={batchDetails?.header?.inboundCrossChainHash}
+              showFullLength
             />
           }
         />
@@ -120,7 +149,12 @@ export function BatchHeightDetailsComponent({
         />
         <KeyValueItem
           label="Miner"
-          value={<TruncatedAddress address={batchDetails?.header?.miner} />}
+          value={
+            <TruncatedAddress
+              address={batchDetails?.header?.miner}
+              showFullLength
+            />
+          }
         />
         <KeyValueItem
           label="Base Fee Per Gas"
@@ -133,12 +167,21 @@ export function BatchHeightDetailsComponent({
         <KeyValueItem
           label="No. of Transactions"
           value={
-            <Link
-              href={`/batch/txs/${batchDetails?.header?.hash}`}
-              className="text-primary"
-            >
-              {batchDetails?.txCount || "-"}
-            </Link>
+            batchDetails?.txCount > 0 ? (
+              <span>
+                {batchDetails?.txCount}{" "}
+                <Link
+                  href={pathToUrl(pageLinks.batchTransactions, {
+                    hash: batchDetails?.header?.hash,
+                  })}
+                  className="underline text-primary"
+                >
+                  View
+                </Link>
+              </span>
+            ) : (
+              batchDetails?.txCount || "-"
+            )
           }
           isLastItem
         />
diff --git a/tools/tenscan/frontend/src/components/modules/batches/columns.tsx b/tools/tenscan/frontend/src/components/modules/batches/columns.tsx
index bcfbd09e29..721d15b5b2 100644
--- a/tools/tenscan/frontend/src/components/modules/batches/columns.tsx
+++ b/tools/tenscan/frontend/src/components/modules/batches/columns.tsx
@@ -8,6 +8,8 @@ import { formatNumber, formatTimeAgo } from "@repo/ui/lib/utils";
 import { Batch } from "@/src/types/interfaces/BatchInterfaces";
 import Link from "next/link";
 import { Badge } from "@repo/ui/components/shared/badge";
+import { pathToUrl } from "@/src/routes/router";
+import { pageLinks } from "@/src/routes";
 
 export const columns: ColumnDef<Batch>[] = [
   {
@@ -19,7 +21,9 @@ export const columns: ColumnDef<Batch>[] = [
       return (
         <div className="flex space-x-2">
           <Link
-            href={`/batch/height/${row.original.height}`}
+            href={pathToUrl(pageLinks.batchByHeight, {
+              height: row.original.height,
+            })}
             className="text-primary"
           >
             <span className="max-w-[500px] truncate">
@@ -98,7 +102,9 @@ export const columns: ColumnDef<Batch>[] = [
       return (
         <TruncatedAddress
           address={row.original.header.hash}
-          link={`/batch/${row.original.fullHash}`}
+          link={pathToUrl(pageLinks.batchByHash, {
+            hash: row.original.header.hash,
+          })}
         />
       );
     },
@@ -124,7 +130,9 @@ export const columns: ColumnDef<Batch>[] = [
     cell: ({ row }) => {
       return (
         <Link
-          href={`/rollup/batch/sequence/${row.original.sequence}`}
+          href={pathToUrl(pageLinks.rollupByBatchSequence, {
+            sequence: row.original.sequence,
+          })}
           className="text-primary"
         >
           {row.original.sequence}
@@ -140,13 +148,17 @@ export const columns: ColumnDef<Batch>[] = [
       <DataTableColumnHeader column={column} title="Tx Count" />
     ),
     cell: ({ row }) => {
-      return (
+      return row.original.txCount > 0 ? (
         <Link
-          href={`/batch/txs/${row.original.fullHash}`}
+          href={pathToUrl(pageLinks.batchTransactions, {
+            hash: row.original.fullHash,
+          })}
           className="text-primary"
         >
           {row.original.txCount}
         </Link>
+      ) : (
+        <span>{row.original.txCount}</span>
       );
     },
     enableSorting: false,
diff --git a/tools/tenscan/frontend/src/components/modules/batches/transaction-columns.tsx b/tools/tenscan/frontend/src/components/modules/batches/transaction-columns.tsx
index 760a7aaaa8..5ce0aa849b 100644
--- a/tools/tenscan/frontend/src/components/modules/batches/transaction-columns.tsx
+++ b/tools/tenscan/frontend/src/components/modules/batches/transaction-columns.tsx
@@ -8,6 +8,8 @@ import { Transaction } from "@/src/types/interfaces/TransactionInterfaces";
 import TruncatedAddress from "@repo/ui/components/common/truncated-address";
 import { formatTimeAgo } from "@repo/ui/lib/utils";
 import Link from "next/link";
+import { pathToUrl } from "@/src/routes/router";
+import { pageLinks } from "@/src/routes";
 
 export const columns: ColumnDef<Transaction>[] = [
   {
@@ -37,7 +39,9 @@ export const columns: ColumnDef<Transaction>[] = [
       return (
         <TruncatedAddress
           address={row.getValue("TransactionHash")}
-          link={`/tx/${row.original.TransactionHash}`}
+          link={pathToUrl(pageLinks.txByHash, {
+            hash: row.original.TransactionHash,
+          })}
         />
       );
     },
diff --git a/tools/tenscan/frontend/src/components/modules/blocks/columns.tsx b/tools/tenscan/frontend/src/components/modules/blocks/columns.tsx
index c9cb165a6f..b7b04e657a 100644
--- a/tools/tenscan/frontend/src/components/modules/blocks/columns.tsx
+++ b/tools/tenscan/frontend/src/components/modules/blocks/columns.tsx
@@ -8,8 +8,9 @@ import TruncatedAddress from "@repo/ui/components/common/truncated-address";
 import { formatNumber, formatTimeAgo } from "@repo/ui/lib/utils";
 import { Badge } from "@repo/ui/components/shared/badge";
 import ExternalLink from "@repo/ui/components/shared/external-link";
-import { externalLinks } from "@/src/routes";
+import { externalPageLinks, pageLinks } from "@/src/routes";
 import { EyeOpenIcon } from "@repo/ui/components/shared/react-icons";
+import { pathToUrl } from "@/src/routes/router";
 
 export const columns: ColumnDef<Block>[] = [
   {
@@ -62,7 +63,9 @@ export const columns: ColumnDef<Block>[] = [
       ) : (
         <TruncatedAddress
           address={row.original.rollupHash}
-          link={`/rollup/${row.original.rollupHash}`}
+          link={pathToUrl(pageLinks.rollupByHash, {
+            hash: row.original.rollupHash,
+          })}
         />
       );
     },
@@ -152,7 +155,9 @@ export const columns: ColumnDef<Block>[] = [
       const blockHeader = row.original.blockHeader as BlockHeader;
       return (
         <ExternalLink
-          href={`${externalLinks.etherscanBlock}${blockHeader?.hash}`}
+          href={pathToUrl(externalPageLinks.etherscanBlock, {
+            hash: blockHeader?.hash,
+          })}
         >
           <EyeOpenIcon className="h-5 w-5 text-muted-foreground hover:text-primary transition-colors cursor-pointer mr-2" />
         </ExternalLink>
diff --git a/tools/tenscan/frontend/src/components/modules/dashboard/index.tsx b/tools/tenscan/frontend/src/components/modules/dashboard/index.tsx
index 7f839b2474..7726b6e769 100644
--- a/tools/tenscan/frontend/src/components/modules/dashboard/index.tsx
+++ b/tools/tenscan/frontend/src/components/modules/dashboard/index.tsx
@@ -30,6 +30,7 @@ import { BlocksIcon } from "@repo/ui/components/shared/react-icons";
 import { useRollupsService } from "@/src/services/useRollupsService";
 import { RecentRollups } from "./recent-rollups";
 import { DashboardAnalyticsData } from "@/src/types/interfaces";
+import { pageLinks } from "@/src/routes";
 
 interface RecentData {
   title: string;
@@ -46,10 +47,29 @@ export default function Dashboard() {
     transactions,
     transactionCount,
     isTransactionCountLoading,
+    setNoPolling: setNoPollingTransactions,
   } = useTransactionsService();
   const { contractCount, isContractCountLoading } = useContractsService();
-  const { batches, latestBatch, isLatestBatchLoading } = useBatchesService();
-  const { rollups } = useRollupsService();
+  const {
+    batches,
+    latestBatch,
+    isLatestBatchLoading,
+    setNoPolling: setNoPollingBatches,
+  } = useBatchesService();
+  const { rollups, setNoPolling: setNoPollingRollups } = useRollupsService();
+
+  React.useEffect(() => {
+    setNoPollingTransactions(false);
+    setNoPollingBatches(false);
+    setNoPollingRollups(false);
+
+    return () => {
+      setNoPollingTransactions(true);
+      setNoPollingBatches(true);
+      setNoPollingRollups(true);
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
 
   const DASHBOARD_DATA = [
     {
@@ -118,21 +138,21 @@ export default function Dashboard() {
       title: "Recent Rollups",
       data: rollups,
       component: <RecentRollups rollups={rollups} />,
-      goTo: "/rollups",
+      goTo: pageLinks.rollups,
       className: "col-span-1 md:col-span-2 lg:col-span-3",
     },
     {
       title: "Recent Batches",
       data: batches,
       component: <RecentBatches batches={batches} />,
-      goTo: "/batches",
+      goTo: pageLinks.batches,
       className: "col-span-1 md:col-span-2 lg:col-span-3",
     },
     {
       title: "Recent Transactions",
       data: transactions,
       component: <RecentTransactions transactions={transactions} />,
-      goTo: "/transactions",
+      goTo: pageLinks.transactions,
       className: "col-span-1 md:col-span-2 lg:col-span-3",
     },
   ];
diff --git a/tools/tenscan/frontend/src/components/modules/dashboard/recent-batches.tsx b/tools/tenscan/frontend/src/components/modules/dashboard/recent-batches.tsx
index 635a4ddc35..510ba09cae 100644
--- a/tools/tenscan/frontend/src/components/modules/dashboard/recent-batches.tsx
+++ b/tools/tenscan/frontend/src/components/modules/dashboard/recent-batches.tsx
@@ -3,6 +3,8 @@ import { formatTimeAgo } from "@repo/ui/lib/utils";
 import { Batch } from "@/src/types/interfaces/BatchInterfaces";
 import { Avatar, AvatarFallback } from "@repo/ui/components/shared/avatar";
 import Link from "next/link";
+import { pathToUrl } from "@/src/routes/router";
+import { pageLinks } from "@/src/routes";
 
 export function RecentBatches({ batches }: { batches: any }) {
   return (
@@ -15,7 +17,9 @@ export function RecentBatches({ batches }: { batches: any }) {
           <div className="ml-4 space-y-1">
             <p className="text-sm font-medium leading-none">
               <Link
-                href={`/batch/height/${batch?.height}`}
+                href={pathToUrl(pageLinks.batchByHeight, {
+                  height: batch?.height.toString(),
+                })}
                 className="text-primary"
               >
                 #{Number(batch?.height)}
@@ -28,7 +32,9 @@ export function RecentBatches({ batches }: { batches: any }) {
           <div className="ml-auto font-medium min-w-[140px]">
             <TruncatedAddress
               address={batch?.header?.hash}
-              link={`/batch/${batch?.header?.hash}`}
+              link={pathToUrl(pageLinks.batchByHash, {
+                hash: batch?.header?.hash,
+              })}
             />
           </div>
         </div>
diff --git a/tools/tenscan/frontend/src/components/modules/dashboard/recent-rollups.tsx b/tools/tenscan/frontend/src/components/modules/dashboard/recent-rollups.tsx
index 2deb54cce6..1c1dd93dec 100644
--- a/tools/tenscan/frontend/src/components/modules/dashboard/recent-rollups.tsx
+++ b/tools/tenscan/frontend/src/components/modules/dashboard/recent-rollups.tsx
@@ -2,6 +2,8 @@ import TruncatedAddress from "@repo/ui/components/common/truncated-address";
 import { formatTimeAgo } from "@repo/ui/lib/utils";
 import { Avatar, AvatarFallback } from "@repo/ui/components/shared/avatar";
 import { Rollup } from "@/src/types/interfaces/RollupInterfaces";
+import { pathToUrl } from "@/src/routes/router";
+import { pageLinks } from "@/src/routes";
 
 export function RecentRollups({ rollups }: { rollups: any }) {
   return (
@@ -22,7 +24,7 @@ export function RecentRollups({ rollups }: { rollups: any }) {
           <div className="ml-auto font-medium min-w-[140px]">
             <TruncatedAddress
               address={rollup?.Hash}
-              link={`/rollup/${rollup?.Hash}`}
+              link={pathToUrl(pageLinks.rollupByHash, { hash: rollup?.Hash })}
             />
           </div>
         </div>
diff --git a/tools/tenscan/frontend/src/components/modules/dashboard/recent-transactions.tsx b/tools/tenscan/frontend/src/components/modules/dashboard/recent-transactions.tsx
index 63a90645d7..e94fc1b00d 100644
--- a/tools/tenscan/frontend/src/components/modules/dashboard/recent-transactions.tsx
+++ b/tools/tenscan/frontend/src/components/modules/dashboard/recent-transactions.tsx
@@ -4,6 +4,8 @@ import { Transaction } from "@/src/types/interfaces/TransactionInterfaces";
 import { Badge } from "@repo/ui/components/shared/badge";
 import { formatTimeAgo } from "@repo/ui/lib/utils";
 import Link from "next/link";
+import { pathToUrl } from "@/src/routes/router";
+import { pageLinks } from "@/src/routes";
 
 export function RecentTransactions({ transactions }: { transactions: any }) {
   return (
@@ -18,7 +20,9 @@ export function RecentTransactions({ transactions }: { transactions: any }) {
               <p className="text-sm font-medium leading-none">
                 <span className="text-muted-foreground">Batch </span>
                 <Link
-                  href={`/batch/height/${transaction?.BatchHeight}`}
+                  href={pathToUrl(pageLinks.batchByHeight, {
+                    height: transaction?.BatchHeight,
+                  })}
                   className="text-primary"
                 >
                   #{Number(transaction?.BatchHeight)}
@@ -31,7 +35,9 @@ export function RecentTransactions({ transactions }: { transactions: any }) {
             <div className="ml-auto font-medium">
               <TruncatedAddress
                 address={transaction?.TransactionHash}
-                link={`/tx/${transaction?.TransactionHash}`}
+                link={pathToUrl(pageLinks.txByHash, {
+                  hash: transaction?.TransactionHash,
+                })}
               />
             </div>
             <div className="ml-auto">
diff --git a/tools/tenscan/frontend/src/components/modules/personal/columns.tsx b/tools/tenscan/frontend/src/components/modules/personal/columns.tsx
index c6fc4fe06c..9dda107e44 100644
--- a/tools/tenscan/frontend/src/components/modules/personal/columns.tsx
+++ b/tools/tenscan/frontend/src/components/modules/personal/columns.tsx
@@ -8,8 +8,9 @@ import { DataTableColumnHeader } from "@repo/ui/components/common/data-table/dat
 import { PersonalTransactions } from "../../..//types/interfaces/TransactionInterfaces";
 import TruncatedAddress from "@repo/ui/components/common/truncated-address";
 import { formatNumber } from "@repo/ui/lib/utils";
+import { pathToUrl } from "@/src/routes/router";
+import { pageLinks } from "@/src/routes";
 import Link from "next/link";
-import { EyeOpenIcon } from "@repo/ui/components/shared/react-icons";
 
 export const columns: ColumnDef<PersonalTransactions>[] = [
   {
@@ -19,11 +20,16 @@ export const columns: ColumnDef<PersonalTransactions>[] = [
     ),
     cell: ({ row }) => {
       return (
-        <div className="flex space-x-2">
+        <Link
+          href={pathToUrl(pageLinks.batchByHeight, {
+            height: Number(row.getValue("blockNumber")),
+          })}
+          className="text-primary"
+        >
           <span className="max-w-[500px] truncate">
             #{Number(row.getValue("blockNumber"))}
           </span>
-        </div>
+        </Link>
       );
     },
     enableSorting: false,
@@ -35,7 +41,14 @@ export const columns: ColumnDef<PersonalTransactions>[] = [
       <DataTableColumnHeader column={column} title="TEN Batch Hash" />
     ),
     cell: ({ row }) => {
-      return <TruncatedAddress address={row.getValue("blockHash")} />;
+      return (
+        <TruncatedAddress
+          address={row.getValue("blockHash")}
+          link={pathToUrl(pageLinks.batchByHash, {
+            hash: row.original.blockHash,
+          })}
+        />
+      );
     },
     enableSorting: false,
     enableHiding: false,
@@ -46,7 +59,14 @@ export const columns: ColumnDef<PersonalTransactions>[] = [
       <DataTableColumnHeader column={column} title="Transaction Hash" />
     ),
     cell: ({ row }) => {
-      return <TruncatedAddress address={row.getValue("transactionHash")} />;
+      return (
+        <TruncatedAddress
+          address={row.getValue("transactionHash")}
+          link={pathToUrl(pageLinks.personalTxByHash, {
+            hash: row.original.transactionHash,
+          })}
+        />
+      );
     },
     enableSorting: false,
     enableHiding: false,
@@ -125,14 +145,4 @@ export const columns: ColumnDef<PersonalTransactions>[] = [
       return value.includes(row.getValue(id));
     },
   },
-  {
-    id: "actions",
-    cell: ({ row }) => {
-      return (
-        <Link href={`/tx/personal/${row.original.transactionHash}`}>
-          <EyeOpenIcon className="h-5 w-5 text-muted-foreground hover:text-primary transition-colors cursor-pointer" />
-        </Link>
-      );
-    },
-  },
 ];
diff --git a/tools/tenscan/frontend/src/components/modules/personal/index.tsx b/tools/tenscan/frontend/src/components/modules/personal/index.tsx
index ba4a899736..948c0e4722 100644
--- a/tools/tenscan/frontend/src/components/modules/personal/index.tsx
+++ b/tools/tenscan/frontend/src/components/modules/personal/index.tsx
@@ -4,22 +4,12 @@ import { DataTable } from "@repo/ui/components/common/data-table/data-table";
 import { useTransactionsService } from "@/src/services/useTransactionsService";
 
 export default function PersonalTransactions() {
-  const { personalTxns, setNoPolling, personalTxnsLoading } =
-    useTransactionsService();
+  const { personalTxns, 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 (
     <>
       <div className="flex items-center justify-between space-y-2">
diff --git a/tools/tenscan/frontend/src/components/modules/personal/personal-txn-details.tsx b/tools/tenscan/frontend/src/components/modules/personal/personal-txn-details.tsx
index e4cd75306c..0e33d3225e 100644
--- a/tools/tenscan/frontend/src/components/modules/personal/personal-txn-details.tsx
+++ b/tools/tenscan/frontend/src/components/modules/personal/personal-txn-details.tsx
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useState } from "react";
 import KeyValueItem, {
   KeyValueList,
 } from "@repo/ui/components/shared/key-value";
@@ -7,16 +7,21 @@ import {
   TransactionReceipt,
   TransactionType,
 } from "../../../types/interfaces/TransactionInterfaces";
-import Link from "next/link";
 import TruncatedAddress from "@repo/ui/components/common/truncated-address";
 import { Badge } from "@repo/ui/components/shared/badge";
 import { BadgeType } from "@repo/ui/lib/enums/badge";
+import { Button } from "@repo/ui/components/shared/button";
+import { pathToUrl } from "@/src/routes/router";
+import { pageLinks } from "@/src/routes";
 
 export function PersonalTxnDetailsComponent({
   transactionDetails,
 }: {
   transactionDetails: TransactionReceipt;
 }) {
+  const [logsExpanded, setLogsExpanded] = useState(false);
+  const toggleLogs = () => setLogsExpanded(!logsExpanded);
+
   const getTransactionType = (type: TransactionType) => {
     switch (type) {
       case PersonalTransactionType.Legacy:
@@ -33,14 +38,16 @@ export function PersonalTxnDetailsComponent({
   };
 
   return (
-    <div className="space-y-8">
+    <div className="space-y-8 p-6">
       <KeyValueList>
         <KeyValueItem
           label="From"
           value={
             <TruncatedAddress
               address={transactionDetails?.from}
-              link={`/address/${transactionDetails?.from}`}
+              link={pathToUrl(pageLinks.address, {
+                address: transactionDetails?.from,
+              })}
             />
           }
         />
@@ -49,14 +56,16 @@ export function PersonalTxnDetailsComponent({
           value={
             <TruncatedAddress
               address={transactionDetails?.to}
-              link={`/address/${transactionDetails?.to}`}
+              link={pathToUrl(pageLinks.address, {
+                address: transactionDetails?.to,
+              })}
             />
           }
         />
         <KeyValueItem
           label="Transaction Index"
           value={
-            <Badge variant={"outline"}>
+            <Badge variant="outline">
               {Number(transactionDetails?.transactionIndex)}
             </Badge>
           }
@@ -64,13 +73,7 @@ export function PersonalTxnDetailsComponent({
         <KeyValueItem
           label="Transaction Type"
           value={
-            <Badge
-              variant={
-                transactionDetails?.type
-                  ? BadgeType.SUCCESS
-                  : BadgeType.DESTRUCTIVE
-              }
-            >
+            <Badge variant={BadgeType.SECONDARY}>
               {getTransactionType(transactionDetails?.type)}
             </Badge>
           }
@@ -89,27 +92,26 @@ export function PersonalTxnDetailsComponent({
             </Badge>
           }
         />
-
         <KeyValueItem
           label="Block Number"
           value={
-            <Link href={`/block/${transactionDetails?.blockNumber}`}>
+            <Badge variant="outline">
               {Number(transactionDetails?.blockNumber)}
-            </Link>
+            </Badge>
           }
         />
         <KeyValueItem
           label="Gas Used"
           value={
-            <Badge variant={"outline"}>
-              {Number(transactionDetails?.gasUsed)}{" "}
+            <Badge variant="outline">
+              {Number(transactionDetails?.gasUsed)}
             </Badge>
           }
         />
         <KeyValueItem
           label="Cumulative Gas Used"
           value={
-            <Badge variant={"outline"}>
+            <Badge variant="outline">
               {Number(transactionDetails?.cumulativeGasUsed)}
             </Badge>
           }
@@ -117,7 +119,7 @@ export function PersonalTxnDetailsComponent({
         <KeyValueItem
           label="Effective Gas Price"
           value={
-            <Badge variant={"outline"}>
+            <Badge variant="outline">
               {Number(transactionDetails?.effectiveGasPrice)}
             </Badge>
           }
@@ -133,10 +135,7 @@ export function PersonalTxnDetailsComponent({
         <KeyValueItem
           label="Contract Address"
           value={
-            <TruncatedAddress
-              address={transactionDetails?.contractAddress}
-              link={`/address/${transactionDetails?.contractAddress}`}
-            />
+            <TruncatedAddress address={transactionDetails?.contractAddress} />
           }
         />
         <KeyValueItem
@@ -144,88 +143,108 @@ export function PersonalTxnDetailsComponent({
           value={
             <TruncatedAddress
               address={transactionDetails?.transactionHash}
-              link={`/tx/${transactionDetails?.transactionHash}`}
+              link={pathToUrl(pageLinks.txByHash, {
+                hash: transactionDetails?.transactionHash,
+              })}
             />
           }
         />
-
         <KeyValueItem
           label="Logs"
           value={
             transactionDetails?.logs.length > 0 ? (
               <div className="space-y-4">
-                {transactionDetails?.logs.map((log, index) => (
-                  <div key={index}>
-                    <KeyValueList>
-                      <KeyValueItem
-                        label="Address"
-                        value={<TruncatedAddress address={log.address} />}
-                      />
-                      <KeyValueItem
-                        label="Block Hash"
-                        value={<TruncatedAddress address={log.blockHash} />}
-                      />
-                      <KeyValueItem
-                        label="Block Number"
-                        value={Number(log.blockNumber)}
-                      />
-                      <KeyValueItem
-                        label="Data"
-                        value={<TruncatedAddress address={log.data} />}
-                      />
-                      <KeyValueItem label="Log Index" value={log.logIndex} />
-                      <KeyValueItem
-                        label="Removed"
-                        value={
-                          <Badge
-                            variant={
-                              log.removed
-                                ? BadgeType.DESTRUCTIVE
-                                : BadgeType.SUCCESS
+                <Button
+                  variant={"link"}
+                  onClick={toggleLogs}
+                  className="underline"
+                >
+                  {logsExpanded
+                    ? `Hide Logs (${transactionDetails.logs.length})`
+                    : `Show Logs (${transactionDetails.logs.length})`}
+                </Button>
+                {logsExpanded && (
+                  <div className="space-y-4 p-4 rounded-md">
+                    {transactionDetails?.logs.map((log, index) => (
+                      <div
+                        key={index}
+                        className="p-4 border border-gray-700 rounded-lg space-y-2"
+                      >
+                        <KeyValueList>
+                          <KeyValueItem
+                            label="Address"
+                            value={<TruncatedAddress address={log.address} />}
+                          />
+                          <KeyValueItem
+                            label="Block Hash"
+                            value={<TruncatedAddress address={log.blockHash} />}
+                          />
+                          <KeyValueItem
+                            label="Block Number"
+                            value={Number(log.blockNumber)}
+                          />
+                          <KeyValueItem
+                            label="Data"
+                            value={<TruncatedAddress address={log.data} />}
+                          />
+                          <KeyValueItem
+                            label="Log Index"
+                            value={log.logIndex}
+                          />
+                          <KeyValueItem
+                            label="Removed"
+                            value={
+                              <Badge
+                                variant={
+                                  log.removed
+                                    ? BadgeType.DESTRUCTIVE
+                                    : BadgeType.SUCCESS
+                                }
+                              >
+                                {log.removed ? "Yes" : "No"}
+                              </Badge>
                             }
-                          >
-                            {log.removed ? "Yes" : "No"}
-                          </Badge>
-                        }
-                      />
-                      <KeyValueItem
-                        label="Topics"
-                        value={
-                          <div className="space-y-4">
-                            {log.topics.map((topic, index) => (
-                              <div key={index}>
-                                <KeyValueItem
-                                  value={<TruncatedAddress address={topic} />}
-                                />
+                          />
+                          <KeyValueItem
+                            label="Topics"
+                            value={
+                              <div className="space-y-2">
+                                {log.topics.map((topic, index) => (
+                                  <div key={index}>
+                                    <TruncatedAddress address={topic} />
+                                  </div>
+                                ))}
                               </div>
-                            ))}
-                          </div>
-                        }
-                      />
-                      <KeyValueItem
-                        label="Transaction Hash"
-                        value={
-                          <TruncatedAddress
-                            address={log.transactionHash}
-                            link={`/tx/${log.transactionHash}`}
+                            }
+                          />
+                          <KeyValueItem
+                            label="Transaction Hash"
+                            value={
+                              <TruncatedAddress
+                                address={log.transactionHash}
+                                link={pathToUrl(pageLinks.txByHash, {
+                                  hash: log.transactionHash,
+                                })}
+                              />
+                            }
+                          />
+                          <KeyValueItem
+                            label="Transaction Index"
+                            value={
+                              <Badge variant="outline">
+                                {Number(transactionDetails?.transactionIndex)}
+                              </Badge>
+                            }
+                            isLastItem
                           />
-                        }
-                      />
-                      <KeyValueItem
-                        label="Transaction Index"
-                        value={
-                          <Badge variant={"outline"}>
-                            {Number(transactionDetails?.transactionIndex)}
-                          </Badge>
-                        }
-                        isLastItem
-                      />
-                    </KeyValueList>
+                        </KeyValueList>
+                      </div>
+                    ))}
                   </div>
-                ))}
+                )}
               </div>
             ) : (
-              "No logs found"
+              "No logs found."
             )
           }
           isLastItem
diff --git a/tools/tenscan/frontend/src/components/modules/rollups/columns.tsx b/tools/tenscan/frontend/src/components/modules/rollups/columns.tsx
index 37355e3d2a..429f4d6066 100644
--- a/tools/tenscan/frontend/src/components/modules/rollups/columns.tsx
+++ b/tools/tenscan/frontend/src/components/modules/rollups/columns.tsx
@@ -7,6 +7,8 @@ import { formatTimeAgo } from "@repo/ui/lib/utils";
 import Link from "next/link";
 import { EyeOpenIcon } from "@repo/ui/components/shared/react-icons";
 import { Rollup } from "@/src/types/interfaces/RollupInterfaces";
+import { pathToUrl } from "@/src/routes/router";
+import { pageLinks } from "@/src/routes";
 
 export const columns: ColumnDef<Rollup>[] = [
   {
@@ -33,10 +35,9 @@ export const columns: ColumnDef<Rollup>[] = [
       return (
         <TruncatedAddress
           address={row.getValue("Hash")}
-          link={{
-            pathname: "/rollup/[hash]/batches",
-            query: { hash: row.getValue("Hash") },
-          }}
+          link={pathToUrl(pageLinks.rollupBatches, {
+            hash: row.getValue("Hash"),
+          })}
         />
       );
     },
@@ -80,7 +81,9 @@ export const columns: ColumnDef<Rollup>[] = [
       return (
         <div className="flex space-x-2">
           <Link
-            href={`/rollup/batch/sequence/${row.original.FirstSeq}`}
+            href={pathToUrl(pageLinks.rollupByBatchSequence, {
+              sequence: row.original.FirstSeq,
+            })}
             className="text-primary"
           >
             <span className="max-w-[500px] truncate">
@@ -102,7 +105,9 @@ export const columns: ColumnDef<Rollup>[] = [
       return (
         <div className="flex space-x-2">
           <Link
-            href={`/rollup/batch/sequence/${row.original.LastSeq}`}
+            href={pathToUrl(pageLinks.rollupByBatchSequence, {
+              sequence: row.original.LastSeq,
+            })}
             className="text-primary"
           >
             <span className="max-w-[500px] truncate">
@@ -119,7 +124,9 @@ export const columns: ColumnDef<Rollup>[] = [
     id: "actions",
     cell: ({ row }) => {
       return (
-        <Link href={`/rollup/${row.original.Hash}`}>
+        <Link
+          href={pathToUrl(pageLinks.rollupByHash, { hash: row.original.Hash })}
+        >
           <EyeOpenIcon className="h-5 w-5 text-muted-foreground hover:text-primary transition-colors cursor-pointer" />
         </Link>
       );
diff --git a/tools/tenscan/frontend/src/components/modules/rollups/rollup-details.tsx b/tools/tenscan/frontend/src/components/modules/rollups/rollup-details.tsx
index 2d6ae19fc1..239c6082c4 100644
--- a/tools/tenscan/frontend/src/components/modules/rollups/rollup-details.tsx
+++ b/tools/tenscan/frontend/src/components/modules/rollups/rollup-details.tsx
@@ -2,9 +2,12 @@ import TruncatedAddress from "@repo/ui/components/common/truncated-address";
 import KeyValueItem, {
   KeyValueList,
 } from "@repo/ui/components/shared/key-value";
-import { formatTimeAgo } from "@repo/ui/lib/utils";
+import { formatTimeAgo, formatTimestampToDate } from "@repo/ui/lib/utils";
 import Link from "next/link";
 import { Rollup } from "@/src/types/interfaces/RollupInterfaces";
+import { pathToUrl } from "@/src/routes/router";
+import { pageLinks } from "@/src/routes";
+import { Badge } from "@repo/ui/components/shared/badge";
 
 export function RollupDetailsComponent({
   rollupDetails,
@@ -17,14 +20,23 @@ export function RollupDetailsComponent({
         <KeyValueItem label="ID" value={"#" + Number(rollupDetails?.ID)} />
         <KeyValueItem
           label="Timestamp"
-          value={formatTimeAgo(rollupDetails?.Timestamp)}
+          value={
+            <Badge variant="outline">
+              {formatTimeAgo(rollupDetails?.Timestamp) +
+                " - " +
+                formatTimestampToDate(rollupDetails?.Timestamp)}
+            </Badge>
+          }
         />
         <KeyValueItem
           label="Full Hash"
           value={
             <TruncatedAddress
               address={rollupDetails?.Hash}
-              link={`/rollup/${rollupDetails?.Hash}`}
+              link={pathToUrl(pageLinks.rollupByHash, {
+                hash: rollupDetails?.Hash,
+              })}
+              showFullLength
             />
           }
         />
@@ -33,19 +45,26 @@ export function RollupDetailsComponent({
           value={
             <TruncatedAddress
               address={rollupDetails?.Header?.hash}
-              link={`/rollup/${rollupDetails?.Header?.hash}`}
+              link={pathToUrl(pageLinks.rollupByHash, {
+                hash: rollupDetails?.Header?.hash,
+              })}
+              showFullLength
             />
           }
         />
         <KeyValueItem
           label="L1 Hash"
-          value={<TruncatedAddress address={rollupDetails?.L1Hash} />}
+          value={
+            <TruncatedAddress address={rollupDetails?.L1Hash} showFullLength />
+          }
         />
         <KeyValueItem
           label="First Batch Seq No."
           value={
             <Link
-              href={`/rollup/batch/sequence/${rollupDetails?.FirstSeq}`}
+              href={pathToUrl(pageLinks.rollupByBatchSequence, {
+                sequence: rollupDetails?.FirstSeq,
+              })}
               className="text-primary"
             >
               {"#" + rollupDetails?.FirstSeq}
@@ -56,7 +75,9 @@ export function RollupDetailsComponent({
           label="Last Batch Seq No."
           value={
             <Link
-              href={`/rollup/batch/sequence/${rollupDetails?.LastSeq}`}
+              href={pathToUrl(pageLinks.rollupByBatchSequence, {
+                sequence: rollupDetails?.LastSeq,
+              })}
               className="text-primary"
             >
               {"#" + rollupDetails?.LastSeq}
@@ -68,13 +89,17 @@ export function RollupDetailsComponent({
           value={
             <TruncatedAddress
               address={rollupDetails?.Header?.CompressionL1Head}
+              showFullLength
             />
           }
         />
         <KeyValueItem
           label="Payload Hash"
           value={
-            <TruncatedAddress address={rollupDetails?.Header?.PayloadHash} />
+            <TruncatedAddress
+              address={rollupDetails?.Header?.PayloadHash}
+              showFullLength
+            />
           }
         />
         <KeyValueItem
@@ -95,7 +120,9 @@ export function RollupDetailsComponent({
                         label="Sequence"
                         value={
                           <Link
-                            href={`/rollup/batch/sequence/${msg.Sequence}`}
+                            href={pathToUrl(pageLinks.rollupByBatchSequence, {
+                              sequence: msg?.Sequence,
+                            })}
                             className="text-primary"
                           >
                             {"#" + msg.Sequence}
diff --git a/tools/tenscan/frontend/src/components/modules/transactions/columns.tsx b/tools/tenscan/frontend/src/components/modules/transactions/columns.tsx
index 3b103dd5e0..d09df4d386 100644
--- a/tools/tenscan/frontend/src/components/modules/transactions/columns.tsx
+++ b/tools/tenscan/frontend/src/components/modules/transactions/columns.tsx
@@ -9,6 +9,8 @@ import { Transaction } from "@/src/types/interfaces/TransactionInterfaces";
 import TruncatedAddress from "@repo/ui/components/common/truncated-address";
 import { formatTimeAgo } from "@repo/ui/lib/utils";
 import Link from "next/link";
+import { pathToUrl } from "@/src/routes/router";
+import { pageLinks } from "@/src/routes";
 
 export const columns: ColumnDef<Transaction>[] = [
   {
@@ -60,7 +62,9 @@ export const columns: ColumnDef<Transaction>[] = [
       return (
         <TruncatedAddress
           address={row.getValue("TransactionHash")}
-          link={`/tx/${row.original.TransactionHash}`}
+          link={pathToUrl(pageLinks.txByHash, {
+            hash: row.original.TransactionHash,
+          })}
         />
       );
     },
diff --git a/tools/tenscan/frontend/src/components/modules/transactions/transaction-details.tsx b/tools/tenscan/frontend/src/components/modules/transactions/transaction-details.tsx
index bc0eff4fee..953461a847 100644
--- a/tools/tenscan/frontend/src/components/modules/transactions/transaction-details.tsx
+++ b/tools/tenscan/frontend/src/components/modules/transactions/transaction-details.tsx
@@ -2,11 +2,13 @@ import TruncatedAddress from "@repo/ui/components/common/truncated-address";
 import KeyValueItem, {
   KeyValueList,
 } from "@repo/ui/components/shared/key-value";
-import { formatTimeAgo } from "@repo/ui/lib/utils";
+import { formatTimeAgo, formatTimestampToDate } from "@repo/ui/lib/utils";
 import { BadgeType } from "@repo/ui/lib/enums/badge";
 import { Badge } from "@repo/ui/components/shared/badge";
 import { Transaction } from "@/src/types/interfaces/TransactionInterfaces";
 import Link from "next/link";
+import { pathToUrl } from "@/src/routes/router";
+import { pageLinks } from "@/src/routes";
 
 export function TransactionDetailsComponent({
   transactionDetails,
@@ -20,7 +22,9 @@ export function TransactionDetailsComponent({
           label="Batch Height"
           value={
             <Link
-              href={`/batch/height/${transactionDetails?.BatchHeight}`}
+              href={pathToUrl(pageLinks.batchByHeight, {
+                height: transactionDetails?.BatchHeight,
+              })}
               className="text-primary"
             >
               {"#" + Number(transactionDetails?.BatchHeight)}
@@ -32,13 +36,21 @@ export function TransactionDetailsComponent({
           value={
             <TruncatedAddress
               address={transactionDetails?.TransactionHash}
-              link={`/tx/${transactionDetails?.TransactionHash}`}
+              link={pathToUrl(pageLinks.txByHash, {
+                hash: transactionDetails?.TransactionHash,
+              })}
             />
           }
         />
         <KeyValueItem
           label="Timestamp"
-          value={formatTimeAgo(transactionDetails?.BatchTimestamp)}
+          value={
+            <Badge variant="outline">
+              {formatTimeAgo(transactionDetails?.BatchTimestamp) +
+                " - " +
+                formatTimestampToDate(transactionDetails?.BatchTimestamp)}
+            </Badge>
+          }
         />
         <KeyValueItem
           label="Finality"
diff --git a/tools/tenscan/frontend/src/routes/index.ts b/tools/tenscan/frontend/src/routes/index.ts
index be08677048..6e08965830 100644
--- a/tools/tenscan/frontend/src/routes/index.ts
+++ b/tools/tenscan/frontend/src/routes/index.ts
@@ -38,7 +38,6 @@ export const apiRoutes = {
 export const ethMethods = {
   getStorageAt: "eth_getStorageAt",
   getTransactionReceipt: "eth_getTransactionReceipt",
-  switchNetwork: "wallet_switchEthereumChain",
 };
 
 // to send TEN Custom Queries (CQ) through the provider we call eth_getStorageAt and use these addresses to identify the TEN CQ method
@@ -47,15 +46,54 @@ export const tenCustomQueryMethods = {
   listPersonalTransactions: "0x0000000000000000000000000000000000000002",
 };
 
+export const externalPageLinks = {
+  // Dev and UAT environments don't have etherscan, hence, we're hardcoding this to just Sepolia
+  etherscanBlock: "https://sepolia.etherscan.io/block/:hash",
+};
+
+export const pageLinks = {
+  home: "/",
+  address: "/address/:address",
+
+  // **** TRANSACTIONS ****
+  personalTransactions: "/personal",
+  transactions: "/transactions",
+  txByHash: "/tx/:hash",
+  personalTxByHash: "/personal/tx/:hash",
+
+  // **** BATCHES ****
+  batches: "/batches",
+  batchByHash: "/batch/:hash",
+  batchByHeight: "/batch/height/:height",
+  batchTransactions: "/batch/txs/:hash",
+
+  // **** ROLLUPS ****
+  rollups: "/rollups",
+  rollupByHash: "/rollup/:hash",
+  rollupByBatchSequence: "/rollup/batch/sequence/:sequence",
+  rollupBatches: "/rollup/:hash/batches",
+
+  // **** BLOCKS ****
+  blocks: "/blocks",
+
+  // **** CONTRACTS ****
+  verifiedData: "/resources/verified-data",
+  decrypt: "/resources/decrypt",
+
+  // **** INFO ****
+  privacyPolicy: "/docs/privacy-policy",
+  termsOfService: "/docs/terms",
+};
+
 export const NavLinks: NavLink[] = [
   {
-    href: "/",
+    href: pageLinks.home,
     label: "Home",
     isExternal: false,
     isDropdown: false,
   },
   {
-    href: "/personal",
+    href: pageLinks.personalTransactions,
     label: "Personal",
     isExternal: false,
     isDropdown: false,
@@ -66,17 +104,17 @@ export const NavLinks: NavLink[] = [
     isDropdown: true,
     subNavLinks: [
       {
-        href: "/transactions",
+        href: pageLinks.transactions,
         label: "Transactions",
         isExternal: false,
       },
       {
-        href: "/batches",
+        href: pageLinks.batches,
         label: "Batches",
         isExternal: false,
       },
       {
-        href: "/rollups",
+        href: pageLinks.rollups,
         label: "Rollups",
         isExternal: false,
       },
@@ -88,19 +126,10 @@ export const NavLinks: NavLink[] = [
     isDropdown: true,
     subNavLinks: [
       {
-        href: "/resources/verified-data",
+        href: pageLinks.verifiedData,
         label: "Verified Data",
         isExternal: false,
       },
     ],
   },
 ];
-
-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/",
-};
-
-export const pageLinks = {
-  // home:
-};
diff --git a/tools/tenscan/frontend/src/services/useBatchesService.ts b/tools/tenscan/frontend/src/services/useBatchesService.ts
index 06ebc2982a..619dbef587 100644
--- a/tools/tenscan/frontend/src/services/useBatchesService.ts
+++ b/tools/tenscan/frontend/src/services/useBatchesService.ts
@@ -7,7 +7,7 @@ import { useRouter } from "next/router";
 export const useBatchesService = () => {
   const { query } = useRouter();
 
-  const [noPolling, setNoPolling] = useState(false);
+  const [noPolling, setNoPolling] = useState(true);
 
   const options = getOptions(query);
 
diff --git a/tools/tenscan/frontend/src/services/useBlocksService.ts b/tools/tenscan/frontend/src/services/useBlocksService.ts
index 1af7f9458d..97d318e313 100644
--- a/tools/tenscan/frontend/src/services/useBlocksService.ts
+++ b/tools/tenscan/frontend/src/services/useBlocksService.ts
@@ -7,7 +7,7 @@ import { useState } from "react";
 export const useBlocksService = () => {
   const { query } = useRouter();
 
-  const [noPolling, setNoPolling] = useState(false);
+  const [noPolling, setNoPolling] = useState(true);
 
   const options = getOptions(query);
 
diff --git a/tools/tenscan/frontend/src/services/useRollupsService.ts b/tools/tenscan/frontend/src/services/useRollupsService.ts
index eeb34e541c..2f1440ac4d 100644
--- a/tools/tenscan/frontend/src/services/useRollupsService.ts
+++ b/tools/tenscan/frontend/src/services/useRollupsService.ts
@@ -13,7 +13,7 @@ import { useRouter } from "next/router";
 export const useRollupsService = () => {
   const { query } = useRouter();
 
-  const [noPolling, setNoPolling] = useState(false);
+  const [noPolling, setNoPolling] = useState(true);
   const [decryptedRollup, setDecryptedRollup] = useState<any>();
 
   const options = getOptions(query);
diff --git a/tools/tenscan/frontend/src/services/useTransactionsService.ts b/tools/tenscan/frontend/src/services/useTransactionsService.ts
index 4fbc07265c..c507e9b256 100644
--- a/tools/tenscan/frontend/src/services/useTransactionsService.ts
+++ b/tools/tenscan/frontend/src/services/useTransactionsService.ts
@@ -18,7 +18,7 @@ export const useTransactionsService = () => {
   const { query } = useRouter();
   const { address, provider } = useWalletStore();
 
-  const [noPolling, setNoPolling] = useState(false);
+  const [noPolling, setNoPolling] = useState(true);
 
   const options = getOptions(query);