diff --git a/app/+not-found.tsx b/app/+not-found.tsx
index dcac0d4..e9c125e 100644
--- a/app/+not-found.tsx
+++ b/app/+not-found.tsx
@@ -1,5 +1,6 @@
 import {Link, router, Stack, usePathname, useRouter} from 'expo-router';
-import {Button, StyleSheet, Text, View} from 'react-native';
+import {Button, SafeAreaView, StyleSheet, Text, View} from 'react-native';
+import React from "react";
 
 
 export default function NotFoundScreen() {
@@ -7,9 +8,9 @@ export default function NotFoundScreen() {
   const router = useRouter();
 
   return (
-    <>
+    <SafeAreaView>
       <Stack.Screen options={{ title: 'Oops!' }} />
-      <View style={styles.container}>
+      <View>
         <Text>This screen {pathname} doesn't exist: {pathname}</Text>
         <Button title="Retour Home" onPress={() => router.replace("/")}/>
           <Text>Go to home screen!</Text>
diff --git a/components/WorkoutCardComponent.tsx b/components/WorkoutCardComponent.tsx
index 8bc119b..2643fd8 100644
--- a/components/WorkoutCardComponent.tsx
+++ b/components/WorkoutCardComponent.tsx
@@ -2,6 +2,8 @@ import { Workout } from "@/model/Workout";
 import { AntDesign, MaterialCommunityIcons } from "@expo/vector-icons";
 import { useRouter } from "expo-router";
 import React from "react";
+import Text from "@/components/ui/Text"
+import {ImageBackground, TouchableOpacity, View} from "react-native";
 
 interface WorkoutCardComponentProps {
   exercise?: Workout;
diff --git a/package-lock.json b/package-lock.json
index 6bfe02f..1031a83 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -55,6 +55,7 @@
         "@babel/core": "^7.25.2",
         "@types/jest": "^29.5.12",
         "@types/react": "~19.0.10",
+        "@types/react-native": "^0.72.8",
         "@types/react-test-renderer": "^19.0.0",
         "@types/validator": "^13.12.2",
         "jest": "^29.2.1",
@@ -3707,6 +3708,31 @@
         "csstype": "^3.0.2"
       }
     },
+    "node_modules/@types/react-native": {
+      "version": "0.72.8",
+      "resolved": "https://registry.npmjs.org/@types/react-native/-/react-native-0.72.8.tgz",
+      "integrity": "sha512-St6xA7+EoHN5mEYfdWnfYt0e8u6k2FR0P9s2arYgakQGFgU1f9FlPrIEcj0X24pLCF5c5i3WVuLCUdiCYHmOoA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@react-native/virtualized-lists": "^0.72.4",
+        "@types/react": "*"
+      }
+    },
+    "node_modules/@types/react-native/node_modules/@react-native/virtualized-lists": {
+      "version": "0.72.8",
+      "resolved": "https://registry.npmjs.org/@react-native/virtualized-lists/-/virtualized-lists-0.72.8.tgz",
+      "integrity": "sha512-J3Q4Bkuo99k7mu+jPS9gSUSgq+lLRSI/+ahXNwV92XgJ/8UgOTxu2LPwhJnBk/sQKxq7E8WkZBnBiozukQMqrw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "invariant": "^2.2.4",
+        "nullthrows": "^1.1.1"
+      },
+      "peerDependencies": {
+        "react-native": "*"
+      }
+    },
     "node_modules/@types/react-test-renderer": {
       "version": "19.1.0",
       "resolved": "https://registry.npmjs.org/@types/react-test-renderer/-/react-test-renderer-19.1.0.tgz",
diff --git a/package.json b/package.json
index 96a9d2b..95364d4 100644
--- a/package.json
+++ b/package.json
@@ -62,6 +62,7 @@
     "@babel/core": "^7.25.2",
     "@types/jest": "^29.5.12",
     "@types/react": "~19.0.10",
+    "@types/react-native": "^0.72.8",
     "@types/react-test-renderer": "^19.0.0",
     "@types/validator": "^13.12.2",
     "jest": "^29.2.1",