diff --git a/src/app/(frontend)/logistics/structures/[id]/page.tsx b/src/app/(frontend)/logistics/structures/[id]/page.tsx
index 3917394..3bf481c 100644
--- a/src/app/(frontend)/logistics/structures/[id]/page.tsx
+++ b/src/app/(frontend)/logistics/structures/[id]/page.tsx
@@ -5,8 +5,8 @@ import Link from "next/link";
 import { GameStructure, Structure, Faction, Resource } from "@/payload-types";
 import { convertLexicalToPlaintext } from "@payloadcms/richtext-lexical/plaintext";
 import { CapacityBar } from "@/components/frontend/storage/CapacityBar";
-import { ResourceList } from "@/components/frontend/storage/ResourceList";
 import { StorageRules } from "@/components/frontend/storage/StorageRules";
+import { StructureStorageView } from "@/components/frontend/storage/StructureStorageView";
 import {
   calculateStoredMass,
   calculateUtilization,
@@ -14,6 +14,7 @@ import {
   getFunctionTypeLabel,
   getGridSlots,
 } from "@/lib/logistics";
+import { pluralize } from "@/lib/utils";
 import {
   ArrowLeftIcon,
   BoxIcon,
@@ -200,9 +201,8 @@ export default async function StructureDetailPage({ params }: StructureDetailPag
         )}
       </div>
 
-      <ResourceList
-        storedResources={storedResources}
-        maxCapacityMass={structureType.maxCapacityMass ?? null}
+      <StructureStorageView
+        structure={structure}
       />
 
       <StorageRules
@@ -226,7 +226,7 @@ export default async function StructureDetailPage({ params }: StructureDetailPag
                 if (!resource || typeof resource === "number") return null;
                 return (
                   <span key={upkeep.id ?? index} className="text-sm bg-muted px-2.5 py-1 rounded-md">
-                    {resource.name}: {upkeep.amount?.toLocaleString()} {resource.unitOfMeasure}/tick
+                    {resource.name}: {upkeep.amount?.toLocaleString()} {pluralize(upkeep.amount ?? 0, resource.unitOfMeasure)}/tick
                   </span>
                 );
               })}