diff --git a/src/components/moderation/SubmissionItemsList.tsx b/src/components/moderation/SubmissionItemsList.tsx
index f81baca7..1f620f2b 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,27 +269,11 @@ export const SubmissionItemsList = memo(function SubmissionItemsList({
             data={entityData as unknown as RideModelSubmissionData}
             actionType={actionType}
           />
-          <DetailedViewCollapsible isCollapsed={isCollapsed} onToggle={toggle}>
-            <SubmissionChangesDisplay 
-              item={item}
-              view="detailed"
-              showImages={showImages}
-              submissionId={submissionId}
-            />
-          </DetailedViewCollapsible>
-        </>
-      );
-    }
-    
-    if ((item.item_type === 'milestone' || item.item_type === 'timeline_event') && entityData) {
-      return (
-        <>
-          {itemMetadata}
-          <RichTimelineEventDisplay
-            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"