diff --git a/app/(root)/confirm-ride.tsx b/app/(root)/confirm-ride.tsx
new file mode 100644
index 0000000..b200e79
--- /dev/null
+++ b/app/(root)/confirm-ride.tsx
@@ -0,0 +1,12 @@
+import { Text, View } from "react-native"
+
+const ConfirmRide=()=>{
+return(
+    <View>
+        <Text>
+            Confirm ride
+        </Text>
+    </View>
+)
+}
+export default ConfirmRide
\ No newline at end of file
diff --git a/app/(root)/find-ride.tsx b/app/(root)/find-ride.tsx
index b975cfe..867f08f 100644
--- a/app/(root)/find-ride.tsx
+++ b/app/(root)/find-ride.tsx
@@ -1,13 +1,32 @@
+import CustomButton from "@/components/CustomButton"
+import GoogleTextInput from "@/components/GoogleTextInput"
 import RideLayout from "@/components/RideLayout"
+import { icons } from "@/constants"
 import { useLocationStore } from "@/store"
+import { router } from "expo-router"
 import { Text, View } from "react-native"
 
 const FindRide = () => {
     const { userAddress, destinationAddress, setDestinationLocation, setUserLocation } = useLocationStore()
     return (
-        < RideLayout >
-            <Text className="text-2xl">Find Ride</Text>
-
+        < RideLayout title="Ride" >
+            <View className="my-3">
+                <Text className="text-lg font-JakartaSemiBold mb-3">From</Text>
+                <GoogleTextInput icon={icons.target} initialLocation={userAddress!}
+                    containerStyle="bg-neutral-100"
+                    textInputBackgroundColor="#f5f5f5"
+                    handlePress={(location) => { setUserLocation(location) }}
+                />
+            </View>
+            <View className="my-3">
+                <Text className="text-lg font-JakartaSemiBold mb-3">To</Text>
+                <GoogleTextInput icon={icons.map} initialLocation={destinationAddress!}
+                    containerStyle="bg-neutral-100"
+                    textInputBackgroundColor="transparent"
+                    handlePress={(location) => { setDestinationLocation(location) }}
+                />
+            </View>
+            <CustomButton title="Find now" onPress={()=>router.push("/(root)/confirm-ride")} className="mt-5"/>
         </RideLayout >
     )