diff --git a/src/components/ERC20_Pool.tsx b/src/components/ERC20_Pool.tsx
index 8640f05..9c11b93 100644
--- a/src/components/ERC20_Pool.tsx
+++ b/src/components/ERC20_Pool.tsx
@@ -20,7 +20,8 @@ export function ERC20_Pool() {
         erc20 = erc20.map((item) => {
           erc20Map[item.address] = {
             ...item,
-            isBridged: isTokenBridged(item.address)
+            isBridged: isTokenBridged(item.address),
+            name: item.implementationAddress ? `${item.name} (Proxy)` : item.name
           };
           return {
             [IndexedDbKeyPath]: item.address,
diff --git a/src/hooks/ERC20_Pool.ts b/src/hooks/ERC20_Pool.ts
index e47b0f0..3b2a8d6 100644
--- a/src/hooks/ERC20_Pool.ts
+++ b/src/hooks/ERC20_Pool.ts
@@ -17,7 +17,8 @@ export const useERC20Pool = singletonHook(initValue, () => {
       erc20.forEach(item => {
         erc20Map[item.address] = {
           ...item,
-          isBridged: isTokenBridged(item.address)
+          isBridged: isTokenBridged(item.address),
+          name: item.implementationAddress ? `${item.name} (Proxy)` : item.name
         };
       })
       setMode(erc20Map)
@@ -55,6 +56,7 @@ export interface Erc20 {
     image?: string;
   };
   isBridged: boolean;
+  implementationAddress: string
 }
 
 export type ERC20_Pool = Record<string, Erc20>;
diff --git a/src/pages/AddressPage/ContractDetails/AbiMethodView.tsx b/src/pages/AddressPage/ContractDetails/AbiMethodView.tsx
index 9ce0d5d..364076f 100644
--- a/src/pages/AddressPage/ContractDetails/AbiMethodView.tsx
+++ b/src/pages/AddressPage/ContractDetails/AbiMethodView.tsx
@@ -184,7 +184,7 @@ export const AbiMethodsView = (props: {
               const itemType = input.type.slice(0, input.type.indexOf('[]'));
 
               return (
-                <Field gap='5px'>
+                <Field gap='5px' key={idx}>
                   <Text size='small'>
                     {name} <span>({input.type})</span>
                   </Text>
@@ -296,6 +296,7 @@ export const AbiMethodsView = (props: {
         {abiMethod.outputs
           ? abiMethod.outputs.map((input, idx) => {
             return (<AbiParam
+              key={idx}
               readonly={true}
               type={input.type}
               name={input.name}
diff --git a/src/pages/AddressPage/ContractDetails/index.tsx b/src/pages/AddressPage/ContractDetails/index.tsx
index b3c4d7a..f45f44c 100644
--- a/src/pages/AddressPage/ContractDetails/index.tsx
+++ b/src/pages/AddressPage/ContractDetails/index.tsx
@@ -27,13 +27,13 @@ const LabelSuccess = styled(Box)`
 export const ContractDetails = (props: {
   address: string;
   contracts?: AddressDetails | null;
-  sourceCode?: ISourceCode | null;
+  sourceCode: ISourceCode | null;
   implementation?: AddressDetails | null;
   implementationSourceCode?: ISourceCode | null;
   shard?: ShardID;
 }) => {
 
-  if (!!props.sourceCode) {
+  if (!!props.sourceCode || (props.implementation && props.implementationSourceCode)) {
     return (
       <VerifiedContractDetails
         sourceCode={props.sourceCode}
@@ -71,6 +71,7 @@ export const AbiMethods = (props: {
       {props.abi.map((abiMethod, idx) =>
         abiMethod.name ? (
           <AbiMethodsView
+            key={idx}
             abiMethod={abiMethod}
             address={props.address}
             index={idx}
@@ -201,9 +202,7 @@ export const NoVerifiedContractDetails = (props: {
           <Item
             label="Bytecode"
             value={
-              <StyledTextArea readOnly={true} rows={15} cols={100}>
-                {props.contracts.bytecode || ""}
-              </StyledTextArea>
+              <StyledTextArea readOnly={true} rows={15} cols={100} value={props.contracts.bytecode || ""} />
             }
           />
         </Box>
@@ -248,7 +247,7 @@ const TabButton = (props: {
 };
 
 export const VerifiedContractDetails = (props: {
-  sourceCode: ISourceCode;
+  sourceCode: ISourceCode | null;
   address: string;
   contracts?: AddressDetails | null;
   shard: number;
@@ -269,7 +268,7 @@ export const VerifiedContractDetails = (props: {
     : (chainId === 1666700000 || chainId === 1666900000);
 
   try {
-    abiString = JSON.stringify(props.sourceCode.abi, null, 4);
+    abiString = JSON.stringify(props.sourceCode?.abi, null, 4);
   } catch { }
 
   return (
@@ -281,7 +280,7 @@ export const VerifiedContractDetails = (props: {
           onClick={() => setTab(V_TABS.CODE)}
           selected={tab === V_TABS.CODE}
         />
-        {props.sourceCode.abi ? (
+        {props.sourceCode?.abi ? (
           <>
             <TabButton
               text={V_TABS.READ}
@@ -331,7 +330,7 @@ export const VerifiedContractDetails = (props: {
         ) : null}
 
       </Box>
-      {tab === V_TABS.CODE ? (
+      {tab === V_TABS.CODE && props.sourceCode ? (
         <Box style={{ padding: "10px" }} margin={{ top: "medium" }}>
           <Box direction="column" gap="30px">
             <Box direction="column">
@@ -357,8 +356,7 @@ export const VerifiedContractDetails = (props: {
                 <Item
                   label="Contract Source Code Verified"
                   value={
-                    <StyledTextArea readOnly={true} rows={15} cols={100} value={props.sourceCode.sourceCode || ""}>
-                    </StyledTextArea>
+                    <StyledTextArea readOnly={true} rows={15} cols={100} value={props.sourceCode.sourceCode || ""} />
                   }
                 />}
               {props.sourceCode.supporting?.sources
@@ -368,9 +366,7 @@ export const VerifiedContractDetails = (props: {
                     key={i}
                     label={`Verified ${source.substring(source.lastIndexOf('/') + 1)}`}
                     value={
-                      <StyledTextArea readOnly={true} rows={15} cols={100} value={props.sourceCode.supporting.sources[source].source || ""}>
-
-                      </StyledTextArea>
+                      <StyledTextArea readOnly={true} rows={15} cols={100} value={props.sourceCode?.supporting.sources[source].source || ""} />
                     }
                   />
                 })}
@@ -382,9 +378,7 @@ export const VerifiedContractDetails = (props: {
                     key={i}
                     label={`Verified ${source.substring(source.lastIndexOf('/') + 1)}`}
                     value={
-                      <StyledTextArea readOnly={true} rows={15} cols={100} value={props.sourceCode.supporting[source].source || ""}>
-
-                      </StyledTextArea>
+                      <StyledTextArea readOnly={true} rows={15} cols={100} value={props.sourceCode?.supporting[source].source || ""} />
                     }
                   />
                 })}
@@ -421,7 +415,9 @@ export const VerifiedContractDetails = (props: {
         </Box>
       ) : null}
 
-      {tab === V_TABS.READ && props.sourceCode.abi  ? (
+      {tab === V_TABS.CODE && !props.sourceCode && props.contracts && <NoVerifiedContractDetails contracts={props.contracts} address={props.address} shard={props.shard} />}
+
+      {tab === V_TABS.READ && props.sourceCode && props.sourceCode.abi  ? (
         <Box style={{ padding: "10px" }} margin={{ top: "medium" }}>
           <AbiMethods
             abi={props.sourceCode?.abi?.filter(
@@ -433,7 +429,7 @@ export const VerifiedContractDetails = (props: {
         </Box>
       ) : null}
 
-      {tab === V_TABS.WRITE && props.sourceCode.abi ? (
+      {tab === V_TABS.WRITE && props.sourceCode && props.sourceCode.abi ? (
         <Box style={{ padding: "10px" }} margin={{ top: "medium" }}>
           <Wallet onSetMetamask={setMetamask} onSetChainId={setChainId} />
           <AbiMethods