diff --git a/.changeset/slow-apples-think.md b/.changeset/slow-apples-think.md
new file mode 100644
index 0000000000..a845151cc8
--- /dev/null
+++ b/.changeset/slow-apples-think.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/packages/apps/rwa-demo/src/app/(app)/(isAgent)/investors/[investorAccount]/page.tsx b/packages/apps/rwa-demo/src/app/(app)/(isAgent)/investors/[investorAccount]/page.tsx
index 4ee4228475..1fdc77e149 100644
--- a/packages/apps/rwa-demo/src/app/(app)/(isAgent)/investors/[investorAccount]/page.tsx
+++ b/packages/apps/rwa-demo/src/app/(app)/(isAgent)/investors/[investorAccount]/page.tsx
@@ -2,12 +2,14 @@
 
 import { DistributionForm } from '@/components/DistributionForm/DistributionForm';
 import { FreezeInvestor } from '@/components/FreezeInvestor/FreezeInvestor';
+import { InvestorForm } from '@/components/InvestorForm/InvestorForm';
 import { InvestorInfo } from '@/components/InvestorInfo/InvestorInfo';
 import { PartiallyFreezeTokensForm } from '@/components/PartiallyFreezeTokensForm/PartiallyFreezeTokensForm';
 import { SideBarBreadcrumbs } from '@/components/SideBarBreadcrumbs/SideBarBreadcrumbs';
 import { useAsset } from '@/hooks/asset';
 import { useFreeze } from '@/hooks/freeze';
-import { MonoAdd } from '@kadena/kode-icons';
+import { useGetInvestor } from '@/hooks/getInvestor';
+import { MonoAdd, MonoEditNote } from '@kadena/kode-icons';
 import { Button, Stack } from '@kadena/kode-ui';
 import { SideBarBreadcrumbsItem, useLayout } from '@kadena/kode-ui/patterns';
 import { useParams } from 'next/navigation';
