diff --git a/src/components/names/NameList.tsx b/src/components/names/NameList.tsx
index 25ca0a6..894758b 100644
--- a/src/components/names/NameList.tsx
+++ b/src/components/names/NameList.tsx
@@ -35,7 +35,7 @@ export const NameList = () => {
     return (
         <div className="card w-full p-4">
             <div className="flex w-full items-center justify-between">
-                <div className="pl-2 font-bold">Vaults</div>
+                <div className="pl-2 font-bold">All Names</div>
                 {/* {address && <button className="btn">Create</button>} */}
             </div>
             <div>
diff --git a/src/components/vaults/VaultEntry.tsx b/src/components/vaults/VaultEntry.tsx
index 501b5e2..6aa339b 100644
--- a/src/components/vaults/VaultEntry.tsx
+++ b/src/components/vaults/VaultEntry.tsx
@@ -1,21 +1,37 @@
+/* eslint-disable jsx-a11y/no-static-element-interactions */
+/* eslint-disable jsx-a11y/click-events-have-key-events */
+import { VaultInfo } from "components/modals/VaultInfo";
 import { formatAddress } from "ens-tools";
-import { FC } from "react";
-import { Vault } from "types/vault";
+import { useVaultBalance } from "hooks/useVaultBalance";
+import { useVaultOwner } from "hooks/useVaultOwner";
+import { FC, useState } from "react";
 import { useEnsName } from "wagmi";
 
-export const VaultEntry: FC<{ vault: Vault }> = ({ vault }) => {
-    const { data: name } = useEnsName({ address: vault.owner as "0x{string}" });
+export const VaultEntry: FC<{ vault: bigint }> = ({ vault }) => {
+    const { data: owner } = useVaultOwner(vault);
+    const { data: name } = useEnsName({ address: owner });
+    const { data: balance } = useVaultBalance(vault);
+
+    const [isOpen, setIsOpen] = useState(false);
 
     return (
-        <div className="flex justify-between border-b border-border p-2">
-            <div>
-                <div>{formatAddress(vault.address)}</div>
-                <div>{name || formatAddress(vault.owner)}</div>
-            </div>
-            <div>
-                <div>{vault.name_count} names</div>
-                <div>{vault.balance} ETH</div>
+        <div>
+            <div
+                className="flex justify-between border-b border-border p-2"
+                onClick={() => setIsOpen(true)}
+            >
+                <div>
+                    <div>{vault.toString()}</div>
+                    <div>{name || formatAddress(owner || "")}</div>
+                </div>
+                <div>
+                    {/* <div>{vault.name_count} names</div> */}
+                    <div>{balance} ETH</div>
+                </div>
             </div>
+            {isOpen && (
+                <VaultInfo vaultId={vault} onClose={() => setIsOpen(false)} />
+            )}
         </div>
     );
 };
diff --git a/src/types/vault.ts b/src/types/vault.ts
deleted file mode 100644
index 8a97179..0000000
--- a/src/types/vault.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export type Vault = {
-    address: string;
-    owner: string;
-    balance: string;
-    name_count: number;
-};