diff --git a/src/components/Verification/AttributesListData.tsx b/src/components/Verification/AttributesListData.tsx
index 845682abe..9eac679dd 100644
--- a/src/components/Verification/AttributesListData.tsx
+++ b/src/components/Verification/AttributesListData.tsx
@@ -1,54 +1,46 @@
 import { Card } from 'flowbite-react';
+import CopyDid from '../../commonComponents/CopyDid';
 
 interface AttributesListProps {
-    attributeDataList: { entity: string; properties: any[] }[]
+    attributeDataList: { [key: string]: any }[] 
 }
 
-	const AttributesListData = ({attributeDataList}: AttributesListProps): JSX.Element => {
-		return (
-			<>
-				<Card >
-					<div className="flex h-full flex-col justify-center gap-0 sm:p-0">
-						<div className="flex border-b">
-							<div className="w-5/12 font-semibold flex truncate md:pl-1 sm:mr-8 md:mr-0 text-primary-700 dark:bg-gray-800 text-xl">
-								Attributes
-							</div>
-							<div className="w-1/12 font-semibold flex justify-start truncate md:pl-1 sm:mr-8 md:mr-0 text-primary-700 dark:bg-gray-800 text-xl">
-							</div>
-							<div className="w-6/12 font-semibold flex truncate sm:pl-4 text-primary-700 dark:bg-gray-800 text-xl">
-								{' '}
-								Values
-							</div>
-						</div>
+const AttributesListData = ({ attributeDataList }: AttributesListProps): JSX.Element => {
 
-						{
-							attributeDataList?.map((item, index) => (
-								<div
-									key={item?.entity + 1}
-									className="flex w-full"
-								>
-									<div
-										className={`flex w-full text-lg`}
-									>
-										<div className="w-5/12 m-1 p-1 text-start text-gray-700 dark:text-white text-lg">
-											{item?.entity}
-										</div>
-										<div className="w-1/12 m-1 p-1 flex  items-center text-gray-700 dark:text-white text-lg">
-											:
-										</div>
-										<div className="w-6/12 m-1 truncate p-1 flex justify-start text-gray-700 dark:text-white text-lg">
-											{item?.properties.join(', ')}
+    return (
+        <>
+            {attributeDataList?.map((item, index) => (
+                <Card key={index} className="mb-4">
+                    <div className="flex flex-col justify-start gap-2 p-4">
+					<div className="flex justify-start text-xl font-semibold text-gray-900 dark:text-white mb-2">
+                            {`Credential ${index + 1}`}
+                        </div>
+
+
+						{Object.entries(item).map(([key, value], idx) => (
+							<div key={idx} className="flex w-full text-lg items-center">
+								<div className="w-3/12 font-semibold text-primary-700 dark:bg-gray-800 m-1 p-1 flex justify-start items-center text-start">
+									{key}
+								</div>
+								<div className="flex items-center p-1 m-1">
+									:
+								</div>
+								<div className="w-9/12 m-1 text-start text-gray-600 dark:text-white items-center cursor-pointer overflow-auto">
+									{key === 'schemaId' || key === 'credDefId' ? (
+										<div className="flex items-center">
+											<CopyDid value={value} className="truncate font-courier mt-2" />
 										</div>
-									</div>
+									) : (
+										<span className="truncate font-courier">{value}</span>
+									)}
 								</div>
-							))
-						}
-
+							</div>
+						))}
 					</div>
 				</Card>
+			))}
+        </>
+    );
+}
 
-			</>
-		)
-	}
-
-    export default AttributesListData;
\ No newline at end of file
+export default AttributesListData;
diff --git a/src/components/Verification/EmailAttributesSelection.tsx b/src/components/Verification/EmailAttributesSelection.tsx
index 905c70936..fd52e48dd 100644
--- a/src/components/Verification/EmailAttributesSelection.tsx
+++ b/src/components/Verification/EmailAttributesSelection.tsx
@@ -29,18 +29,19 @@ const EmailAttributesSelection = () => {
 
 	const handleAttributeChange = async (
 		attributeName: string,
-		schemaId: string | undefined,
 		changeType: 'checkbox' | 'input' | 'select',
 		value: string | boolean,
+		schemaId?: string | undefined,
+        credDefId?: string | undefined
 	) => {
 		const updatedAttributes = attributeData?.map(attribute => {
-			if (attribute.attributeName === attributeName && attribute.schemaId === schemaId) {
+			if (attribute.attributeName === attributeName && attribute.schemaId === schemaId && attribute.credDefId === credDefId) {
 				switch (changeType) {
 					case 'checkbox':
 						return {
 							...attribute,
 							isChecked: value as boolean,
-							value: attribute?.value || '',
+							value: (value as boolean) ? attribute.value : '',
 							selectedOption: attribute?.condition || 'Select',
 							inputError: '',
 							selectError: '',
@@ -255,7 +256,7 @@ const EmailAttributesSelection = () => {
 									showCheckbox={true}
 									isVerificationUsingEmail={true}
 									onChange={(checked: boolean) => {
-										handleAttributeChange(attribute?.attributeName, attribute?.schemaId, 'checkbox', checked);
+										handleAttributeChange(attribute?.attributeName, 'checkbox', checked, attribute?.schemaId, attribute?.credDefId);
 									}}
 								/>
 							</div>
@@ -270,7 +271,7 @@ const EmailAttributesSelection = () => {
 										disabled={!attribute?.isChecked}
 										value={attribute?.selectedOption}
 										onChange={(e) =>
-											handleAttributeChange(attribute?.attributeName, attribute?.schemaId, 'select', e.target.value)
+											handleAttributeChange(attribute?.attributeName, 'select', e.target.value, attribute?.schemaId, attribute?.credDefId)
 										}
 										className={`${!attribute?.isChecked
 											? 'opacity-50 cursor-not-allowed'
@@ -302,7 +303,7 @@ const EmailAttributesSelection = () => {
 										type="number"
 										value={attribute?.value}
 										onChange={(e) =>
-											handleAttributeChange(attribute?.attributeName, attribute?.schemaId, 'input', e.target.value)
+											handleAttributeChange(attribute?.attributeName, 'input', e.target.value, attribute?.schemaId, attribute?.credDefId)
 										}
 										disabled={!attribute?.isChecked}
 										className={`${!attribute?.isChecked
diff --git a/src/components/Verification/ProofRequestPopup.tsx b/src/components/Verification/ProofRequestPopup.tsx
index 8fbdb3aef..edcc9242b 100644
--- a/src/components/Verification/ProofRequestPopup.tsx
+++ b/src/components/Verification/ProofRequestPopup.tsx
@@ -94,10 +94,9 @@ const ProofRequest = (props: IProofRrquestDetails) => {
 							) : (
 								<div className=" text-gray-500 dark:text-gray-300 w-full">
 									<div className="mt-1 ">
-										<AttributesListData attributeDataList={aggregatedData} />
-										<SchemaCredDefDetails
-											schemaCredDefList={props?.userData?.slice(0, 1)}
-										/>
+
+											<AttributesListData attributeDataList={props?.userData} />
+
 									</div>
 								</div>
 							)}
@@ -204,11 +203,9 @@ const ProofRequest = (props: IProofRrquestDetails) => {
 							) : (
 								<div className=" text-gray-500 dark:text-gray-300 w-full">
 									<div className="mt-1">
-										<AttributesListData attributeDataList={aggregatedData} />
+										<AttributesListData attributeDataList={props?.userData} />
+
 
-										<SchemaCredDefDetails
-											schemaCredDefList={props?.userData?.slice(0, 1)}
-										/>
 									</div>
 								</div>
 							)}
diff --git a/src/components/Verification/VerificationDashboard.tsx b/src/components/Verification/VerificationDashboard.tsx
index 16888675a..8334c8081 100644
--- a/src/components/Verification/VerificationDashboard.tsx
+++ b/src/components/Verification/VerificationDashboard.tsx
@@ -25,7 +25,7 @@ const VerificationDashboard = () => {
 		<Dashboard
 			title="Verify Credential"
 			options={options}
-			backButtonPath={pathRoutes.organizations.issuedCredentials}
+			backButtonPath={pathRoutes.organizations.credentials}
 		/>
 	);
 };
diff --git a/src/config/pathRoutes.ts b/src/config/pathRoutes.ts
index c8415ff82..00ac9a09e 100644
--- a/src/config/pathRoutes.ts
+++ b/src/config/pathRoutes.ts
@@ -49,14 +49,14 @@ export const pathRoutes = {
 		},
 		verification: {
 			requestProof: '/organizations/verification/verify-credentials',
-			email: '/organizations/verification/verify-credentials/email/schemas',
+			email: '/organizations/verification/verify-credentials/schema',
 			schema: '/organizations/verification/verify-credentials/schemas',
 			credDef: '/organizations/verification/verify-credentials/schemas/cred-defs',
-			w3cAttributes: '/organizations/verification/verify-credentials/email/schemas/attributes',
-			attributes: '/organizations/verification/verify-credentials/email/schemas/cred-defs/attributes',
-			emailVerification: '/organizations/verification/verify-credentials/email/schemas/cred-defs/attributes/verification-email',
-			w3cEmailVerification: '/organizations/verification/verify-credentials/email/schemas/attributes/verification-email',
-			emailCredDef: '/organizations/verification/verify-credentials/email/schemas/cred-defs',
+			w3cAttributes: '/organizations/verification/verify-credentials/schema/attributes',
+			attributes: '/organizations/verification/verify-credentials/schema/cred-defs/attributes',
+			emailVerification: '/organizations/verification/verify-credentials/schema/cred-defs/attributes/verification-email',
+			w3cEmailVerification: '/organizations/verification/verify-credentials/schema/attributes/verification-email',
+			emailCredDef: '/organizations/verification/verify-credentials/schema/cred-defs',
 			connections: '/organizations/verification/verify-credentials/schemas/cred-defs/connections',
 			W3CConnections: '/organizations/verification/verify-credentials/schemas/connections',
 
diff --git a/src/pages/organizations/verification/verify-credentials/email/index.astro b/src/pages/organizations/verification/verify-credentials/email/index.astro
deleted file mode 100644
index 49f7c7bc9..000000000
--- a/src/pages/organizations/verification/verify-credentials/email/index.astro
+++ /dev/null
@@ -1,14 +0,0 @@
----
-import LayoutSidebar from '../../../../../app/LayoutSidebar.astro';
-import { pathRoutes } from '../../../../../config/pathRoutes';
-import { checkUserSession } from '../../../../../utils/check-session';
-
-const response = await checkUserSession({cookies: Astro.cookies, currentPath: Astro.url.pathname});
-const route: string = pathRoutes.auth.sinIn
-if (!response.authorized) {
-	return Astro.redirect(response.redirect);
-}
----
-
-<LayoutSidebar notFoundPage={!response.permitted}>
-</LayoutSidebar>
diff --git a/src/pages/organizations/verification/verify-credentials/email/schemas/cred-defs/attributes/verification-email/index.astro b/src/pages/organizations/verification/verify-credentials/email/schemas/cred-defs/attributes/verification-email/index.astro
deleted file mode 100644
index cd4f921c5..000000000
--- a/src/pages/organizations/verification/verify-credentials/email/schemas/cred-defs/attributes/verification-email/index.astro
+++ /dev/null
@@ -1,15 +0,0 @@
----
-import LayoutSidebar from "../../../../../../../../../app/LayoutSidebar.astro";
-import EmailVerification from "../../../../../../../../../components/Verification/EmailVerification";
-import { checkUserSession } from "../../../../../../../../../utils/check-session";
-
-
-const response = await checkUserSession({cookies: Astro.cookies, currentPath: Astro.url.pathname});
-if (!response.authorized) {
-	return Astro.redirect(response.redirect);
-}
----
-
-<LayoutSidebar notFoundPage={!response.permitted}>
-	<EmailVerification client:load />
-</LayoutSidebar>
diff --git a/src/pages/organizations/verification/verify-credentials/email/schemas/cred-defs/attributes/index.astro b/src/pages/organizations/verification/verify-credentials/schema/attributes/index.astro
similarity index 52%
rename from src/pages/organizations/verification/verify-credentials/email/schemas/cred-defs/attributes/index.astro
rename to src/pages/organizations/verification/verify-credentials/schema/attributes/index.astro
index 5503c6b90..e4ace7ba9 100644
--- a/src/pages/organizations/verification/verify-credentials/email/schemas/cred-defs/attributes/index.astro
+++ b/src/pages/organizations/verification/verify-credentials/schema/attributes/index.astro
@@ -1,7 +1,7 @@
 ---
-import LayoutSidebar from "../../../../../../../../app/LayoutSidebar.astro";
-import EmailAttributesSelection from "../../../../../../../../components/Verification/EmailAttributesSelection";
-import { checkUserSession } from "../../../../../../../../utils/check-session";
+import LayoutSidebar from "../../../../../../app/LayoutSidebar.astro";
+import EmailAttributesSelection from "../../../../../../components/Verification/EmailAttributesSelection";
+import { checkUserSession } from "../../../../../../utils/check-session";
 
 const response = await checkUserSession({cookies: Astro.cookies, currentPath: Astro.url.pathname});
 if (!response.authorized) {
diff --git a/src/pages/organizations/verification/verify-credentials/email/schemas/cred-defs/index.astro b/src/pages/organizations/verification/verify-credentials/schema/attributes/verification-email/index.astro
similarity index 61%
rename from src/pages/organizations/verification/verify-credentials/email/schemas/cred-defs/index.astro
rename to src/pages/organizations/verification/verify-credentials/schema/attributes/verification-email/index.astro
index 9d224c9e5..cb6477470 100644
--- a/src/pages/organizations/verification/verify-credentials/email/schemas/cred-defs/index.astro
+++ b/src/pages/organizations/verification/verify-credentials/schema/attributes/verification-email/index.astro
@@ -1,17 +1,14 @@
 ---
 import LayoutSidebar from "../../../../../../../app/LayoutSidebar.astro";
-import EmailCredDefSelection from "../../../../../../../components/Verification/EmailCredDefSelection";
-import { pathRoutes } from "../../../../../../../config/pathRoutes";
+import EmailVerification from "../../../../../../../components/Verification/EmailVerification";
 import { checkUserSession } from "../../../../../../../utils/check-session";
 
-
 const response = await checkUserSession({cookies: Astro.cookies, currentPath: Astro.url.pathname});
-const route: string = pathRoutes.auth.sinIn
 if (!response.authorized) {
 	return Astro.redirect(response.redirect);
 }
 ---
 
 <LayoutSidebar notFoundPage={!response.permitted}>
-	<EmailCredDefSelection client:load/>
+	<EmailVerification client:load />
 </LayoutSidebar>
diff --git a/src/pages/organizations/verification/verify-credentials/email/schemas/attributes/index.astro b/src/pages/organizations/verification/verify-credentials/schema/cred-defs/attributes/index.astro
similarity index 100%
rename from src/pages/organizations/verification/verify-credentials/email/schemas/attributes/index.astro
rename to src/pages/organizations/verification/verify-credentials/schema/cred-defs/attributes/index.astro
diff --git a/src/pages/organizations/verification/verify-credentials/email/schemas/attributes/verification-email/index.astro b/src/pages/organizations/verification/verify-credentials/schema/cred-defs/attributes/verification-email/index.astro
similarity index 99%
rename from src/pages/organizations/verification/verify-credentials/email/schemas/attributes/verification-email/index.astro
rename to src/pages/organizations/verification/verify-credentials/schema/cred-defs/attributes/verification-email/index.astro
index aa8a0c183..f8d0da783 100644
--- a/src/pages/organizations/verification/verify-credentials/email/schemas/attributes/verification-email/index.astro
+++ b/src/pages/organizations/verification/verify-credentials/schema/cred-defs/attributes/verification-email/index.astro
@@ -3,6 +3,7 @@ import LayoutSidebar from "../../../../../../../../app/LayoutSidebar.astro";
 import EmailVerification from "../../../../../../../../components/Verification/EmailVerification";
 import { checkUserSession } from "../../../../../../../../utils/check-session";
 
+
 const response = await checkUserSession({cookies: Astro.cookies, currentPath: Astro.url.pathname});
 if (!response.authorized) {
 	return Astro.redirect(response.redirect);
diff --git a/src/pages/organizations/verification/verify-credentials/email/schemas/index.astro b/src/pages/organizations/verification/verify-credentials/schema/cred-defs/index.astro
similarity index 78%
rename from src/pages/organizations/verification/verify-credentials/email/schemas/index.astro
rename to src/pages/organizations/verification/verify-credentials/schema/cred-defs/index.astro
index 4f1d3bb1d..fb14349be 100644
--- a/src/pages/organizations/verification/verify-credentials/email/schemas/index.astro
+++ b/src/pages/organizations/verification/verify-credentials/schema/cred-defs/index.astro
@@ -1,9 +1,10 @@
 ---
 import LayoutSidebar from "../../../../../../app/LayoutSidebar.astro";
-import EmailSchemaSelection from "../../../../../../components/Verification/EmailSchemaSelection";
+import EmailCredDefSelection from "../../../../../../components/Verification/EmailCredDefSelection";
 import { pathRoutes } from "../../../../../../config/pathRoutes";
 import { checkUserSession } from "../../../../../../utils/check-session";
 
+
 const response = await checkUserSession({cookies: Astro.cookies, currentPath: Astro.url.pathname});
 const route: string = pathRoutes.auth.sinIn
 if (!response.authorized) {
@@ -12,5 +13,5 @@ if (!response.authorized) {
 ---
 
 <LayoutSidebar notFoundPage={!response.permitted}>
-	<EmailSchemaSelection client:load/>
+	<EmailCredDefSelection client:load/>
 </LayoutSidebar>
diff --git a/src/pages/organizations/verification/verify-credentials/schema/index.astro b/src/pages/organizations/verification/verify-credentials/schema/index.astro
new file mode 100644
index 000000000..1a56455dc
--- /dev/null
+++ b/src/pages/organizations/verification/verify-credentials/schema/index.astro
@@ -0,0 +1,16 @@
+---
+import LayoutSidebar from "../../../../../app/LayoutSidebar.astro";
+import EmailSchemaSelection from "../../../../../components/Verification/EmailSchemaSelection";
+import { pathRoutes } from "../../../../../config/pathRoutes";
+import { checkUserSession } from "../../../../../utils/check-session";
+
+const response = await checkUserSession({cookies: Astro.cookies, currentPath: Astro.url.pathname});
+const route: string = pathRoutes.auth.sinIn
+if (!response.authorized) {
+	return Astro.redirect(response.redirect);
+}
+---
+
+<LayoutSidebar notFoundPage={!response.permitted}>
+	<EmailSchemaSelection client:load/>
+</LayoutSidebar>