diff --git a/src/components/schema-display.tsx b/src/components/schema-display.tsx
index b32408d..de4039d 100644
--- a/src/components/schema-display.tsx
+++ b/src/components/schema-display.tsx
@@ -8,49 +8,95 @@ import {
 } from "@/components/ui/accordion";
 import { CopyButton } from "./copy-button";
 import { PrettySchemaDisplay } from "./pretty-schema-display";
+import { Badge } from "@/components/ui/badge";
 
 interface SchemaDisplayProps {
   schemas: any[];
 }
 
 export function SchemaDisplay({ schemas }: SchemaDisplayProps) {
+  const groupedSchemas = schemas.reduce((acc, schema) => {
+    const type = Array.isArray(schema["@type"])
+      ? schema["@type"].join(", ")
+      : schema["@type"] || "Untyped";
+    if (!acc[type]) {
+      acc[type] = [];
+    }
+    acc[type].push(schema);
+    return acc;
+  }, {} as Record<string, any[]>);
+
+  const SchemaContent = ({ schema }: { schema: any }) => {
+    const schemaJson = JSON.stringify(schema, null, 2);
+    return (
+      <>
+        <div className="border-t pt-4 mb-4">
+          <div className="flex justify-end items-center gap-2">
+            <span className="text-sm text-muted-foreground">
+              Copy Raw JSON
+            </span>
+            <CopyButton textToCopy={schemaJson} />
+          </div>
+        </div>
+        <PrettySchemaDisplay schema={schema} />
+      </>
+    );
+  };
+
   return (
     <div className="space-y-4">
       <div className="flex justify-between items-center p-4 bg-muted/50 rounded-lg">
         <p className="text-sm font-medium">
-          Found {schemas.length} schema block{schemas.length > 1 ? "s" : ""} on
-          this page.
+          Found {schemas.length} schema block{schemas.length > 1 ? "s" : ""} in{" "}
+          {Object.keys(groupedSchemas).length} type
+          {Object.keys(groupedSchemas).length > 1 ? "s" : ""}.
         </p>
         <p className="text-sm text-muted-foreground">Expand to see details.</p>
       </div>
-      <Accordion type="single" collapsible className="w-full space-y-4">
-        {schemas.map((schema, index) => {
-          const schemaType = schema["@type"] || `Schema Block ${index + 1}`;
-          const schemaJson = JSON.stringify(schema, null, 2);
-
-          return (
+      <Accordion type="multiple" className="w-full space-y-4">
+        {Object.entries(groupedSchemas).map(
+          ([type, schemaGroup], groupIndex) => (
             <AccordionItem
-              value={`item-${index}`}
-              key={index}
+              value={`group-${type}-${groupIndex}`}
+              key={groupIndex}
               className="border rounded-lg bg-background shadow-sm"
             >
               <AccordionTrigger className="px-6 hover:no-underline text-left">
-                <span className="font-semibold">{schemaType}</span>
-              </AccordionTrigger>
-              <AccordionContent className="px-6 pt-0">
-                <div className="border-t pt-4 mb-4">
-                  <div className="flex justify-end items-center gap-2">
-                    <span className="text-sm text-muted-foreground">
-                      Copy Raw JSON
-                    </span>
-                    <CopyButton textToCopy={schemaJson} />
-                  </div>
+                <div className="flex items-center gap-3">
+                  <span className="font-semibold">{type}</span>
+                  <Badge variant="secondary">{schemaGroup.length}</Badge>
                 </div>
-                <PrettySchemaDisplay schema={schema} />
+              </AccordionTrigger>
+              <AccordionContent className="px-6 pb-6 pt-0">
+                {schemaGroup.length > 1 ? (
+                  <div className="border-t pt-4">
+                    <Accordion
+                      type="multiple"
+                      className="w-full space-y-2"
+                    >
+                      {schemaGroup.map((schema, schemaIndex) => (
+                        <AccordionItem
+                          value={`schema-${groupIndex}-${schemaIndex}`}
+                          key={schemaIndex}
+                          className="border rounded-lg bg-muted/50"
+                        >
+                          <AccordionTrigger className="px-4 py-3 hover:no-underline text-sm font-medium">
+                            {type} #{schemaIndex + 1}
+                          </AccordionTrigger>
+                          <AccordionContent className="p-4 bg-background rounded-b-lg">
+                            <SchemaContent schema={schema} />
+                          </AccordionContent>
+                        </AccordionItem>
+                      ))}
+                    </Accordion>
+                  </div>
+                ) : (
+                  <SchemaContent schema={schemaGroup[0]} />
+                )}
               </AccordionContent>
             </AccordionItem>
-          );
-        })}
+          )
+        )}
       </Accordion>
     </div>
   );