diff --git a/src/components/moderation/DetailedViewCollapsible.tsx b/src/components/moderation/DetailedViewCollapsible.tsx
index 1be331ce..6c20ce7b 100644
--- a/src/components/moderation/DetailedViewCollapsible.tsx
+++ b/src/components/moderation/DetailedViewCollapsible.tsx
@@ -1,12 +1,14 @@
 import { ChevronDown, ChevronUp } from 'lucide-react';
 import { Collapsible, CollapsibleTrigger, CollapsibleContent } from '@/components/ui/collapsible';
 import { Button } from '@/components/ui/button';
+import { Badge } from '@/components/ui/badge';
 import { cn } from '@/lib/utils';
 
 interface DetailedViewCollapsibleProps {
   isCollapsed: boolean;
   onToggle: () => void;
   children: React.ReactNode;
+  fieldCount?: number;
   className?: string;
 }
 
@@ -18,6 +20,7 @@ export function DetailedViewCollapsible({
   isCollapsed,
   onToggle,
   children,
+  fieldCount,
   className
 }: DetailedViewCollapsibleProps) {
   return (
@@ -27,25 +30,35 @@ export function DetailedViewCollapsible({
           <Button
             variant="ghost"
             size="sm"
-            className="w-full flex items-center justify-between hover:bg-muted/50 p-2 h-auto"
+            className="w-full flex items-center justify-between hover:bg-muted/50 p-2 h-auto transition-colors"
           >
-            <div className="text-xs font-semibold text-muted-foreground uppercase tracking-wide">
-              All Fields (Detailed View)
+            <div className="flex items-center gap-2">
+              <span className="text-xs font-semibold text-muted-foreground uppercase tracking-wide">
+                All Fields (Detailed View)
+              </span>
+              {fieldCount !== undefined && fieldCount > 0 && (
+                <Badge 
+                  variant="secondary" 
+                  className="h-5 px-1.5 text-xs font-normal transition-transform duration-200 hover:scale-105"
+                >
+                  {fieldCount}
+                </Badge>
+              )}
             </div>
             <div className="flex items-center gap-2">
               <span className="text-xs text-muted-foreground normal-case font-normal">
                 {isCollapsed ? 'Show' : 'Hide'}
               </span>
               {isCollapsed ? (
-                <ChevronDown className="h-4 w-4 text-muted-foreground" />
+                <ChevronDown className="h-4 w-4 text-muted-foreground transition-transform duration-200" />
               ) : (
-                <ChevronUp className="h-4 w-4 text-muted-foreground" />
+                <ChevronUp className="h-4 w-4 text-muted-foreground transition-transform duration-200" />
               )}
             </div>
           </Button>
         </CollapsibleTrigger>
         
-        <CollapsibleContent className="mt-3">
+        <CollapsibleContent className="mt-3 data-[state=closed]:animate-accordion-up data-[state=open]:animate-accordion-down">
           {children}
         </CollapsibleContent>
       </div>
diff --git a/src/components/moderation/SubmissionItemsList.tsx b/src/components/moderation/SubmissionItemsList.tsx
index f81baca7..85ab1b3b 100644
--- a/src/components/moderation/SubmissionItemsList.tsx
+++ b/src/components/moderation/SubmissionItemsList.tsx
@@ -42,6 +42,12 @@ export const SubmissionItemsList = memo(function SubmissionItemsList({
     fetchSubmissionItems();
   }, [submissionId]);
 
+  // Helper function to count non-null fields in entity data
+  const countFields = (data: any): number => {
+    if (!data || typeof data !== 'object') return 0;
+    return Object.values(data).filter(value => value !== null && value !== undefined).length;
+  };
+
   const fetchSubmissionItems = async () => {
     try {
       // Only show skeleton on initial load, show refreshing indicator on refresh
@@ -191,7 +197,11 @@ export const SubmissionItemsList = memo(function SubmissionItemsList({
             data={entityData as unknown as ParkSubmissionData}
             actionType={actionType}
           />
-          <DetailedViewCollapsible isCollapsed={isCollapsed} onToggle={toggle}>
+          <DetailedViewCollapsible 
+            isCollapsed={isCollapsed} 
+            onToggle={toggle}
+            fieldCount={countFields(entityData)}
+          >
             <SubmissionChangesDisplay 
               item={item}
               view="detailed"
@@ -211,7 +221,11 @@ export const SubmissionItemsList = memo(function SubmissionItemsList({
             data={entityData as unknown as RideSubmissionData}
             actionType={actionType}
           />
-          <DetailedViewCollapsible isCollapsed={isCollapsed} onToggle={toggle}>
+          <DetailedViewCollapsible 
+            isCollapsed={isCollapsed} 
+            onToggle={toggle}
+            fieldCount={countFields(entityData)}
+          >
             <SubmissionChangesDisplay 
               item={item}
               view="detailed"
@@ -231,7 +245,11 @@ export const SubmissionItemsList = memo(function SubmissionItemsList({
             data={entityData as unknown as CompanySubmissionData}
             actionType={actionType}
           />
-          <DetailedViewCollapsible isCollapsed={isCollapsed} onToggle={toggle}>
+          <DetailedViewCollapsible 
+            isCollapsed={isCollapsed} 
+            onToggle={toggle}
+            fieldCount={countFields(entityData)}
+          >
             <SubmissionChangesDisplay 
               item={item}
               view="detailed"
@@ -251,7 +269,11 @@ export const SubmissionItemsList = memo(function SubmissionItemsList({
             data={entityData as unknown as RideModelSubmissionData}
             actionType={actionType}
           />
-          <DetailedViewCollapsible isCollapsed={isCollapsed} onToggle={toggle}>
+          <DetailedViewCollapsible 
+            isCollapsed={isCollapsed} 
+            onToggle={toggle}
+            fieldCount={countFields(entityData)}
+          >
             <SubmissionChangesDisplay 
               item={item}
               view="detailed"
@@ -271,7 +293,11 @@ export const SubmissionItemsList = memo(function SubmissionItemsList({
             data={entityData as unknown as TimelineSubmissionData}
             actionType={actionType}
           />
-          <DetailedViewCollapsible isCollapsed={isCollapsed} onToggle={toggle}>
+          <DetailedViewCollapsible 
+            isCollapsed={isCollapsed} 
+            onToggle={toggle}
+            fieldCount={countFields(entityData)}
+          >
             <SubmissionChangesDisplay 
               item={item}
               view="detailed"