diff --git a/app/[locale]/dashboard/[entityType]/[entitySlug]/layout.tsx b/app/[locale]/dashboard/[entityType]/[entitySlug]/layout.tsx
index ec71cd9b..0062457e 100644
--- a/app/[locale]/dashboard/[entityType]/[entitySlug]/layout.tsx
+++ b/app/[locale]/dashboard/[entityType]/[entitySlug]/layout.tsx
@@ -1,9 +1,10 @@
 'use client';
 
-import React from 'react';
+import React, { useEffect } from 'react';
 import { notFound, useParams } from 'next/navigation';
 import { SidebarNavItem } from '@/types';
 import { useQuery } from '@tanstack/react-query';
+import { create } from 'zustand';
 
 import { GraphQL } from '@/lib/api';
 import { cn } from '@/lib/utils';
@@ -12,6 +13,7 @@ import { DashboardNav } from '../../components/dashboard-nav';
 import { MobileDashboardNav } from '../../components/mobile-dashboard-nav';
 import styles from '../../components/styles.module.scss';
 import { getOrgDetailsQryDoc } from './schema';
+import { useDashboardStore } from '@/config/store';
 
 interface DashboardLayoutProps {
   children?: React.ReactNode;
@@ -20,16 +22,24 @@ interface DashboardLayoutProps {
 export default function OrgDashboardLayout({ children }: DashboardLayoutProps) {
   const [isOpened, setIsOpened] = React.useState(false);
   const params = useParams<{ entityType: string; entitySlug: string }>();
+  const { setEntityDetails, entityDetails, userDetails } = useDashboardStore();
 
   const EntityDetailsQryRes: { data: any; isLoading: boolean; error: any } =
     useQuery([`entity_details_${params.entityType}`], () =>
       GraphQL(
         params.entityType === 'organization' && getOrgDetailsQryDoc,
         {},
-        {  slug: params.entitySlug  }
+        { slug: params.entitySlug }
       )
     );
 
+  useEffect(() => {
+    if (EntityDetailsQryRes.data) {
+      setEntityDetails(EntityDetailsQryRes.data);
+    }
+  }, [EntityDetailsQryRes.data]);
+
+
   if (
     process.env.NEXT_PUBLIC_DATASPACE_FEATURE_ENABLED !== 'true' &&
     params.entityType === 'dataspace'
@@ -100,9 +110,10 @@ export default function OrgDashboardLayout({ children }: DashboardLayoutProps) {
           items={orgSidebarNav}
           entityDetails={
             params.entityType === 'organization'
-              ? EntityDetailsQryRes.data?.organizations[0]
-              : params.entitySlug.toLocaleLowerCase()
+              ? entityDetails?.organizations[0]
+              : userDetails?.me
           }
+          type={params.entityType}
         />
 
         <div className="z-1 basis-2 md:hidden">
diff --git a/app/[locale]/dashboard/[entityType]/[entitySlug]/profile/orgProfile.tsx b/app/[locale]/dashboard/[entityType]/[entitySlug]/profile/orgProfile.tsx
index faafe0a2..c92dd3f9 100644
--- a/app/[locale]/dashboard/[entityType]/[entitySlug]/profile/orgProfile.tsx
+++ b/app/[locale]/dashboard/[entityType]/[entitySlug]/profile/orgProfile.tsx
@@ -1,33 +1,15 @@
-import React, { useEffect } from 'react';
-import { useParams } from 'next/navigation';
 import { graphql } from '@/gql';
 import {
   ApiOrganizationOrganizationTypesEnum,
   OrganizationInputPartial,
 } from '@/gql/generated/graphql';
 import { useOrganizationTypes } from '@/hooks/useOrganizationTypes';
-import { useMutation, useQuery } from '@tanstack/react-query';
-import { Button, DropZone, Select, Text, TextField, toast } from 'opub-ui';
-
 import { GraphQL } from '@/lib/api';
-
-const OrgDetails: any = graphql(`
-  query orgDetails($slug: String) {
-    organizations(slug: $slug) {
-      id
-      name
-      logo {
-        name
-        path
-      }
-      homepage
-      organizationTypes
-      contactEmail
-      description
-      slug
-    }
-  }
-`);
+import { useMutation } from '@tanstack/react-query';
+import { useParams, useRouter } from 'next/navigation';
+import { Button, DropZone, Select, Text, TextField, toast } from 'opub-ui';
+import React, { useEffect } from 'react';
+import { useDashboardStore } from '@/config/store';
 
 const organizationUpdateMutation: any = graphql(`
   mutation updateOrganization($input: OrganizationInputPartial!) {
@@ -52,31 +34,25 @@ const organizationUpdateMutation: any = graphql(`
 `);
 
 const OrgProfile = () => {
-  const params = useParams<{ entitySlug: string }>();
+  const params = useParams<{ entitySlug: string; entityType: string }>();
+  const router = useRouter();
+  const { setEntityDetails, entityDetails } = useDashboardStore();
 
-  const orgDetails: any = useQuery([`org_details_${params.entitySlug}`], () =>
-    GraphQL(
-      OrgDetails,
-      {},
-      {
-        slug: params.entitySlug,
-      }
-    )
-  );
   const { organizationTypes } = useOrganizationTypes();
+
   useEffect(() => {
-    if (orgDetails.data) {
+    if (entityDetails && entityDetails.organizations) {
       setFormData({
-        name: orgDetails.data?.organizations[0].name,
-        contactEmail: orgDetails.data?.organizations[0].contactEmail,
-        organizationTypes: orgDetails.data?.organizations[0].organizationTypes,
-        homepage: orgDetails.data?.organizations[0].homepage,
-        description: orgDetails.data?.organizations[0].description,
-        logo: orgDetails.data?.organizations[0].logo,
-        id: orgDetails.data?.organizations[0].id,
+        name: entityDetails?.organizations[0].name,
+        contactEmail: entityDetails?.organizations[0].contactEmail,
+        organizationTypes: entityDetails?.organizations[0].organizationTypes,
+        homepage: entityDetails?.organizations[0].homepage,
+        description: entityDetails?.organizations[0].description,
+        logo: entityDetails?.organizations[0].logo,
+        id: entityDetails?.organizations[0].id,
       });
     }
-  }, [orgDetails.data]);
+  }, [entityDetails?.organizations]);
 
   const initialFormData = {
     name: '',
@@ -105,12 +81,20 @@ const OrgProfile = () => {
           logo: res?.updateOrganization?.logo,
           id: res?.updateOrganization?.id,
         });
+        setEntityDetails({
+          organizations: [formData],
+        });
+        if (res?.updateOrganization?.slug && res.updateOrganization.slug !== params.entitySlug) {
+          const newPath = `/dashboard/${params.entityType}/${res.updateOrganization.slug}/profile`;
+          router.replace(newPath);
+        }
       },
       onError: (error: any) => {
         toast(`Error: ${error.message}`);
       },
     }
   );
+
   const handleSave = () => {
     // Create mutation input with only changed fields
     const inputData: OrganizationInputPartial = {
@@ -128,7 +112,11 @@ const OrgProfile = () => {
     }
 
     mutate({ input: inputData });
+
+
   };
+
+  
   return (
     <div>
       <div>
@@ -214,4 +202,4 @@ const OrgProfile = () => {
   );
 };
 
-export default OrgProfile;
+export default OrgProfile;
\ No newline at end of file
diff --git a/app/[locale]/dashboard/[entityType]/[entitySlug]/profile/userProfile.tsx b/app/[locale]/dashboard/[entityType]/[entitySlug]/profile/userProfile.tsx
index fcd84c7f..123469d7 100644
--- a/app/[locale]/dashboard/[entityType]/[entitySlug]/profile/userProfile.tsx
+++ b/app/[locale]/dashboard/[entityType]/[entitySlug]/profile/userProfile.tsx
@@ -4,37 +4,11 @@ import React, { useEffect } from 'react';
 import { useParams } from 'next/navigation';
 import { graphql } from '@/gql';
 import { UpdateUserInput } from '@/gql/generated/graphql';
-import { useMutation, useQuery } from '@tanstack/react-query';
+import { useMutation } from '@tanstack/react-query';
 import { Button, DropZone, Text, TextField, toast } from 'opub-ui';
 
 import { GraphQL } from '@/lib/api';
-
-const UserDetails: any = graphql(`
-  query userDetails {
-    me {
-      bio
-      email
-      firstName
-      lastName
-      profilePicture {
-        name
-        path
-        url
-      }
-      username
-      id
-      organizationMemberships {
-        organization {
-          name
-          id
-        }
-        role {
-          name
-        }
-      }
-    }
-  }
-`);
+import { useDashboardStore } from '@/config/store';
 
 const updateUserMutation: any = graphql(`
   mutation updateUser($input: UpdateUserInput!) {
@@ -60,21 +34,19 @@ const updateUserMutation: any = graphql(`
 const UserProfile = () => {
   const params = useParams<{ entitySlug: string }>();
 
-  const userDetails: any = useQuery([`user_details_${params.entitySlug}`], () =>
-    GraphQL(UserDetails, {}, [])
-  );
+  const { setUserDetails, userDetails } = useDashboardStore();
 
   useEffect(() => {
-    if (userDetails.data) {
+    if (userDetails && userDetails?.me) {
       setFormData({
-        firstName: userDetails.data?.me?.firstName,
-        lastName: userDetails.data?.me?.lastName,
-        email: userDetails.data?.me?.email,
-        bio: userDetails.data?.me?.bio,
-        profilePicture: userDetails.data?.me?.profilePicture,
+        firstName: userDetails?.me?.firstName,
+        lastName: userDetails?.me?.lastName,
+        email: userDetails?.me?.email,
+        bio: userDetails?.me?.bio,
+        profilePicture: userDetails?.me?.profilePicture,
       });
     }
-  }, [userDetails.data]);
+  }, [userDetails]);
 
   const initialFormData = {
     firstName: '',
@@ -97,6 +69,10 @@ const UserProfile = () => {
           bio: res?.updateUser?.bio,
           profilePicture: res?.updateUser?.profilePicture,
         });
+        setUserDetails({
+          ...userDetails,
+          me: res.updateUser,
+        });
       },
       onError: (error: any) => {
         toast(`Error: ${error.message}`);
@@ -106,9 +82,7 @@ const UserProfile = () => {
 
   const [formData, setFormData] = React.useState(initialFormData);
 
-
   const handleSave = () => {
-
     // Create mutation input with only changed fields
     const inputData: UpdateUserInput = {
       firstName: formData.firstName,
diff --git a/app/[locale]/dashboard/[entityType]/[entitySlug]/schema.ts b/app/[locale]/dashboard/[entityType]/[entitySlug]/schema.ts
index 1029c1f9..bde1a37f 100644
--- a/app/[locale]/dashboard/[entityType]/[entitySlug]/schema.ts
+++ b/app/[locale]/dashboard/[entityType]/[entitySlug]/schema.ts
@@ -13,8 +13,38 @@ export const getOrgDetailsQryDoc: any = graphql(`
         width
         height
       }
+      homepage
+      organizationTypes
+      contactEmail
+      description
       slug
     }
   }
 `);
 
+export const UserDetailsQryDoc: any = graphql(`
+  query userDetails {
+    me {
+      bio
+      email
+      firstName
+      lastName
+      profilePicture {
+        name
+        path
+        url
+      }
+      username
+      id
+      organizationMemberships {
+        organization {
+          name
+          id
+        }
+        role {
+          name
+        }
+      }
+    }
+  }
+`);
\ No newline at end of file
diff --git a/app/[locale]/dashboard/[entityType]/page.tsx b/app/[locale]/dashboard/[entityType]/page.tsx
index c8c0fd4c..87662e43 100644
--- a/app/[locale]/dashboard/[entityType]/page.tsx
+++ b/app/[locale]/dashboard/[entityType]/page.tsx
@@ -1,24 +1,22 @@
 'use client';
 
-import { useState } from 'react';
+import { useMutation } from '@tanstack/react-query';
 import Image from 'next/image';
 import Link from 'next/link';
 import { notFound, useParams, usePathname } from 'next/navigation';
-import { useMutation, useQuery } from '@tanstack/react-query';
 import { Button, Dialog, DropZone, Icon, Select, Text, TextField, toast } from 'opub-ui';
+import { useState } from 'react';
 
-import { GraphQL } from '@/lib/api';
-import { cn } from '@/lib/utils';
 import BreadCrumbs from '@/components/BreadCrumbs';
 import { Icons } from '@/components/icons';
-import LoadingPage from '../loading';
-import styles from './../components/styles.module.scss';
-import { allOrganizationsListingDoc, organizationCreationMutation } from './schema';
 import { ApiOrganizationOrganizationTypesEnum, OrganizationInput } from '@/gql/generated/graphql';
 import { useOrganizationTypes } from '@/hooks/useOrganizationTypes';
-
-
-
+import { GraphQL } from '@/lib/api';
+import { cn } from '@/lib/utils';
+import LoadingPage from '../loading';
+import styles from './../components/styles.module.scss';
+import { useDashboardStore } from '@/config/store';
+import { organizationCreationMutation } from './schema';
 
 const Page = () => {
   const pathname = usePathname();
@@ -26,23 +24,7 @@ const Page = () => {
 
   const params = useParams<{ entityType: string }>();
 
-  const allEntitiesList: {
-    data: any;
-    isLoading: boolean;
-    error: any;
-    isError: boolean;
-    refetch: any
-  } = useQuery([`all_enitites_list_${params.entityType}`], () =>
-    GraphQL(
-      allOrganizationsListingDoc,
-      {
-        // Entity Headers if present
-      },
-      []
-    )
-  );
-
-
+  const { allEntityDetails, setAllEntityDetails } = useDashboardStore();
 
   const [isOpen, setIsOpen] = useState(false);
 
@@ -58,18 +40,27 @@ const Page = () => {
   const [formData, setFormData] = useState(initialFormData);
 
 
-
   const { mutate, isLoading: editMutationLoading } = useMutation(
     (input: { input: OrganizationInput }) =>
       GraphQL(organizationCreationMutation, {}, input),
     {
-      onSuccess: () => {
+      onSuccess: (res: any) => {
         toast('Organization created successfully');
         // Optionally, reset form or perform other actions
         setIsOpen(false);
         setFormData(initialFormData);
-
-        allEntitiesList.refetch();
+        setAllEntityDetails({
+          ...allEntityDetails,
+          organizations: [
+            ...(allEntityDetails?.organizations || []),
+            {
+              id: res.createOrganization.id,
+              name: res.createOrganization.name,
+              slug: res.createOrganization.slug,
+              logo: res.createOrganization.logo
+            }
+          ]
+        });
       },
       onError: (error: any) => {
         toast(`Error: ${error.message}`);
@@ -99,7 +90,7 @@ const Page = () => {
           ]}
         />
       <div className="m-auto flex w-11/12  flex-col">
-        {allEntitiesList.isLoading ? (
+        {allEntityDetails?.organizations?.length === 0 ? (
           <LoadingPage />
         ) : (
           <div className="container mb-40 ">
@@ -109,7 +100,7 @@ const Page = () => {
 
             <div className={cn(styles.Main)}>
               <div className="flex flex-wrap gap-6 md:gap-10 lg:gap-24">
-                {allEntitiesList?.data?.organizations?.map((entityItem: any) => {
+                {allEntityDetails?.organizations?.map((entityItem: any) => {
                   return (
                     <div key={entityItem.name}>
                       <EntityCard entityItem={entityItem} params={params} />
diff --git a/app/[locale]/dashboard/[entityType]/schema.ts b/app/[locale]/dashboard/[entityType]/schema.ts
index e9979ec1..fca78363 100644
--- a/app/[locale]/dashboard/[entityType]/schema.ts
+++ b/app/[locale]/dashboard/[entityType]/schema.ts
@@ -36,11 +36,24 @@ export const allDataSpacesListingDoc: any = graphql(`
   }
 `);
 
-
 export const organizationCreationMutation: any = graphql(`
-   mutation createOrganization($input: OrganizationInput!) {
+  mutation createOrganization($input: OrganizationInput!) {
     createOrganization(input: $input) {
       __typename
+      ... on TypeOrganization {
+        id
+        name
+        logo {
+          name
+          path
+          url
+        }
+        homepage
+        organizationTypes
+        contactEmail
+        description
+        slug
+      }
     }
   }
-`)
\ No newline at end of file
+`);
diff --git a/app/[locale]/dashboard/components/dashboard-nav.tsx b/app/[locale]/dashboard/components/dashboard-nav.tsx
index b7907e42..4c3858fc 100644
--- a/app/[locale]/dashboard/components/dashboard-nav.tsx
+++ b/app/[locale]/dashboard/components/dashboard-nav.tsx
@@ -14,15 +14,17 @@ import styles from '../dashboard.module.scss';
 
 interface DashboardNavProps {
   items: SidebarNavItem[];
+  type?: string;
 }
 export function DashboardNav({
   items,
   entityDetails,
+  type,
 }: DashboardNavProps & { entityDetails?: any }) {
   const [isCollapsed, setIsCollapsed] = useState(false);
 
   const [isImageValid, setIsImageValid] = useState(() => {
-    return entityDetails?.logo ? true : false;
+    return type === 'organization' && entityDetails?.logo ? true : type === 'self' && entityDetails?.profilePicture ? true : false;
   });
   const path = usePathname();
 
@@ -45,6 +47,7 @@ export function DashboardNav({
 
   const sidebarIcon = isCollapsed ? Icons.expand : Icons.collapse;
 
+
   return (
     <aside
       className={cn(
@@ -62,7 +65,7 @@ export function DashboardNav({
                 <Image
                   height={140}
                   width={140}
-                  src={`${process.env.NEXT_PUBLIC_BACKEND_URL}/${entityDetails?.logo?.url}`}
+                  src={ type === 'organization' ? `${process.env.NEXT_PUBLIC_BACKEND_URL}/${entityDetails?.logo?.url}` : `${process.env.NEXT_PUBLIC_BACKEND_URL}/${entityDetails?.profilePicture?.url}` }
                   alt={`${entityDetails?.name} logo`}
                   onError={() => {
                     setIsImageValid(false);
@@ -73,14 +76,14 @@ export function DashboardNav({
                 <Image
                   height={140}
                   width={140}
-                  src={path.includes('self') ? '/profile.png' : '/fallback.svg'}
+                  src={path.includes('self') ? '/profile.png' : '/org.png'}
                   alt={'fallback logo'}
                   className="fill-current object-contain text-baseGraySlateSolid6"
                 />
               )}
               <div className="flex flex-col items-center gap-3 text-center">
                 <Text variant="headingMd" fontWeight="medium">
-                  {entityDetails?.name || entityDetails}
+                  {entityDetails?.name || entityDetails.firstName}
                 </Text>
                 <Link
                   href={
diff --git a/app/[locale]/dashboard/components/main-nav.tsx b/app/[locale]/dashboard/components/main-nav.tsx
index 065a33e4..e1eb7738 100644
--- a/app/[locale]/dashboard/components/main-nav.tsx
+++ b/app/[locale]/dashboard/components/main-nav.tsx
@@ -1,12 +1,11 @@
 'use client';
 
-import React from 'react';
-import Image from 'next/image';
-import Link from 'next/link';
-import { usePathname } from 'next/navigation';
 import { useMetaKeyPress } from '@/hooks/use-meta-key-press';
 import { Session } from 'next-auth';
 import { signIn, signOut, useSession } from 'next-auth/react';
+import Image from 'next/image';
+import Link from 'next/link';
+import { usePathname } from 'next/navigation';
 import {
   Avatar,
   Button,
@@ -19,12 +18,16 @@ import {
   Divider,
   IconButton,
   Popover,
-  SearchInput,
   Spinner,
-  Text,
+  Text
 } from 'opub-ui';
+import React, { useEffect } from 'react';
 
 import { Icons } from '@/components/icons';
+import { useDashboardStore } from '@/config/store';
+import { GraphQL } from '@/lib/api';
+import { UserDetailsQryDoc } from '../[entityType]/[entitySlug]/schema';
+import { allOrganizationsListingDoc } from '../[entityType]/schema';
 import Sidebar from './sidebar';
 
 const profileLinks = [
@@ -41,6 +44,8 @@ export function MainNav({ hideSearch = false }) {
   const searchRef = React.useRef<HTMLInputElement>(null);
   const { data: session, status } = useSession();
   const [commandOpen, setCommandOpen] = React.useState(false);
+  const { setUserDetails, setAllEntityDetails, userDetails, allEntityDetails } =
+    useDashboardStore();
 
   useMetaKeyPress('k', () => setCommandOpen((e) => !e));
 
@@ -54,6 +59,45 @@ export function MainNav({ hideSearch = false }) {
     }
   }
 
+  const handleSignIn = async () => {
+    try {
+      // First attempt sign in
+      await signIn('keycloak', { 
+        redirect: true,
+        callbackUrl: '/dashboard'
+      });
+      
+      // The above will redirect automatically, no need for additional code
+      // If redirect is needed manually, we can use:
+      // router.push('/dashboard');
+      
+    } catch (error) {
+      console.error('Sign in error:', error);
+    }
+  };
+
+  useEffect(() => {
+    const fetchData = async () => {
+      if (session?.user) {
+        try {
+          // Fetch both queries in parallel
+          const [userDetailsRes, entityDetailsRes] = await Promise.all([
+            GraphQL(UserDetailsQryDoc, {}, []),
+            GraphQL(allOrganizationsListingDoc, {}, [])
+          ]);
+
+          // Update store with results
+          setUserDetails(userDetailsRes);
+          setAllEntityDetails(entityDetailsRes);
+        } catch (queryError) {
+          console.error('Error fetching data:', queryError);
+        }
+      }
+    };
+
+    fetchData();
+  }, [session]);
+
   if (isLoggingOut) {
     return <LogginOutPage />;
   }
@@ -77,8 +121,9 @@ export function MainNav({ hideSearch = false }) {
     },
   ];
 
+
   return (
-    <nav className='p-4 lg:p-6'>
+    <nav className="p-4 lg:p-6">
       <div className="flex items-center justify-between gap-4  ">
         <div className="flex items-center gap-1">
           <div className="lg:hidden">
@@ -92,7 +137,7 @@ export function MainNav({ hideSearch = false }) {
           </div>
           <Link href="/">
             <div className="flex items-center gap-2">
-              <div className="group relative h-[38px] rounded-full w-[38px] overflow-hidden">
+              <div className="group relative h-[38px] w-[38px] overflow-hidden rounded-full">
                 {/* Static Logo */}
                 <div className="absolute inset-0 transition-opacity duration-300 group-hover:opacity-0">
                   <Image
@@ -179,16 +224,12 @@ export function MainNav({ hideSearch = false }) {
               ) : (
                 <Button
                   onClick={() => {
-                    console.log(
-                      process.env.NEXTAUTH_URL,
-                      process.env.NEXT_PUBLIC_NEXTAUTH_URL
-                    );
-                    signIn('keycloak');
+                    handleSignIn();
                   }}
                   kind="secondary"
-                  className=' bg-tertiaryAccent'
+                  className=" bg-tertiaryAccent"
                 >
-                  <Text variant="headingMd" >LOGIN / SIGN UP</Text>
+                  <Text variant="headingMd">LOGIN / SIGN UP</Text>
                 </Button>
               )}
             </div>
@@ -274,11 +315,9 @@ export const ProfileContent = ({
 
 const LogginOutPage = () => {
   return (
-    <div className=" flex items-center bg-surfaceDefault p-2 justify-end gap-4">
+    <div className=" flex items-center justify-end gap-4 bg-surfaceDefault p-2">
       <Spinner color="surface" />
-      <Text variant="headingLg" >
-        Logging out...
-      </Text>
+      <Text variant="headingLg">Logging out...</Text>
     </div>
   );
 };
diff --git a/app/[locale]/dashboard/page.tsx b/app/[locale]/dashboard/page.tsx
index a7ab82f7..c9a6760d 100644
--- a/app/[locale]/dashboard/page.tsx
+++ b/app/[locale]/dashboard/page.tsx
@@ -1,17 +1,19 @@
 'use client';
 
+import Link from 'next/link';
 import { Icon, Text } from 'opub-ui';
 
 import BreadCrumbs from '@/components/BreadCrumbs';
 import { Icons } from '@/components/icons';
-import Link from 'next/link';
+import { useDashboardStore } from '@/config/store';
 
 const UserDashboard = () => {
+  const { userDetails, allEntityDetails } = useDashboardStore();
   const list = [
     {
       label: 'My Dashboard',
       icon: Icons.user,
-      path: '/dashboard/self/sanjay/dataset',
+      path: `/dashboard/self/${userDetails?.me?.firstName}_${userDetails?.me?.id}/dataset`,
     },
     {
       label: 'Organizations',
@@ -20,6 +22,7 @@ const UserDashboard = () => {
     },
   ];
 
+
   return (
     <>
       <BreadCrumbs
@@ -34,16 +37,16 @@ const UserDashboard = () => {
 
       <div className="container mb-40 ">
         <div className=" flex flex-col gap-6 py-10">
-          <Text variant='headingXl'> User Dashboard</Text>
+          <Text variant="headingXl"> User Dashboard</Text>
         </div>
-        <div className="flex items-center lg:flex-nowrap md:flex-nowrap flex-wrap gap-6">
+        <div className="flex flex-wrap items-center gap-6 md:flex-nowrap lg:flex-nowrap">
           {list.map((item, index) => (
             <Link
-              key={index}   
+              key={index}
               href={item.path}
-              className=" rounded-4 flex w-full min-h-56 max-h-56  p-4 justify-center flex-col items-center gap-3 bg-greyExtralight "
+              className=" flex max-h-56 min-h-56 w-full flex-col  items-center justify-center gap-3 rounded-4 bg-greyExtralight p-4 "
             >
-              <Icon source={item.icon} size={60} color='highlight' />
+              <Icon source={item.icon} size={60} color="highlight" />
               <Text variant="headingLg">{item.label}</Text>
             </Link>
           ))}
diff --git a/config/store.ts b/config/store.ts
index afebfff3..e12d3adf 100644
--- a/config/store.ts
+++ b/config/store.ts
@@ -11,4 +11,22 @@ export const useIsNavigating = create<NavigationProps>((set) => ({
   setIsNavigation: (isNavigating) => set({ isNavigating }),
 }));
 
+interface DashboardStore {
+  entityDetails: any;
+  userDetails: any;
+  setEntityDetails: (data: any) => void;
+  setUserDetails: (data: any) => void;
+  allEntityDetails: any;
+  setAllEntityDetails: (data: any) => void;
+}
+
+export const useDashboardStore = create<DashboardStore>((set) => ({
+  entityDetails: null,
+  userDetails: null,
+  setEntityDetails: (data) => set({ entityDetails: data }),
+  setUserDetails: (data) => set({ userDetails: data }),
+  allEntityDetails: null,
+  setAllEntityDetails: (data) => set({ allEntityDetails: data }),
+}));
+
 export { shallow };
diff --git a/public/org.png b/public/org.png
new file mode 100644
index 00000000..68f83cf0
Binary files /dev/null and b/public/org.png differ