diff --git a/maternal-web/components/settings/DeviceTrustManagement.tsx b/maternal-web/components/settings/DeviceTrustManagement.tsx
index ce3f8fb..8244493 100644
--- a/maternal-web/components/settings/DeviceTrustManagement.tsx
+++ b/maternal-web/components/settings/DeviceTrustManagement.tsx
@@ -203,37 +203,33 @@ export function DeviceTrustManagement() {
                     <ListItem>
                       <Box sx={{ mr: 2 }}>{getPlatformIcon(device.platform)}</Box>
                       <ListItemText
-                        primary={
-                          <Box sx={{ display: 'flex', alignItems: 'center', gap: 1 }}>
-                            <Typography variant="body1">
-                              {device.platform || 'Unknown Platform'}
-                            </Typography>
-                            {device.isCurrent && (
-                              <Chip label="Current" color="primary" size="small" icon={<CheckCircle />} />
-                            )}
-                            {device.trusted ? (
-                              <Chip label="Trusted" color="success" size="small" icon={<Shield />} />
-                            ) : (
-                              <Chip
-                                label="Untrusted"
-                                color="warning"
-                                size="small"
-                                icon={<ShieldOutlined />}
-                              />
-                            )}
-                          </Box>
-                        }
+                        primary={device.platform || 'Unknown Platform'}
                         secondary={
-                          <Box>
-                            <Typography variant="body2" color="text.secondary">
-                              Device: {device.deviceFingerprint}
-                            </Typography>
-                            <Typography variant="body2" color="text.secondary">
-                              Last seen: {formatDistanceToNow(new Date(device.lastSeen))} ago
-                            </Typography>
-                          </Box>
+                          <>
+                            Device: {device.deviceFingerprint}
+                            <br />
+                            Last seen: {formatDistanceToNow(new Date(device.lastSeen))} ago
+                          </>
                         }
+                        primaryTypographyProps={{
+                          sx: { display: 'inline', mr: 1 }
+                        }}
                       />
+                      <Box sx={{ display: 'flex', alignItems: 'center', gap: 0.5, flexWrap: 'wrap', mr: 2 }}>
+                        {device.isCurrent && (
+                          <Chip label="Current" color="primary" size="small" icon={<CheckCircle />} />
+                        )}
+                        {device.trusted ? (
+                          <Chip label="Trusted" color="success" size="small" icon={<Shield />} />
+                        ) : (
+                          <Chip
+                            label="Untrusted"
+                            color="warning"
+                            size="small"
+                            icon={<ShieldOutlined />}
+                          />
+                        )}
+                      </Box>
                       <ListItemSecondaryAction>
                         <Box sx={{ display: 'flex', gap: 1 }}>
                           <Button