diff --git a/packages/nextjs/app/(app)/dashboard/page.tsx b/packages/nextjs/app/(app)/dashboard/page.tsx
index b382524..d372bce 100644
--- a/packages/nextjs/app/(app)/dashboard/page.tsx
+++ b/packages/nextjs/app/(app)/dashboard/page.tsx
@@ -10,14 +10,16 @@ export const metadata: Metadata = {
 
 export default function DashboardPage() {
   return (
-    <div className="w-full min-h-full flex justify-center bg-neutral-100 shadow-2xl">
+    <>
       <div className="flex justify-center w-full ">
         <p>Welcome, Partner! Start by claiming a role!🤝</p>
       </div>
-      <ClaimRoleCard />
-      <DataRegistry />
-      <MineralToken />
-      <SupplyChain />
-    </div>
+      <div className="w-full min-h-full flex justify-center bg-neutral-100 shadow-2xl">
+        <ClaimRoleCard />
+        <DataRegistry />
+        <MineralToken />
+        <SupplyChain />
+      </div>
+    </>
   );
 }
diff --git a/packages/nextjs/components/dashboard/ClaimRoleCard.tsx b/packages/nextjs/components/dashboard/ClaimRoleCard.tsx
index 3543967..f0dab24 100644
--- a/packages/nextjs/components/dashboard/ClaimRoleCard.tsx
+++ b/packages/nextjs/components/dashboard/ClaimRoleCard.tsx
@@ -1,6 +1,6 @@
-/* eslint-disable prettier/prettier */
 "use client";
 
+/* eslint-disable prettier/prettier */
 import { useState } from "react";
 import { ethers } from "ethers";
 import {
diff --git a/packages/nextjs/components/dashboard/DataRegistry.tsx b/packages/nextjs/components/dashboard/DataRegistry.tsx
index 77c112e..d29c322 100644
--- a/packages/nextjs/components/dashboard/DataRegistry.tsx
+++ b/packages/nextjs/components/dashboard/DataRegistry.tsx
@@ -1,5 +1,5 @@
-/* eslint-disable prettier/prettier */
 "use client";
+/* eslint-disable prettier/prettier */
 
 import { useState, useEffect } from "react";
 import { ethers } from "ethers";
diff --git a/packages/nextjs/components/scaffold-eth/RainbowKitCustomConnectButton/AddressInfoDropdown.tsx b/packages/nextjs/components/scaffold-eth/RainbowKitCustomConnectButton/AddressInfoDropdown.tsx
index a9e3125..91ac811 100644
--- a/packages/nextjs/components/scaffold-eth/RainbowKitCustomConnectButton/AddressInfoDropdown.tsx
+++ b/packages/nextjs/components/scaffold-eth/RainbowKitCustomConnectButton/AddressInfoDropdown.tsx
@@ -33,7 +33,7 @@ export const AddressInfoDropdown = ({
   blockExplorerAddressLink,
 }: AddressInfoDropdownProps) => {
   const { disconnect } = useDisconnect();
-  const checkSumAddress = getAddress(address);
+  const checkSumAddress = address ? getAddress(address) : null;
 
   const [addressCopied, setAddressCopied] = useState(false);
 
@@ -49,7 +49,7 @@ export const AddressInfoDropdown = ({
     <>
       <details ref={dropdownRef} className="dropdown dropdown-end leading-3">
         <summary tabIndex={0} className="btn btn-secondary btn-sm pl-0 pr-2 shadow-md dropdown-toggle gap-0 !h-auto">
-          <BlockieAvatar address={checkSumAddress} size={30} ensImage={ensAvatar} />
+          <BlockieAvatar address={checkSumAddress || ""} size={30} ensImage={ensAvatar} />
           <span className="ml-2 mr-1">
             {isENS(displayName) ? displayName : checkSumAddress?.slice(0, 6) + "..." + checkSumAddress?.slice(-4)}
           </span>