@@ -21,6 +23,8 @@ const InvestorPage = () => {
   const [hasOpenPartiallyFreezeForm, setHasOpenPartiallyFreezeForm] =
     useState(false);
   const investorAccount = decodeURIComponent(params.investorAccount as string);
+
+  const { data: investor } = useGetInvestor({ account: investorAccount });
   const { frozen } = useFreeze({ investorAccount });
 
   const handleDistributeTokens = () => {
@@ -32,6 +36,8 @@ const InvestorPage = () => {
     setHasOpenPartiallyFreezeForm(true);
   };
 
+  if (!investor) return null;
+
   return (
     <>
       <SideBarBreadcrumbs>
@@ -60,7 +66,7 @@ const InvestorPage = () => {
       )}
 
       <Stack width="100%" flexDirection="column">
-        <InvestorInfo investorAccount={investorAccount} />
+        <InvestorInfo account={investor} />
         <Stack gap="sm">
           <Button
             startVisual={<MonoAdd />}
@@ -79,6 +85,18 @@ const InvestorPage = () => {
           </Button>
 
           <FreezeInvestor investorAccount={investorAccount} />
+
+          <InvestorForm
+            investor={investor}
+            trigger={
+              <Button
+                isDisabled={frozen || paused}
+                endVisual={<MonoEditNote />}
+              >
+                Edit Investor
+              </Button>
+            }
+          />
         </Stack>
       </Stack>
     </>
diff --git a/packages/apps/rwa-demo/src/app/(app)/agents/[agentAccount]/page.tsx b/packages/apps/rwa-demo/src/app/(app)/agents/[agentAccount]/page.tsx
new file mode 100644
index 0000000000..be3eb39525
--- /dev/null
+++ b/packages/apps/rwa-demo/src/app/(app)/agents/[agentAccount]/page.tsx
@@ -0,0 +1,47 @@
+'use client';
+
+import { AgentForm } from '@/components/AgentForm/AgentForm';
+import { AgentInfo } from '@/components/AgentInfo/AgentInfo';
+import { SideBarBreadcrumbs } from '@/components/SideBarBreadcrumbs/SideBarBreadcrumbs';
+import { useAsset } from '@/hooks/asset';
+import { useGetAgent } from '@/hooks/getAgent';
+import { MonoEditNote } from '@kadena/kode-icons';
+import { Button, Stack } from '@kadena/kode-ui';
+import { SideBarBreadcrumbsItem } from '@kadena/kode-ui/patterns';
+import { useParams } from 'next/navigation';
+
+const InvestorPage = () => {
+  const { paused } = useAsset();
+  const params = useParams();
+  const agentAccount = decodeURIComponent(params.agentAccount as string);
+
+  const { data: agent } = useGetAgent({ account: agentAccount });
+
+  if (!agent) return null;
+
+  return (
+    <>
+      <SideBarBreadcrumbs>
+        <SideBarBreadcrumbsItem href={`/agents/${agentAccount}`}>
+          Agent
+        </SideBarBreadcrumbsItem>
+      </SideBarBreadcrumbs>
+
+      <Stack width="100%" flexDirection="column">
+        <AgentInfo account={agent} />
+        <Stack gap="sm">
+          <AgentForm
+            agent={agent}
+            trigger={
+              <Button isDisabled={paused} endVisual={<MonoEditNote />}>
+                Edit Agent
+              </Button>
+            }
+          />
+        </Stack>
+      </Stack>
+    </>
+  );
+};
+
+export default InvestorPage;
diff --git a/packages/apps/rwa-demo/src/components/AddAgentForm/AddAgentForm.tsx b/packages/apps/rwa-demo/src/components/AddAgentForm/AddAgentForm.tsx
deleted file mode 100644
index 2d97413af6..0000000000
--- a/packages/apps/rwa-demo/src/components/AddAgentForm/AddAgentForm.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import { useAddAgent } from '@/hooks/addAgent';
-import type { IAddAgentProps } from '@/services/addAgent';
-import { Button, TextField } from '@kadena/kode-ui';
-import {
-  RightAside,
-  RightAsideContent,
-  RightAsideFooter,
-  RightAsideHeader,
-} from '@kadena/kode-ui/patterns';
-import type { FC } from 'react';
-import { useForm } from 'react-hook-form';
-
-interface IProps {
-  onClose: () => void;
-}
-
-export const AddAgentForm: FC<IProps> = ({ onClose }) => {
-  const { submit } = useAddAgent();
-  const { register, handleSubmit } = useForm<IAddAgentProps>({
-    defaultValues: {
-      accountName: '',
-    },
-  });
-
-  const onSubmit = async (data: IAddAgentProps) => {
-    await submit(data);
-    onClose();
-  };
-
-  return (
-    <>
-      <RightAside isOpen onClose={onClose}>
-        <form onSubmit={handleSubmit(onSubmit)}>
-          <RightAsideHeader label="Add Agent" />
-          <RightAsideContent>
-            <TextField
-              label="Agent Account"
-              {...register('accountName', { required: true })}
-            />
-          </RightAsideContent>
-          <RightAsideFooter>
-            <Button onPress={onClose} variant="transparent">
-              Cancel
-            </Button>
-            <Button type="submit">Add Agent</Button>
-          </RightAsideFooter>
-        </form>
-      </RightAside>
-    </>
-  );
-};
diff --git a/packages/apps/rwa-demo/src/components/AddInvestorForm/AddInvestorForm.tsx b/packages/apps/rwa-demo/src/components/AddInvestorForm/AddInvestorForm.tsx
deleted file mode 100644
index 7f52a865cb..0000000000
--- a/packages/apps/rwa-demo/src/components/AddInvestorForm/AddInvestorForm.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import { useAddInvestor } from '@/hooks/addInvestor';
-import type { IRegisterIdentityProps } from '@/services/registerIdentity';
-import { Button, TextField } from '@kadena/kode-ui';
-import {
-  RightAside,
-  RightAsideContent,
-  RightAsideFooter,
-  RightAsideHeader,
-} from '@kadena/kode-ui/patterns';
-import type { FC } from 'react';
-import { useForm } from 'react-hook-form';
-
-interface IProps {
-  onClose: () => void;
-}
-
-export const AddInvestorForm: FC<IProps> = ({ onClose }) => {
-  const { submit } = useAddInvestor();
-  const { register, handleSubmit } = useForm<IRegisterIdentityProps>({
-    defaultValues: {
-      accountName: '',
-    },
-  });
-
-  const onSubmit = async (data: IRegisterIdentityProps) => {
-    await submit(data);
-    onClose();
-  };
-
-  return (
-    <>
-      <RightAside isOpen onClose={onClose}>
-        <form onSubmit={handleSubmit(onSubmit)}>
-          <RightAsideHeader label="Add Investor" />
-          <RightAsideContent>
-            <TextField
-              label="Investor Account"
-              {...register('accountName', { required: true })}
-            />
-          </RightAsideContent>
-          <RightAsideFooter>
-            <Button onPress={onClose} variant="transparent">
-              Cancel
-            </Button>
-            <Button type="submit">Add Investor</Button>
-          </RightAsideFooter>
-        </form>
-      </RightAside>
-    </>
-  );
-};
diff --git a/packages/apps/rwa-demo/src/components/AgentForm/AgentForm.tsx b/packages/apps/rwa-demo/src/components/AgentForm/AgentForm.tsx
new file mode 100644
index 0000000000..8819a6a34c
--- /dev/null
+++ b/packages/apps/rwa-demo/src/components/AgentForm/AgentForm.tsx
@@ -0,0 +1,95 @@
+import { useAddAgent } from '@/hooks/addAgent';
+import type { IAddAgentProps } from '@/services/addAgent';
+import type { IRecord } from '@/utils/filterRemovedRecords';
+import { Button, TextField } from '@kadena/kode-ui';
+import {
+  RightAside,
+  RightAsideContent,
+  RightAsideFooter,
+  RightAsideHeader,
+  useLayout,
+} from '@kadena/kode-ui/patterns';
+import type { FC, ReactElement } from 'react';
+import { cloneElement, useEffect, useState } from 'react';
+import { Controller, useForm } from 'react-hook-form';
+
+interface IProps {
+  agent?: IRecord;
+  onClose?: () => void;
+  trigger: ReactElement;
+}
+
+export const AgentForm: FC<IProps> = ({ onClose, agent, trigger }) => {
+  const { submit } = useAddAgent();
+  const [isOpen, setIsOpen] = useState(false);
+  const { setIsRightAsideExpanded, isRightAsideExpanded } = useLayout();
+  const { handleSubmit, control } = useForm<IAddAgentProps>({
+    defaultValues: {
+      accountName: agent?.accountName ?? '',
+      alias: agent?.alias ?? '',
+      alreadyExists: !!agent?.accountName,
+    },
+  });
+
+  const handleOpen = () => {
+    setIsRightAsideExpanded(true);
+    setIsOpen(true);
+    if (trigger.props.onPress) trigger.props.onPress();
+  };
+
+  const handleOnClose = () => {
+    setIsOpen(false);
+    if (onClose) onClose();
+  };
+
+  const onSubmit = async (data: IAddAgentProps) => {
+    await submit(data);
+    handleOnClose();
+  };
+
+  useEffect(() => {
+    console.log('agent', isOpen);
+  }, [isOpen]);
+
+  return (
+    <>
+      {isRightAsideExpanded && isOpen && (
+        <RightAside
+          isOpen={isRightAsideExpanded && isOpen}
+          onClose={handleOnClose}
+        >
+          <form onSubmit={handleSubmit(onSubmit)}>
+            <RightAsideHeader label="Add Agent" />
+            <RightAsideContent>
+              <Controller
+                name="accountName"
+                control={control}
+                render={({ field }) => (
+                  <TextField
+                    isDisabled={!!agent?.accountName}
+                    label="AccountName"
+                    {...field}
+                  />
+                )}
+              />
+
+              <Controller
+                name="alias"
+                control={control}
+                render={({ field }) => <TextField label="Alias" {...field} />}
+              />
+            </RightAsideContent>
+            <RightAsideFooter>
+              <Button onPress={handleOnClose} variant="transparent">
+                Cancel
+              </Button>
+              <Button type="submit">Add Agent</Button>
+            </RightAsideFooter>
+          </form>
+        </RightAside>
+      )}
+
+      {cloneElement(trigger, { ...trigger.props, onPress: handleOpen })}
+    </>
+  );
+};
diff --git a/packages/apps/rwa-demo/src/components/AgentInfo/AgentInfo.tsx b/packages/apps/rwa-demo/src/components/AgentInfo/AgentInfo.tsx
new file mode 100644
index 0000000000..cc3052083f
--- /dev/null
+++ b/packages/apps/rwa-demo/src/components/AgentInfo/AgentInfo.tsx
@@ -0,0 +1,28 @@
+import type { IRecord } from '@/utils/filterRemovedRecords';
+import { Heading, Stack } from '@kadena/kode-ui';
+import type { FC } from 'react';
+import React from 'react';
+import type { IWalletAccount } from '../AccountProvider/utils';
+
+interface IProps {
+  account: IRecord | IWalletAccount;
+}
+
+const getAccountName = (account: IProps['account']) => {
+  if ('accountName' in account) return account.accountName;
+  return account.address;
+};
+
+export const AgentInfo: FC<IProps> = ({ account }) => {
+  const accountName = getAccountName(account);
+
+  if (!account) return null;
+
+  return (
+    <Stack width="100%" flexDirection="column">
+      <Heading as="h3">
+        agent: {account.alias ? account.alias : accountName}
+      </Heading>
+    </Stack>
+  );
+};
diff --git a/packages/apps/rwa-demo/src/components/AgentsList/AgentsList.tsx b/packages/apps/rwa-demo/src/components/AgentsList/AgentsList.tsx
index 065d2a99f1..5d526e5221 100644
--- a/packages/apps/rwa-demo/src/components/AgentsList/AgentsList.tsx
+++ b/packages/apps/rwa-demo/src/components/AgentsList/AgentsList.tsx
@@ -1,7 +1,11 @@
 import { useAsset } from '@/hooks/asset';
 import { useGetAgents } from '@/hooks/getAgents';
 import { useRemoveAgent } from '@/hooks/removeAgent';
-import { MonoDelete, MonoSupportAgent } from '@kadena/kode-icons';
+import {
+  MonoDelete,
+  MonoFindInPage,
+  MonoSupportAgent,
+} from '@kadena/kode-icons';
 import { Button } from '@kadena/kode-ui';
 import {
   CompactTable,
@@ -10,75 +14,92 @@ import {
   SectionCardBody,
   SectionCardContentBlock,
   SectionCardHeader,
-  useLayout,
 } from '@kadena/kode-ui/patterns';
+import { useRouter } from 'next/navigation';
 import type { FC } from 'react';
-import { useState } from 'react';
-import { AddAgentForm } from '../AddAgentForm/AddAgentForm';
+import { AgentForm } from '../AgentForm/AgentForm';
 import { Confirmation } from '../Confirmation/Confirmation';
 
 export const AgentsList: FC = () => {
-  const { setIsRightAsideExpanded, isRightAsideExpanded } = useLayout();
   const { paused } = useAsset();
   const { data } = useGetAgents();
   const { submit } = useRemoveAgent();
-  const [hasOpenAgentForm, setHasOpenAgentForm] = useState(false);
-
-  const handleAddAgent = () => {
-    setIsRightAsideExpanded(true);
-    setHasOpenAgentForm(true);
-  };
+  const router = useRouter();
 
   const handleDelete = async (accountName: any) => {
     await submit({ agent: accountName });
   };
 
+  const handleLink = async (accountName: any) => {
+    router.push(`/agents/${accountName}`);
+  };
+
   return (
     <>
-      {isRightAsideExpanded && hasOpenAgentForm && (
-        <AddAgentForm
-          onClose={() => {
-            setIsRightAsideExpanded(false);
-            setHasOpenAgentForm(false);
-          }}
-        />
-      )}
       <SectionCard stack="vertical">
         <SectionCardContentBlock>
           <SectionCardHeader
             title="Agents"
             description={<>All the agents for this contract</>}
             actions={
-              <Button
-                isDisabled={paused}
-                endVisual={<MonoSupportAgent />}
-                onClick={handleAddAgent}
-                variant="outlined"
-              >
-                Add Agent
-              </Button>
+              <AgentForm
+                trigger={
+                  <Button
+                    isDisabled={paused}
+                    isCompact
+                    endVisual={<MonoSupportAgent />}
+                    variant="outlined"
+                  >
+                    Add Agent
+                  </Button>
+                }
+              />
             }
           />
           <SectionCardBody>
             <CompactTable
               fields={[
                 {
-                  label: 'status',
-                  key: 'result',
-                  width: '10%',
-                  render: CompactTableFormatters.FormatStatus(),
+                  label: 'Name',
+                  key: 'alias',
+                  width: '30%',
+                },
+                {
+                  label: 'Account',
+                  key: 'accountName',
+                  width: '50%',
+                  render: CompactTableFormatters.FormatAccount(),
+                },
+                {
+                  label: '',
+                  key: 'accountName',
+                  width: '8%',
+                  render: CompactTableFormatters.FormatActions({
+                    trigger: (
+                      <Button
+                        isCompact
+                        variant="outlined"
+                        startVisual={<MonoFindInPage />}
+                        onPress={handleLink}
+                      />
+                    ),
+                  }),
                 },
-                { label: 'Account', key: 'accountName', width: '50%' },
-                { label: 'Requestkey', key: 'requestKey', width: '30%' },
                 {
                   label: '',
                   key: 'accountName',
-                  width: '10%',
+                  width: '7%',
                   render: CompactTableFormatters.FormatActions({
                     trigger: (
                       <Confirmation
                         onPress={handleDelete}
-                        trigger={<Button startVisual={<MonoDelete />} />}
+                        trigger={
+                          <Button
+                            isCompact
+                            variant="outlined"
+                            startVisual={<MonoDelete />}
+                          />
+                        }
                       >
                         Are you sure you want to delete this agent?
                       </Confirmation>
diff --git a/packages/apps/rwa-demo/src/components/FreezeInvestor/FreezeInvestor.tsx b/packages/apps/rwa-demo/src/components/FreezeInvestor/FreezeInvestor.tsx
index 0d5590c9b3..6a83d1d373 100644
--- a/packages/apps/rwa-demo/src/components/FreezeInvestor/FreezeInvestor.tsx
+++ b/packages/apps/rwa-demo/src/components/FreezeInvestor/FreezeInvestor.tsx
@@ -1,6 +1,7 @@
 import { useFreeze } from '@/hooks/freeze';
 import { useFreezeInvestor } from '@/hooks/freezeInvestor';
 import { MonoPause, MonoPlayArrow } from '@kadena/kode-icons';
+import type { IButtonProps } from '@kadena/kode-ui';
 import { Button } from '@kadena/kode-ui';
 import type { FC } from 'react';
 import React, { useEffect, useState } from 'react';
@@ -9,6 +10,9 @@ import { TransactionPendingIcon } from '../TransactionPendingIcon/TransactionPen
 
 interface IProps {
   investorAccount: string;
+  isCompact?: IButtonProps['isCompact'];
+  variant?: IButtonProps['variant'];
+  iconOnly?: boolean;
 }
 
 const getVisual = (frozen: boolean, isLoading: boolean) => {
@@ -18,7 +22,12 @@ const getVisual = (frozen: boolean, isLoading: boolean) => {
   return frozen ? <MonoPause /> : <MonoPlayArrow />;
 };
 
-export const FreezeInvestor: FC<IProps> = ({ investorAccount }) => {
+export const FreezeInvestor: FC<IProps> = ({
+  investorAccount,
+  iconOnly,
+  isCompact,
+  variant,
+}) => {
   const { frozen } = useFreeze({ investorAccount });
   const [isLoading, setIsLoading] = useState<boolean>(true);
   const { submit } = useFreezeInvestor();
@@ -42,12 +51,18 @@ export const FreezeInvestor: FC<IProps> = ({ investorAccount }) => {
     setIsLoading(false);
   }, [frozen]);
 
+  const label = iconOnly ? '' : frozen ? 'Unfreeze account' : 'Freeze account';
+
   return (
     <SendTransactionAnimation
       onPress={handleFreeze}
       trigger={
-        <Button startVisual={getVisual(frozen, isLoading)}>
-          {frozen ? 'Unfreeze account' : 'Freeze account'}
+        <Button
+          startVisual={getVisual(frozen, isLoading)}
+          isCompact={isCompact}
+          variant={variant}
+        >
+          {label}
         </Button>
       }
     ></SendTransactionAnimation>
diff --git a/packages/apps/rwa-demo/src/components/HomePage/AgentRootPage.tsx b/packages/apps/rwa-demo/src/components/HomePage/AgentRootPage.tsx
index 4174a36ed8..9d3017dc15 100644
--- a/packages/apps/rwa-demo/src/components/HomePage/AgentRootPage.tsx
+++ b/packages/apps/rwa-demo/src/components/HomePage/AgentRootPage.tsx
@@ -1,25 +1,12 @@
 import { SideBarBreadcrumbs } from '@/components/SideBarBreadcrumbs/SideBarBreadcrumbs';
 import { useAccount } from '@/hooks/account';
-import { useAsset } from '@/hooks/asset';
-import { MonoAdd } from '@kadena/kode-icons';
-import { Button, Stack } from '@kadena/kode-ui';
-import { useLayout } from '@kadena/kode-ui/patterns';
+import { Stack } from '@kadena/kode-ui';
 import type { FC } from 'react';
-import { useState } from 'react';
-import { AddInvestorForm } from '../AddInvestorForm/AddInvestorForm';
 import { InvestorList } from '../InvestorList/InvestorList';
 import { PauseForm } from '../PauseForm/PauseForm';
 
 export const AgentRootPage: FC = () => {
   const { isAgent, account } = useAccount();
-  const { paused } = useAsset();
-  const { setIsRightAsideExpanded, isRightAsideExpanded } = useLayout();
-  const [hasOpenInvestorForm, setHasOpenInvestorForm] = useState(false);
-
-  const handleAddInvestor = () => {
-    setIsRightAsideExpanded(true);
-    setHasOpenInvestorForm(true);
-  };
 
   if (!isAgent) return null;
 
@@ -27,23 +14,8 @@ export const AgentRootPage: FC = () => {
     <Stack width="100%" flexDirection="column" gap="md">
       agent: {account?.address}
       <SideBarBreadcrumbs />
-      {isRightAsideExpanded && hasOpenInvestorForm && (
-        <AddInvestorForm
-          onClose={() => {
-            setIsRightAsideExpanded(false);
-            setHasOpenInvestorForm(false);
-          }}
-        />
-      )}
       <Stack gap="sm">
         <PauseForm />
-        <Button
-          isDisabled={paused}
-          startVisual={<MonoAdd />}
-          onPress={handleAddInvestor}
-        >
-          Add Investor
-        </Button>
       </Stack>
       <InvestorList />
     </Stack>
diff --git a/packages/apps/rwa-demo/src/components/HomePage/InvestorRootPage.tsx b/packages/apps/rwa-demo/src/components/HomePage/InvestorRootPage.tsx
index 3db2e5f741..f2203318fa 100644
--- a/packages/apps/rwa-demo/src/components/HomePage/InvestorRootPage.tsx
+++ b/packages/apps/rwa-demo/src/components/HomePage/InvestorRootPage.tsx
@@ -33,7 +33,7 @@ export const InvestorRootPage: FC = () => {
       )}
 
       <Stack width="100%" flexDirection="column" gap="md">
-        <InvestorInfo investorAccount={account.address} />
+        <InvestorInfo account={account} />
 
         <Stack gap="sm">
           <Button
diff --git a/packages/apps/rwa-demo/src/components/InvestorForm/InvestorForm.tsx b/packages/apps/rwa-demo/src/components/InvestorForm/InvestorForm.tsx
new file mode 100644
index 0000000000..8eb394cc65
--- /dev/null
+++ b/packages/apps/rwa-demo/src/components/InvestorForm/InvestorForm.tsx
@@ -0,0 +1,98 @@
+import { useAddInvestor } from '@/hooks/addInvestor';
+import type { IRegisterIdentityProps } from '@/services/registerIdentity';
+import type { IRecord } from '@/utils/filterRemovedRecords';
+import { Button, TextField } from '@kadena/kode-ui';
+import {
+  RightAside,
+  RightAsideContent,
+  RightAsideFooter,
+  RightAsideHeader,
+  useLayout,
+} from '@kadena/kode-ui/patterns';
+import type { FC, ReactElement } from 'react';
+import { cloneElement, useEffect, useState } from 'react';
+import { Controller, useForm } from 'react-hook-form';
+
+interface IProps {
+  investor?: IRecord;
+  onClose?: () => void;
+  trigger: ReactElement;
+}
+
+export const InvestorForm: FC<IProps> = ({ onClose, trigger, investor }) => {
+  const { submit } = useAddInvestor();
+  const [isOpen, setIsOpen] = useState(false);
+  const { setIsRightAsideExpanded, isRightAsideExpanded } = useLayout();
+  const { handleSubmit, control } = useForm<
+    Omit<IRegisterIdentityProps, 'agent'>
+  >({
+    values: {
+      accountName: investor?.accountName ?? '',
+      alias: investor?.alias ?? '',
+      alreadyExists: !!investor?.accountName,
+    },
+  });
+
+  const handleOpen = () => {
+    setIsRightAsideExpanded(true);
+    setIsOpen(true);
+    if (trigger.props.onPress) trigger.props.onPress();
+  };
+
+  const handleOnClose = () => {
+    console.log(333331);
+    setIsOpen(false);
+    if (onClose) onClose();
+    // setIsRightAsideExpanded(false);
+    // setRightAsideOnClose(() => {
+    // });
+  };
+
+  const onSubmit = async (data: Omit<IRegisterIdentityProps, 'agent'>) => {
+    await submit(data);
+    handleOnClose();
+  };
+
+  useEffect(() => {
+    console.log(isOpen);
+  }, [isOpen]);
+
+  return (
+    <>
+      {isRightAsideExpanded && isOpen && (
+        <RightAside isOpen onClose={handleOnClose}>
+          <form onSubmit={handleSubmit(onSubmit)}>
+            <RightAsideHeader label="Add Investor" />
+            <RightAsideContent>
+              <Controller
+                name="accountName"
+                control={control}
+                render={({ field }) => (
+                  <TextField
+                    isDisabled={!!investor?.accountName}
+                    label="AccountName"
+                    {...field}
+                  />
+                )}
+              />
+
+              <Controller
+                name="alias"
+                control={control}
+                render={({ field }) => <TextField label="Alias" {...field} />}
+              />
+            </RightAsideContent>
+            <RightAsideFooter>
+              <Button onPress={handleOnClose} variant="transparent">
+                Cancel
+              </Button>
+              <Button type="submit">Add Investor</Button>
+            </RightAsideFooter>
+          </form>
+        </RightAside>
+      )}
+
+      {cloneElement(trigger, { ...trigger.props, onPress: handleOpen })}
+    </>
+  );
+};
diff --git a/packages/apps/rwa-demo/src/components/InvestorInfo/InvestorInfo.tsx b/packages/apps/rwa-demo/src/components/InvestorInfo/InvestorInfo.tsx
index 57cc0467c7..c856ef4868 100644
--- a/packages/apps/rwa-demo/src/components/InvestorInfo/InvestorInfo.tsx
+++ b/packages/apps/rwa-demo/src/components/InvestorInfo/InvestorInfo.tsx
@@ -1,20 +1,32 @@
 import { useFreeze } from '@/hooks/freeze';
+import type { IRecord } from '@/utils/filterRemovedRecords';
 import { MonoPause, MonoPlayArrow } from '@kadena/kode-icons';
 import { Button, Heading, Stack } from '@kadena/kode-ui';
 import type { FC } from 'react';
 import React from 'react';
+import type { IWalletAccount } from '../AccountProvider/utils';
 import { InvestorBalance } from '../InvestorBalance/InvestorBalance';
 
 interface IProps {
-  investorAccount: string;
+  account: IRecord | IWalletAccount;
 }
 
-export const InvestorInfo: FC<IProps> = ({ investorAccount }) => {
-  const { frozen } = useFreeze({ investorAccount });
+const getAccountName = (account: IProps['account']) => {
+  if ('accountName' in account) return account.accountName;
+  return account.address;
+};
+
+export const InvestorInfo: FC<IProps> = ({ account }) => {
+  const accountName = getAccountName(account);
+  const { frozen } = useFreeze({ investorAccount: accountName });
+
+  if (!account) return null;
 
   return (
     <Stack width="100%" flexDirection="column">
-      <Heading as="h3">investor: {investorAccount}</Heading>
+      <Heading as="h3">
+        investor: {account.alias ? account.alias : accountName}
+      </Heading>
       <Stack width="100%" alignItems="center" gap="md">
         <Button isDisabled>
           {frozen ? (
@@ -30,7 +42,7 @@ export const InvestorInfo: FC<IProps> = ({ investorAccount }) => {
           )}
         </Button>
 
-        <InvestorBalance investorAccount={investorAccount} />
+        <InvestorBalance investorAccount={accountName} />
       </Stack>
     </Stack>
   );
diff --git a/packages/apps/rwa-demo/src/components/InvestorList/InvestorList.tsx b/packages/apps/rwa-demo/src/components/InvestorList/InvestorList.tsx
index 19e375dba5..4039daa642 100644
--- a/packages/apps/rwa-demo/src/components/InvestorList/InvestorList.tsx
+++ b/packages/apps/rwa-demo/src/components/InvestorList/InvestorList.tsx
@@ -1,53 +1,112 @@
+import { useAsset } from '@/hooks/asset';
 import { useDeleteInvestor } from '@/hooks/deleteInvestor';
 import { useGetInvestors } from '@/hooks/getInvestors';
-import { MonoDelete } from '@kadena/kode-icons';
-import { Button, Heading } from '@kadena/kode-ui';
-import { CompactTable, CompactTableFormatters } from '@kadena/kode-ui/patterns';
-import Link from 'next/link';
+import { MonoAdd, MonoDelete, MonoFindInPage } from '@kadena/kode-icons';
+import { Button } from '@kadena/kode-ui';
+import {
+  CompactTable,
+  CompactTableFormatters,
+  SectionCard,
+  SectionCardBody,
+  SectionCardContentBlock,
+  SectionCardHeader,
+} from '@kadena/kode-ui/patterns';
+import { useRouter } from 'next/navigation';
 import type { FC } from 'react';
+import { InvestorForm } from '../InvestorForm/InvestorForm';
+import { FormatFreeze } from '../TableFormatters/FormatFreeze';
 
 export const InvestorList: FC = () => {
   const { data } = useGetInvestors();
+  const router = useRouter();
   const { submit } = useDeleteInvestor();
+  const { paused } = useAsset();
 
   const handleDelete = async (accountName: any) => {
     return await submit({ investor: accountName });
   };
+  const handleLink = async (accountName: any) => {
+    router.push(`/investors/${accountName}`);
+  };
 
   return (
     <>
-      <Heading as="h3">Investors</Heading>
-      <CompactTable
-        fields={[
-          {
-            label: 'status',
-            key: 'result',
-            width: '10%',
-            render: CompactTableFormatters.FormatStatus(),
-          },
-          {
-            label: 'Account',
-            key: 'accountName',
-            width: '50%',
-            render: CompactTableFormatters.FormatLinkWrapper({
-              url: '/investors/:value',
-              linkComponent: Link,
-            }),
-          },
-          { label: 'Requestkey', key: 'requestKey', width: '30%' },
-          {
-            label: '',
-            key: 'accountName',
-            width: '10%',
-            render: CompactTableFormatters.FormatActions({
-              trigger: (
-                <Button startVisual={<MonoDelete />} onPress={handleDelete} />
-              ),
-            }),
-          },
-        ]}
-        data={data}
-      />
+      <SectionCard stack="vertical">
+        <SectionCardContentBlock>
+          <SectionCardHeader
+            title="Investors"
+            actions={
+              <InvestorForm
+                trigger={
+                  <Button
+                    isCompact
+                    variant="outlined"
+                    isDisabled={paused}
+                    endVisual={<MonoAdd />}
+                  >
+                    Add Investor
+                  </Button>
+                }
+              />
+            }
+          />
+
+          <SectionCardBody>
+            <CompactTable
+              fields={[
+                {
+                  label: 'Name',
+                  key: 'alias',
+                  width: '30%',
+                },
+                {
+                  label: 'Account',
+                  key: 'accountName',
+                  width: '35%',
+                  render: CompactTableFormatters.FormatAccount(),
+                },
+                {
+                  label: '',
+                  key: 'accountName',
+                  width: '10%',
+                  render: FormatFreeze(),
+                },
+                {
+                  label: '',
+                  key: 'accountName',
+                  width: '8%',
+                  render: CompactTableFormatters.FormatActions({
+                    trigger: (
+                      <Button
+                        isCompact
+                        variant="outlined"
+                        startVisual={<MonoFindInPage />}
+                        onPress={handleLink}
+                      />
+                    ),
+                  }),
+                },
+                {
+                  label: '',
+                  key: 'accountName',
+                  width: '7%',
+                  render: CompactTableFormatters.FormatActions({
+                    trigger: (
+                      <Button
+                        isCompact
+                        variant="outlined"
+                        startVisual={<MonoDelete />}
+                        onPress={handleDelete}
+                      />
+                    ),
+                  }),
+                },
+              ]}
+              data={data}
+            />
+          </SectionCardBody>
+        </SectionCardContentBlock>
+      </SectionCard>
     </>
   );
 };
diff --git a/packages/apps/rwa-demo/src/components/TableFormatters/FormatFreeze.tsx b/packages/apps/rwa-demo/src/components/TableFormatters/FormatFreeze.tsx
new file mode 100644
index 0000000000..a92ca4ad68
--- /dev/null
+++ b/packages/apps/rwa-demo/src/components/TableFormatters/FormatFreeze.tsx
@@ -0,0 +1,19 @@
+import type { ICompactTableFormatterProps } from '@kadena/kode-ui/patterns';
+import React from 'react';
+import { FreezeInvestor } from '../FreezeInvestor/FreezeInvestor';
+
+export interface IActionProps {}
+
+export const FormatFreeze = () => {
+  const Component = ({ value }: ICompactTableFormatterProps) => {
+    return (
+      <FreezeInvestor
+        isCompact={true}
+        variant="outlined"
+        iconOnly={true}
+        investorAccount={value as string}
+      />
+    );
+  };
+  return Component;
+};
diff --git a/packages/apps/rwa-demo/src/hooks/addAgent.ts b/packages/apps/rwa-demo/src/hooks/addAgent.ts
index c659ff9781..e660716173 100644
--- a/packages/apps/rwa-demo/src/hooks/addAgent.ts
+++ b/packages/apps/rwa-demo/src/hooks/addAgent.ts
@@ -3,6 +3,7 @@ import { interpretErrorMessage } from '@/components/TransactionsProvider/Transac
 import type { IAddAgentProps } from '@/services/addAgent';
 import { addAgent } from '@/services/addAgent';
 import { getClient } from '@/utils/client';
+import { store } from '@/utils/store';
 import { useNotifications } from '@kadena/kode-ui/patterns';
 import { useAccount } from './account';
 import { useTransactions } from './transactions';
@@ -16,6 +17,9 @@ export const useAddAgent = () => {
     data: IAddAgentProps,
   ): Promise<ITransaction | undefined> => {
     try {
+      //if the account is already agent, no need to add it again
+      if (data.alreadyExists) return;
+
       const tx = await addAgent(data, account!);
       const signedTransaction = await sign(tx);
       if (!signedTransaction) return;
@@ -33,6 +37,8 @@ export const useAddAgent = () => {
         label: 'there was an error',
         message: interpretErrorMessage(e.message),
       });
+    } finally {
+      await store.setAccount(data);
     }
   };
 
diff --git a/packages/apps/rwa-demo/src/hooks/addInvestor.ts b/packages/apps/rwa-demo/src/hooks/addInvestor.ts
index 5feead1f83..93d72904a1 100644
--- a/packages/apps/rwa-demo/src/hooks/addInvestor.ts
+++ b/packages/apps/rwa-demo/src/hooks/addInvestor.ts
@@ -3,6 +3,7 @@ import { interpretErrorMessage } from '@/components/TransactionsProvider/Transac
 import type { IRegisterIdentityProps } from '@/services/registerIdentity';
 import { registerIdentity } from '@/services/registerIdentity';
 import { getClient } from '@/utils/client';
+import { store } from '@/utils/store';
 import { useNotifications } from '@kadena/kode-ui/patterns';
 import { useAccount } from './account';
 import { useTransactions } from './transactions';
@@ -13,10 +14,13 @@ export const useAddInvestor = () => {
   const { addNotification } = useNotifications();
 
   const submit = async (
-    data: IRegisterIdentityProps,
+    data: Omit<IRegisterIdentityProps, 'agent'>,
   ): Promise<ITransaction | undefined> => {
     const newData: IRegisterIdentityProps = { ...data, agent: account! };
     try {
+      //if the account is already investor, no need to add it again
+      if (data.alreadyExists) return;
+
       const tx = await registerIdentity(newData);
       const signedTransaction = await sign(tx);
       if (!signedTransaction) return;
@@ -35,6 +39,8 @@ export const useAddInvestor = () => {
         label: 'there was an error',
         message: interpretErrorMessage(e.message),
       });
+    } finally {
+      await store.setAccount(data);
     }
   };
 
diff --git a/packages/apps/rwa-demo/src/hooks/freeze.ts b/packages/apps/rwa-demo/src/hooks/freeze.ts
index 13b4f3f112..30d6822eab 100644
--- a/packages/apps/rwa-demo/src/hooks/freeze.ts
+++ b/packages/apps/rwa-demo/src/hooks/freeze.ts
@@ -17,7 +17,11 @@ export const getEventsDocument = (
   },
 ): Apollo.DocumentNode => coreEvents;
 
-export const useFreeze = ({ investorAccount }: { investorAccount: string }) => {
+export const useFreeze = ({
+  investorAccount,
+}: {
+  investorAccount?: string;
+}) => {
   const { account } = useAccount();
   const [frozen, setFrozen] = useState(true);
 
@@ -29,9 +33,8 @@ export const useFreeze = ({ investorAccount }: { investorAccount: string }) => {
 
   const init = async () => {
     if (!account) return;
-    console.log('frozen check');
     const res = await isFrozen({
-      investorAccount: investorAccount,
+      investorAccount: investorAccount!,
       account: account,
     });
 
diff --git a/packages/apps/rwa-demo/src/hooks/getAgent.ts b/packages/apps/rwa-demo/src/hooks/getAgent.ts
new file mode 100644
index 0000000000..dbd79152e5
--- /dev/null
+++ b/packages/apps/rwa-demo/src/hooks/getAgent.ts
@@ -0,0 +1,37 @@
+import type { IRegisterIdentityProps } from '@/services/registerIdentity';
+import type { IRecord } from '@/utils/filterRemovedRecords';
+import { store } from '@/utils/store';
+import { useEffect, useState } from 'react';
+
+export const useGetAgent = ({ account }: { account: string }) => {
+  const [innerData, setInnerData] = useState<IRecord | undefined>();
+
+  const listenToAccount = (result: IRegisterIdentityProps) => {
+    setInnerData((v: any) => {
+      if (v) return { ...v, alias: result.alias };
+      return {
+        alias: result.alias,
+        account: result.accountName,
+      };
+    });
+  };
+
+  const initInnerData = async () => {
+    const data = await store.getAccount({ account });
+
+    setInnerData({
+      accountName: account,
+      alias: data?.alias,
+      creationTime: 0,
+    });
+  };
+
+  useEffect(() => {
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
+    initInnerData();
+    const off = store.listenToAccount(account, listenToAccount);
+    return off;
+  }, [account]);
+
+  return { data: innerData };
+};
diff --git a/packages/apps/rwa-demo/src/hooks/getAgents.ts b/packages/apps/rwa-demo/src/hooks/getAgents.ts
index 82f369311f..dce3a27dd6 100644
--- a/packages/apps/rwa-demo/src/hooks/getAgents.ts
+++ b/packages/apps/rwa-demo/src/hooks/getAgents.ts
@@ -8,6 +8,8 @@ import { env } from '@/utils/env';
 import type { IRecord } from '@/utils/filterRemovedRecords';
 import { filterRemovedRecords } from '@/utils/filterRemovedRecords';
 import { getAsset } from '@/utils/getAsset';
+import { setAliasesToAccounts } from '@/utils/setAliasesToAccounts';
+import { store } from '@/utils/store';
 import type * as Apollo from '@apollo/client';
 import { useEffect, useState } from 'react';
 
@@ -123,18 +125,29 @@ export const useGetAgents = () => {
       })
       .filter((v) => v !== undefined) ?? []) as IRecord[];
 
-    const filteredData = [
-      ...filterRemovedRecords([
-        ...agentsAdded,
-        ...agentsRemoved,
-        ...addedSubscriptionData,
-        ...removedSubscriptionData,
-      ]),
-    ];
+    const aliases = await store.getAccounts();
+    const filteredData = setAliasesToAccounts(
+      [
+        ...filterRemovedRecords([
+          ...agentsAdded,
+          ...agentsRemoved,
+          ...addedSubscriptionData,
+          ...removedSubscriptionData,
+        ]),
+      ],
+      aliases,
+    );
 
     setInnerData(filteredData ?? []);
   };
 
+  const listenToAccounts = (aliases: IRecord[]) => {
+    console.log({ aliases });
+    setInnerData((v) => {
+      return setAliasesToAccounts([...v], aliases);
+    });
+  };
+
   useEffect(() => {
     // eslint-disable-next-line @typescript-eslint/no-floating-promises
     initInnerData();
@@ -147,5 +160,11 @@ export const useGetAgents = () => {
     subscriptionAddData,
   ]);
 
+  useEffect(() => {
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
+    const off = store.listenToAccounts(listenToAccounts);
+    return off;
+  }, []);
+
   return { data: innerData, error };
 };
diff --git a/packages/apps/rwa-demo/src/hooks/getInvestor.ts b/packages/apps/rwa-demo/src/hooks/getInvestor.ts
new file mode 100644
index 0000000000..5e5437c2bd
--- /dev/null
+++ b/packages/apps/rwa-demo/src/hooks/getInvestor.ts
@@ -0,0 +1,50 @@
+import type { Exact, Scalars } from '@/__generated__/sdk';
+import { coreEvents } from '@/services/graph/agent.graph';
+import type { IRegisterIdentityProps } from '@/services/registerIdentity';
+import type { IRecord } from '@/utils/filterRemovedRecords';
+import { store } from '@/utils/store';
+import type * as Apollo from '@apollo/client';
+import { useEffect, useState } from 'react';
+
+export type EventQueryVariables = Exact<{
+  qualifiedName: Scalars['String']['input'];
+}>;
+
+export const getEventsDocument = (
+  variables: EventQueryVariables = {
+    qualifiedName: '',
+  },
+): Apollo.DocumentNode => coreEvents;
+
+export const useGetInvestor = ({ account }: { account: string }) => {
+  const [innerData, setInnerData] = useState<IRecord | undefined>();
+
+  const listenToAccount = (result: IRegisterIdentityProps) => {
+    setInnerData((v: any) => {
+      if (v) return { ...v, alias: result.alias };
+      return {
+        alias: result.alias,
+        account: result.accountName,
+      };
+    });
+  };
+
+  const initInnerData = async () => {
+    const data = await store.getAccount({ account });
+
+    setInnerData({
+      accountName: account,
+      alias: data?.alias,
+      creationTime: 0,
+    });
+  };
+
+  useEffect(() => {
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
+    initInnerData();
+    const off = store.listenToAccount(account, listenToAccount);
+    return off;
+  }, [account]);
+
+  return { data: innerData };
+};
diff --git a/packages/apps/rwa-demo/src/hooks/getInvestors.ts b/packages/apps/rwa-demo/src/hooks/getInvestors.ts
index b96f4481e8..eafe52237c 100644
--- a/packages/apps/rwa-demo/src/hooks/getInvestors.ts
+++ b/packages/apps/rwa-demo/src/hooks/getInvestors.ts
@@ -2,9 +2,12 @@ import type { Exact, Scalars } from '@/__generated__/sdk';
 import { useEventsQuery } from '@/__generated__/sdk';
 import type { ITransaction } from '@/components/TransactionsProvider/TransactionsProvider';
 import { coreEvents } from '@/services/graph/agent.graph';
+import type { IRegisterIdentityProps } from '@/services/registerIdentity';
 import type { IRecord } from '@/utils/filterRemovedRecords';
 import { filterRemovedRecords } from '@/utils/filterRemovedRecords';
 import { getAsset } from '@/utils/getAsset';
+import { setAliasesToAccounts } from '@/utils/setAliasesToAccounts';
+import { store } from '@/utils/store';
 import type * as Apollo from '@apollo/client';
 import { useEffect, useState } from 'react';
 import { useTransactions } from './transactions';
@@ -53,6 +56,7 @@ export const useGetInvestors = () => {
           requestKey: edge.node.requestKey,
           accountName: JSON.parse(edge.node.parameters)[0],
           creationTime: edge.node.block.creationTime,
+          alias: '',
           result: true,
         } as const;
       }) ?? [];
@@ -66,13 +70,25 @@ export const useGetInvestors = () => {
           requestKey: edge.node.requestKey,
           accountName: JSON.parse(edge.node.parameters)[0],
           creationTime: edge.node.block.creationTime,
+          alias: '',
           result: true,
         } as const;
       }) ?? [];
 
-    console.log({ agentsAdded, agentsRemoved });
+    const aliases = await store.getAccounts();
 
-    setInnerData([...filterRemovedRecords([...agentsAdded, ...agentsRemoved])]);
+    setInnerData(
+      setAliasesToAccounts(
+        [...filterRemovedRecords([...agentsAdded, ...agentsRemoved])],
+        aliases,
+      ),
+    );
+  };
+
+  const listenToAccounts = (aliases: IRegisterIdentityProps[]) => {
+    setInnerData((v) => {
+      return setAliasesToAccounts([...v], aliases);
+    });
   };
 
   useEffect(() => {
@@ -81,5 +97,11 @@ export const useGetInvestors = () => {
     initInnerData(tx);
   }, [transactions, addedData, removedData, removedLoading, addedLoading]);
 
+  useEffect(() => {
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
+    const off = store.listenToAccounts(listenToAccounts);
+    return off;
+  }, []);
+
   return { data: innerData, error };
 };
diff --git a/packages/apps/rwa-demo/src/services/addAgent.ts b/packages/apps/rwa-demo/src/services/addAgent.ts
index 27b9a6d64d..a07a294788 100644
--- a/packages/apps/rwa-demo/src/services/addAgent.ts
+++ b/packages/apps/rwa-demo/src/services/addAgent.ts
@@ -5,6 +5,9 @@ import { Pact } from '@kadena/client';
 
 export interface IAddAgentProps {
   accountName: string;
+  agent: IWalletAccount;
+  alias: string;
+  alreadyExists?: boolean;
 }
 
 const createPubKeyFromAccount = (account: string): string => {
diff --git a/packages/apps/rwa-demo/src/services/registerIdentity.ts b/packages/apps/rwa-demo/src/services/registerIdentity.ts
index 573a3b1b46..b3b2eddb58 100644
--- a/packages/apps/rwa-demo/src/services/registerIdentity.ts
+++ b/packages/apps/rwa-demo/src/services/registerIdentity.ts
@@ -6,6 +6,8 @@ import { Pact } from '@kadena/client';
 export interface IRegisterIdentityProps {
   accountName: string;
   agent: IWalletAccount;
+  alias: string;
+  alreadyExists?: boolean;
 }
 
 const createPubKeyFromAccount = (account: string): string => {
diff --git a/packages/apps/rwa-demo/src/utils/filterRemovedRecords.ts b/packages/apps/rwa-demo/src/utils/filterRemovedRecords.ts
index 96bac09b8e..d5b288f57c 100644
--- a/packages/apps/rwa-demo/src/utils/filterRemovedRecords.ts
+++ b/packages/apps/rwa-demo/src/utils/filterRemovedRecords.ts
@@ -1,11 +1,12 @@
 export interface IRecord {
   isRemoved?: boolean;
   blockHeight?: number;
-  chainId: string;
-  requestKey: string;
+  chainId?: string;
+  requestKey?: string;
   accountName: string;
+  alias?: string;
   creationTime: number;
-  result: boolean;
+  result?: boolean;
 }
 
 export const filterRemovedRecords = (arr: IRecord[]): IRecord[] => {
diff --git a/packages/apps/rwa-demo/src/utils/setAliasesToAccounts.ts b/packages/apps/rwa-demo/src/utils/setAliasesToAccounts.ts
new file mode 100644
index 0000000000..a9afd1e6c7
--- /dev/null
+++ b/packages/apps/rwa-demo/src/utils/setAliasesToAccounts.ts
@@ -0,0 +1,11 @@
+export const setAliasesToAccounts = (accounts: any[], aliases: any[]) => {
+  console.log();
+  return accounts.map((account) => {
+    const alias = aliases.find(
+      ({ accountName }) => accountName === account.accountName,
+    );
+    if (!alias) return account;
+
+    return { ...account, alias: alias.alias };
+  });
+};
diff --git a/packages/apps/rwa-demo/src/utils/store/index.ts b/packages/apps/rwa-demo/src/utils/store/index.ts
index bf96f2744c..cc20433a86 100644
--- a/packages/apps/rwa-demo/src/utils/store/index.ts
+++ b/packages/apps/rwa-demo/src/utils/store/index.ts
@@ -1,6 +1,8 @@
 import type { IWalletAccount } from '@/components/AccountProvider/utils';
 import type { ITransaction } from '@/components/TransactionsProvider/TransactionsProvider';
+import type { IRegisterIdentityProps } from '@/services/registerIdentity';
 import { get, off, onValue, ref, set } from 'firebase/database';
+import { getAsset } from '../getAsset';
 import { database } from './firebase';
 
 const RWAStore = () => {
@@ -44,11 +46,93 @@ const RWAStore = () => {
     return () => off(accountRef);
   };
 
+  const getAccounts = async (): Promise<IRegisterIdentityProps[]> => {
+    const asset = getAsset();
+    if (!asset) return [];
+
+    const snapshot = await get(ref(database, `${asset}/accounts`));
+
+    const data = snapshot.toJSON();
+    if (!data) return [];
+    return Object.entries(data).map(
+      ([key, value]) => value,
+    ) as IRegisterIdentityProps[];
+  };
+
+  const getAccount = async ({
+    account,
+  }: {
+    account: string;
+  }): Promise<IRegisterIdentityProps | undefined> => {
+    const asset = getAsset();
+    if (!asset) return;
+
+    const snapshot = await get(ref(database, `${asset}/accounts/${account}`));
+
+    return snapshot.toJSON() as IRegisterIdentityProps;
+  };
+
+  const setAccount = async ({
+    accountName,
+    alias,
+  }: Omit<IRegisterIdentityProps, 'agent'>) => {
+    const asset = getAsset();
+    if (!asset) return;
+
+    await set(ref(database, `${asset}/accounts/${accountName}`), {
+      accountName,
+      alias,
+    });
+  };
+
+  const listenToAccount = (
+    account: string,
+    setDataCallback: (account: IRegisterIdentityProps) => void,
+  ) => {
+    const asset = getAsset();
+    if (!asset) return;
+
+    const accountRef = ref(database, `${asset}/accounts/${account}`);
+    onValue(accountRef, async (snapshot) => {
+      const data = snapshot.toJSON();
+
+      if (!data) return;
+      setDataCallback(data as IRegisterIdentityProps);
+    });
+
+    return () => off(accountRef);
+  };
+
+  const listenToAccounts = (setDataCallback: (aliases: any[]) => void) => {
+    const asset = getAsset();
+    if (!asset) return;
+
+    const accountRef = ref(database, `${asset}/accounts`);
+    onValue(accountRef, async (snapshot) => {
+      const data = snapshot.toJSON();
+      if (!data) return setDataCallback([]);
+
+      setDataCallback(
+        Object.entries(data).map(
+          ([key, value]) => value,
+        ) as IRegisterIdentityProps[],
+      );
+    });
+
+    return () => off(accountRef);
+  };
+
   return {
     addTransaction,
     removeTransaction,
     getAllTransactions,
     listenToAllTransactions,
+
+    setAccount,
+    getAccount,
+    getAccounts,
+    listenToAccount,
+    listenToAccounts,
   };
 };
 
diff --git a/packages/libs/kode-ui/src/patterns/SectionCard/SectionCard.stories.tsx b/packages/libs/kode-ui/src/patterns/SectionCard/SectionCard.stories.tsx
index 2d6f414dbd..1c22580831 100644
--- a/packages/libs/kode-ui/src/patterns/SectionCard/SectionCard.stories.tsx
+++ b/packages/libs/kode-ui/src/patterns/SectionCard/SectionCard.stories.tsx
@@ -112,10 +112,11 @@ export const Primary: Story = {
   },
 };
 
-export const main: Story = {
-  name: 'SectionCard mainCard',
+export const horizontal: Story = {
+  name: 'SectionCard Horizontal',
   args: {
     title: 'Our section',
+    stack: 'vertical',
     description: <>Our section is awesome</>,
     actions: <Actions />,
     children: 'This is the content for our section',
diff --git a/packages/libs/kode-ui/src/patterns/SectionCard/SectionCardHeader.tsx b/packages/libs/kode-ui/src/patterns/SectionCard/SectionCardHeader.tsx
index 3c5722a783..a35a1006e4 100644
--- a/packages/libs/kode-ui/src/patterns/SectionCard/SectionCardHeader.tsx
+++ b/packages/libs/kode-ui/src/patterns/SectionCard/SectionCardHeader.tsx
@@ -49,8 +49,6 @@ export const SectionCardHeader: FC<ISectionCardHeaderProps> = ({
           {actions}
         </Stack>
       )}
-
-      <Stack style={{ gridArea: 'fill' }} />
     </Stack>
   );
 };