diff --git a/src/frontend/src/components/previews/AttributeGrid.tsx b/src/frontend/src/components/previews/AttributeGrid.tsx
index 8f0c6e2204..e63e79e8b6 100644
--- a/src/frontend/src/components/previews/AttributeGrid.tsx
+++ b/src/frontend/src/components/previews/AttributeGrid.tsx
@@ -1,4 +1,4 @@
-import { Divider, SimpleGrid, Text, Title } from '@mantine/core';
+import { Divider, Table, Title } from '@mantine/core';
 import type { ReactNode } from 'react';
 
 export interface AttributeRow {
@@ -23,18 +23,18 @@ export function AttributeGrid({
     <>
       <Divider />
       <Title order={4}>{title}</Title>
-      <SimpleGrid cols={2} spacing='xs'>
-        {valid.map((item) => (
-          <>
-            <Text key={`${item.label}-label`} fw={'bold'} size='sm'>
-              {item.label}
-            </Text>
-            <Text key={`${item.label}-value`} size='sm'>
-              {item.value}
-            </Text>
-          </>
-        ))}
-      </SimpleGrid>
+      <Table striped withRowBorders={false} fz='sm'>
+        <Table.Tbody>
+          {valid.map((item) => (
+            <Table.Tr key={item.label}>
+              <Table.Td w='50%' fw='bold'>
+                {item.label}
+              </Table.Td>
+              <Table.Td w='50%'>{item.value}</Table.Td>
+            </Table.Tr>
+          ))}
+        </Table.Tbody>
+      </Table>
     </>
   );
 }
diff --git a/src/frontend/src/components/previews/models/PartPreview.tsx b/src/frontend/src/components/previews/models/PartPreview.tsx
index d0e97e7bd6..da5b7c6671 100644
--- a/src/frontend/src/components/previews/models/PartPreview.tsx
+++ b/src/frontend/src/components/previews/models/PartPreview.tsx
@@ -81,7 +81,7 @@ function PartPreviewContent({ instance }: Readonly<{ instance: any }>) {
                 (instance?.units ? ` ${instance.units}` : '')
             }
           : null
-      ].filter(Boolean)
+      ].filter((x): x is NonNullable<typeof x> => x !== null)
     : [];
 
   const parameterItems: AttributeRow[] = parameters.map((param: any) => ({