diff --git a/src/components/LatestMeasurementCard.tsx b/src/components/LatestMeasurementCard.tsx
index 8cb3ed3..04976d4 100644
--- a/src/components/LatestMeasurementCard.tsx
+++ b/src/components/LatestMeasurementCard.tsx
@@ -30,6 +30,19 @@ export default function LatestMeasurementCard({ measurements }: Props) {
 
   return (
     <View style={styles.card}>
+      {previous && (
+        <View style={styles.previous}>
+          <Text style={styles.previousTitle}>Voorlaatste meting</Text>
+          <Text style={styles.previousDate}>
+            {new Date(previous.measuredAt).toLocaleDateString('nl-NL')} — {previous.weight.toFixed(1)} kg
+          </Text>
+          <Text style={styles.diffLabel}>
+            Verschil {diff !== null && (diff > 0 ? '+' : '')}{diff?.toFixed(1)} kg
+          </Text>
+          <View style={styles.divider} />
+        </View>
+      )}
+
       <Text style={styles.title}>Laatste meting</Text>
       <Text style={styles.date}>{new Date(latest.measuredAt).toLocaleDateString('nl-NL')}</Text>
       {rows.map(r => (
@@ -43,19 +56,6 @@ export default function LatestMeasurementCard({ measurements }: Props) {
           </Text>
         </View>
       ))}
-
-      {previous && (
-        <View style={styles.previous}>
-          <View style={styles.divider} />
-          <Text style={styles.previousTitle}>Voorlaatste meting</Text>
-          <Text style={styles.previousDate}>
-            {new Date(previous.measuredAt).toLocaleDateString('nl-NL')} — {previous.weight.toFixed(1)} kg
-          </Text>
-          <Text style={styles.diffLabel}>
-            Verschil {diff !== null && (diff > 0 ? '+' : '')}{diff?.toFixed(1)} kg
-          </Text>
-        </View>
-      )}
     </View>
   )
 }
diff --git a/src/screens/HistoryScreen.tsx b/src/screens/HistoryScreen.tsx
index a2f87af..30fc38b 100644
--- a/src/screens/HistoryScreen.tsx
+++ b/src/screens/HistoryScreen.tsx
@@ -85,9 +85,10 @@ export default function HistoryScreen({ navigation }: Props) {
         data={measurements}
         keyExtractor={item => item.id}
         renderItem={({ item }) => (
-          <TouchableOpacity onPress={() => navigation.navigate('MeasurementDetail', { measurementId: item.id })}>
-            <MeasurementRow measurement={item} />
-          </TouchableOpacity>
+          <MeasurementRow
+            measurement={item}
+            onPress={() => navigation.navigate('MeasurementDetail', { measurementId: item.id })}
+          />
         )}
         contentContainerStyle={measurements.length === 0 ? styles.empty : undefined}
         ListEmptyComponent={<Text style={styles.emptyText}>Nog geen metingen</Text>}