diff --git a/src/components/homepage/ContentTabs.tsx b/src/components/homepage/ContentTabs.tsx
index cce5d12b..f620438b 100644
--- a/src/components/homepage/ContentTabs.tsx
+++ b/src/components/homepage/ContentTabs.tsx
@@ -1,17 +1,11 @@
 import { useState, useEffect } from 'react';
-import { useNavigate } from 'react-router-dom';
 import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs';
 import { ParkCard } from '@/components/parks/ParkCard';
-import { Card, CardContent } from '@/components/ui/card';
-import { Badge } from '@/components/ui/badge';
-import { Button } from '@/components/ui/button';
-import { Star, TrendingUp, Plus, MapPin, Clock, Zap, FerrisWheel, Waves, Theater, Train } from 'lucide-react';
-import { MeasurementDisplay } from '@/components/ui/measurement-display';
+import { RideCard } from '@/components/rides/RideCard';
 import { Park, Ride } from '@/types/database';
 import { supabase } from '@/integrations/supabase/client';
 
 export function ContentTabs() {
-  const navigate = useNavigate();
   const [popularParks, setPopularParks] = useState<Park[]>([]);
   const [trendingParks, setTrendingParks] = useState<Park[]>([]);
   const [popularRides, setPopularRides] = useState<Ride[]>([]);
@@ -81,148 +75,6 @@ export function ContentTabs() {
     }
   };
 
-  const getRideIcon = (category: string) => {
-    switch (category) {
-      case 'roller_coaster': return <FerrisWheel className="w-6 h-6" />;
-      case 'water_ride': return <Waves className="w-6 h-6" />;
-      case 'dark_ride': return <Theater className="w-6 h-6" />;
-      case 'flat_ride': return <FerrisWheel className="w-6 h-6" />;
-      case 'kiddie_ride': return <FerrisWheel className="w-6 h-6" />;
-      case 'transportation': return <Train className="w-6 h-6" />;
-      default: return <FerrisWheel className="w-6 h-6" />;
-    }
-  };
-
-  const getStatusColor = (status: string) => {
-    switch (status) {
-      case 'operating': return 'bg-green-500/20 text-green-400 border-green-500/30';
-      case 'seasonal': return 'bg-yellow-500/20 text-yellow-400 border-yellow-500/30';
-      case 'under_construction': return 'bg-blue-500/20 text-blue-400 border-blue-500/30';
-      default: return 'bg-red-500/20 text-red-400 border-red-500/30';
-    }
-  };
-
-  const formatCategory = (category: string) => {
-    return category.split('_').map(word => 
-      word.charAt(0).toUpperCase() + word.slice(1)
-    ).join(' ');
-  };
-
-  const RideCard = ({ ride }: { ride: Ride }) => {
-    const handleRideClick = () => {
-      navigate(`/parks/${ride.park?.slug}/rides/${ride.slug}`);
-    };
-
-    return (
-      <Card 
-        className="group overflow-hidden border-border/50 bg-gradient-to-br from-card via-card to-card/80 hover:shadow-2xl hover:shadow-primary/20 transition-all duration-300 cursor-pointer hover:scale-[1.02]"
-        onClick={handleRideClick}
-      >
-        <div className="relative overflow-hidden">
-          {/* Image/Icon Section */}
-          <div className="aspect-video bg-gradient-to-br from-primary/20 via-secondary/20 to-accent/20 flex items-center justify-center relative">
-            {ride.image_url ? (
-              <img 
-                src={ride.image_url} 
-                alt={ride.name}
-                className="w-full h-full object-cover group-hover:scale-110 transition-transform duration-500"
-              />
-            ) : (
-              <div className="opacity-50 flex items-center justify-center">
-                {getRideIcon(ride.category)}
-              </div>
-            )}
-            
-            {/* Gradient Overlay */}
-            <div className="absolute inset-0 bg-gradient-to-t from-black/60 via-transparent to-transparent" />
-            
-            {/* Status Badge */}
-            <Badge 
-              className={`absolute top-3 right-3 ${getStatusColor(ride.status)} border`}
-            >
-              {ride.status.replace('_', ' ').toUpperCase()}
-            </Badge>
-          </div>
-
-          <CardContent className="p-4 space-y-3">
-            {/* Header */}
-            <div className="space-y-1">
-              <div className="flex items-center gap-2">
-                <h3 className="font-bold text-lg group-hover:text-primary transition-colors line-clamp-1">
-                  {ride.name}
-                </h3>
-                <span className="flex items-center">{getRideIcon(ride.category)}</span>
-              </div>
-              
-              {ride.park?.name && (
-                <div className="flex items-center text-sm text-muted-foreground">
-                  <MapPin className="w-3 h-3 mr-1" />
-                  {ride.park.name}
-                  {ride.park.location?.city && `, ${ride.park.location.city}`}
-                </div>
-              )}
-            </div>
-
-            {/* Description */}
-            {ride.description && (
-              <p className="text-sm text-muted-foreground line-clamp-2">
-                {ride.description}
-              </p>
-            )}
-
-            {/* Category Badge */}
-            <Badge variant="outline" className="text-xs">
-              {formatCategory(ride.category)}
-            </Badge>
-
-            {/* Stats */}
-            <div className="flex items-center justify-between text-sm">
-              <div className="flex items-center gap-4">
-                {ride.max_speed_kmh && ride.max_speed_kmh > 0 && (
-                  <div className="flex items-center gap-1">
-                    <Zap className="w-3 h-3 text-primary" />
-                    <span className="text-primary font-medium">
-                      <MeasurementDisplay value={ride.max_speed_kmh} type="speed" />
-                    </span>
-                  </div>
-                )}
-                {ride.max_height_meters && ride.max_height_meters > 0 && (
-                  <div className="flex items-center gap-1">
-                    <span className="text-accent font-medium">
-                      <MeasurementDisplay value={ride.max_height_meters} type="distance" />
-                    </span>
-                  </div>
-                )}
-                {ride.duration_seconds && ride.duration_seconds > 0 && (
-                  <div className="flex items-center gap-1">
-                    <Clock className="w-3 h-3 text-secondary" />
-                    <span className="text-secondary font-medium">{Math.floor(ride.duration_seconds / 60)}</span>
-                    <span className="text-muted-foreground text-xs">min</span>
-                  </div>
-                )}
-              </div>
-              
-              {ride.average_rating > 0 && (
-                <div className="flex items-center gap-1">
-                  <Star className="w-3 h-3 fill-yellow-400 text-yellow-400" />
-                  <span className="text-sm font-medium">{ride.average_rating.toFixed(1)}</span>
-                  <span className="text-xs text-muted-foreground">({ride.review_count})</span>
-                </div>
-              )}
-            </div>
-
-            {/* Action Button */}
-            <Button 
-              className="w-full mt-3 bg-gradient-to-r from-primary/80 to-secondary/80 hover:from-primary hover:to-secondary transition-all duration-300"
-              size="sm"
-            >
-              View Ride
-            </Button>
-          </CardContent>
-        </div>
-      </Card>
-    );
-  };
 
   if (loading) {
     return (
diff --git a/src/components/rides/RideCard.tsx b/src/components/rides/RideCard.tsx
new file mode 100644
index 00000000..a602e343
--- /dev/null
+++ b/src/components/rides/RideCard.tsx
@@ -0,0 +1,158 @@
+import { useNavigate } from 'react-router-dom';
+import { Card, CardContent } from '@/components/ui/card';
+import { Badge } from '@/components/ui/badge';
+import { Button } from '@/components/ui/button';
+import { Star, MapPin, Clock, Zap, FerrisWheel, Waves, Theater, Train } from 'lucide-react';
+import { MeasurementDisplay } from '@/components/ui/measurement-display';
+import { Ride } from '@/types/database';
+
+interface RideCardProps {
+  ride: Ride;
+  showParkName?: boolean;
+  className?: string;
+}
+
+export function RideCard({ ride, showParkName = true, className }: RideCardProps) {
+  const navigate = useNavigate();
+
+  const handleRideClick = () => {
+    navigate(`/parks/${ride.park?.slug}/rides/${ride.slug}`);
+  };
+
+  const getRideIcon = (category: string) => {
+    switch (category) {
+      case 'roller_coaster': return <FerrisWheel className="w-6 h-6" />;
+      case 'water_ride': return <Waves className="w-6 h-6" />;
+      case 'dark_ride': return <Theater className="w-6 h-6" />;
+      case 'flat_ride': return <FerrisWheel className="w-6 h-6" />;
+      case 'kiddie_ride': return <FerrisWheel className="w-6 h-6" />;
+      case 'transportation': return <Train className="w-6 h-6" />;
+      default: return <FerrisWheel className="w-6 h-6" />;
+    }
+  };
+
+  const getStatusColor = (status: string) => {
+    switch (status) {
+      case 'operating': return 'bg-green-500/20 text-green-400 border-green-500/30';
+      case 'seasonal': return 'bg-yellow-500/20 text-yellow-400 border-yellow-500/30';
+      case 'under_construction': return 'bg-blue-500/20 text-blue-400 border-blue-500/30';
+      default: return 'bg-red-500/20 text-red-400 border-red-500/30';
+    }
+  };
+
+  const formatCategory = (category: string) => {
+    return category.split('_').map(word => 
+      word.charAt(0).toUpperCase() + word.slice(1)
+    ).join(' ');
+  };
+
+  return (
+    <Card 
+      className={`group overflow-hidden border-border/50 bg-gradient-to-br from-card via-card to-card/80 hover:shadow-2xl hover:shadow-primary/20 transition-all duration-300 cursor-pointer hover:scale-[1.02] ${className}`}
+      onClick={handleRideClick}
+    >
+      <div className="relative overflow-hidden">
+        {/* Image/Icon Section */}
+        <div className="aspect-video bg-gradient-to-br from-primary/20 via-secondary/20 to-accent/20 flex items-center justify-center relative">
+          {ride.image_url ? (
+            <img 
+              src={ride.image_url} 
+              alt={ride.name}
+              className="w-full h-full object-cover group-hover:scale-110 transition-transform duration-500"
+            />
+          ) : (
+            <div className="opacity-50 flex items-center justify-center">
+              {getRideIcon(ride.category)}
+            </div>
+          )}
+          
+          {/* Gradient Overlay */}
+          <div className="absolute inset-0 bg-gradient-to-t from-black/60 via-transparent to-transparent" />
+          
+          {/* Status Badge */}
+          <Badge 
+            className={`absolute top-3 right-3 ${getStatusColor(ride.status)} border`}
+          >
+            {ride.status.replace('_', ' ').toUpperCase()}
+          </Badge>
+        </div>
+
+        <CardContent className="p-4 space-y-3">
+          {/* Header */}
+          <div className="space-y-1">
+            <div className="flex items-center gap-2">
+              <h3 className="font-bold text-lg group-hover:text-primary transition-colors line-clamp-1">
+                {ride.name}
+              </h3>
+              <span className="flex items-center">{getRideIcon(ride.category)}</span>
+            </div>
+            
+            {showParkName && ride.park?.name && (
+              <div className="flex items-center text-sm text-muted-foreground">
+                <MapPin className="w-3 h-3 mr-1" />
+                {ride.park.name}
+                {ride.park.location?.city && `, ${ride.park.location.city}`}
+              </div>
+            )}
+          </div>
+
+          {/* Description */}
+          {ride.description && (
+            <p className="text-sm text-muted-foreground line-clamp-2">
+              {ride.description}
+            </p>
+          )}
+
+          {/* Category Badge */}
+          <Badge variant="outline" className="text-xs">
+            {formatCategory(ride.category)}
+          </Badge>
+
+          {/* Stats */}
+          <div className="flex items-center justify-between text-sm">
+            <div className="flex items-center gap-4">
+              {ride.max_speed_kmh && ride.max_speed_kmh > 0 && (
+                <div className="flex items-center gap-1">
+                  <Zap className="w-3 h-3 text-primary" />
+                  <span className="text-primary font-medium">
+                    <MeasurementDisplay value={ride.max_speed_kmh} type="speed" />
+                  </span>
+                </div>
+              )}
+              {ride.max_height_meters && ride.max_height_meters > 0 && (
+                <div className="flex items-center gap-1">
+                  <span className="text-accent font-medium">
+                    <MeasurementDisplay value={ride.max_height_meters} type="distance" />
+                  </span>
+                </div>
+              )}
+              {ride.duration_seconds && ride.duration_seconds > 0 && (
+                <div className="flex items-center gap-1">
+                  <Clock className="w-3 h-3 text-secondary" />
+                  <span className="text-secondary font-medium">{Math.floor(ride.duration_seconds / 60)}</span>
+                  <span className="text-muted-foreground text-xs">min</span>
+                </div>
+              )}
+            </div>
+            
+            {ride.average_rating > 0 && (
+              <div className="flex items-center gap-1">
+                <Star className="w-3 h-3 fill-yellow-400 text-yellow-400" />
+                <span className="text-sm font-medium">{ride.average_rating.toFixed(1)}</span>
+                <span className="text-xs text-muted-foreground">({ride.review_count})</span>
+              </div>
+            )}
+          </div>
+
+          {/* Action Button */}
+          <Button 
+            className="w-full mt-3 bg-gradient-to-r from-primary/80 to-secondary/80 hover:from-primary hover:to-secondary transition-all duration-300"
+            size="sm"
+          >
+            View Ride
+          </Button>
+        </CardContent>
+      </div>
+    </Card>
+  );
+}
\ No newline at end of file
diff --git a/src/pages/Rides.tsx b/src/pages/Rides.tsx
index 624598b6..55663a90 100644
--- a/src/pages/Rides.tsx
+++ b/src/pages/Rides.tsx
@@ -1,15 +1,12 @@
 import { useState, useEffect } from 'react';
 import { Header } from '@/components/layout/Header';
-import { Card, CardContent } from '@/components/ui/card';
-import { Button } from '@/components/ui/button';
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
 import { Badge } from '@/components/ui/badge';
-import { Filter, SlidersHorizontal, Zap, Clock, Star, FerrisWheel, Waves, Theater, Train } from 'lucide-react';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
+import { Filter, SlidersHorizontal, FerrisWheel } from 'lucide-react';
 import { AutocompleteSearch } from '@/components/search/AutocompleteSearch';
-import { MeasurementDisplay } from '@/components/ui/measurement-display';
+import { RideCard } from '@/components/rides/RideCard';
 import { Ride } from '@/types/database';
 import { supabase } from '@/integrations/supabase/client';
-import { useNavigate } from 'react-router-dom';
 
 export default function Rides() {
   const [rides, setRides] = useState<Ride[]>([]);
@@ -18,7 +15,6 @@ export default function Rides() {
   const [sortBy, setSortBy] = useState('name');
   const [filterCategory, setFilterCategory] = useState('all');
   const [filterStatus, setFilterStatus] = useState('all');
-  const navigate = useNavigate();
 
   useEffect(() => {
     fetchRides();
@@ -75,32 +71,6 @@ export default function Rides() {
     ride.manufacturer?.name?.toLowerCase().includes(searchQuery.toLowerCase())
   );
 
-  const getRideIcon = (category: string) => {
-    switch (category) {
-      case 'roller_coaster': return <FerrisWheel className="w-16 h-16" />;
-      case 'water_ride': return <Waves className="w-16 h-16" />;
-      case 'dark_ride': return <Theater className="w-16 h-16" />;
-      case 'flat_ride': return <FerrisWheel className="w-16 h-16" />;
-      case 'kiddie_ride': return <FerrisWheel className="w-16 h-16" />;
-      case 'transportation': return <Train className="w-16 h-16" />;
-      default: return <FerrisWheel className="w-16 h-16" />;
-    }
-  };
-
-  const getStatusColor = (status: string) => {
-    switch (status) {
-      case 'operating': return 'bg-green-500/20 text-green-400 border-green-500/30';
-      case 'seasonal': return 'bg-yellow-500/20 text-yellow-400 border-yellow-500/30';
-      case 'under_construction': return 'bg-blue-500/20 text-blue-400 border-blue-500/30';
-      default: return 'bg-red-500/20 text-red-400 border-red-500/30';
-    }
-  };
-
-  const formatCategory = (category: string) => {
-    return category.split('_').map(word => 
-      word.charAt(0).toUpperCase() + word.slice(1)
-    ).join(' ');
-  };
 
   const categories = [
     { value: 'all', label: 'All Categories' },
@@ -219,110 +189,7 @@ export default function Rides() {
         {filteredRides.length > 0 ? (
           <div className="grid md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 2xl:grid-cols-6 gap-6">
             {filteredRides.map((ride) => (
-              <Card 
-                key={ride.id}
-                className="group overflow-hidden border-border/50 bg-gradient-to-br from-card via-card to-card/80 hover:shadow-2xl hover:shadow-primary/20 transition-all duration-300 cursor-pointer hover:scale-[1.02]"
-              >
-                <div className="relative overflow-hidden">
-                  {/* Image/Icon Section */}
-                  <div className="aspect-video bg-gradient-to-br from-primary/20 via-secondary/20 to-accent/20 flex items-center justify-center relative">
-                    {ride.image_url ? (
-                      <img 
-                        src={ride.image_url} 
-                        alt={ride.name}
-                        className="w-full h-full object-cover group-hover:scale-110 transition-transform duration-500"
-                      />
-                    ) : (
-                      <div className="opacity-50 flex items-center justify-center">
-                        {getRideIcon(ride.category)}
-                      </div>
-                    )}
-                    
-                    {/* Gradient Overlay */}
-                    <div className="absolute inset-0 bg-gradient-to-t from-black/60 via-transparent to-transparent" />
-                    
-                    {/* Status Badge */}
-                    <Badge 
-                      className={`absolute top-3 right-3 ${getStatusColor(ride.status)} border`}
-                    >
-                      {ride.status.replace('_', ' ').toUpperCase()}
-                    </Badge>
-                  </div>
-
-                  <CardContent className="p-4 space-y-3">
-                    {/* Header */}
-                    <div className="space-y-1">
-                      <div className="flex items-center gap-2">
-                        <h3 className="font-bold text-lg group-hover:text-primary transition-colors line-clamp-1">
-                          {ride.name}
-                        </h3>
-                        <span className="flex items-center">{getRideIcon(ride.category)}</span>
-                      </div>
-                      
-                      {ride.park?.name && (
-                        <p className="text-sm text-muted-foreground">
-                          at {ride.park.name}
-                        </p>
-                      )}
-                    </div>
-
-                    {/* Description */}
-                    {ride.description && (
-                      <p className="text-sm text-muted-foreground line-clamp-2">
-                        {ride.description}
-                      </p>
-                    )}
-
-                    {/* Category Badge */}
-                    <Badge variant="outline" className="text-xs">
-                      {formatCategory(ride.category)}
-                    </Badge>
-
-                    {/* Stats */}
-                    <div className="flex items-center justify-between text-sm">
-                      <div className="flex items-center gap-2">
-                        {ride.max_speed_kmh && (
-                          <div className="flex items-center gap-1">
-                            <Zap className="w-3 h-3 text-primary" />
-                            <span className="text-primary font-medium text-xs">
-                              <MeasurementDisplay value={ride.max_speed_kmh} type="speed" />
-                            </span>
-                          </div>
-                        )}
-                        {ride.max_height_meters && (
-                          <div className="flex items-center gap-1">
-                            <span className="text-accent font-medium text-xs">
-                              <MeasurementDisplay value={ride.max_height_meters} type="distance" />
-                            </span>
-                          </div>
-                        )}
-                        {ride.duration_seconds && (
-                          <div className="flex items-center gap-1">
-                            <Clock className="w-3 h-3 text-secondary" />
-                            <span className="text-secondary font-medium text-xs">{Math.floor(ride.duration_seconds / 60)}min</span>
-                          </div>
-                        )}
-                      </div>
-                      
-                      {ride.average_rating > 0 && (
-                        <div className="flex items-center gap-1">
-                          <Star className="w-3 h-3 fill-yellow-400 text-yellow-400" />
-                          <span className="text-sm font-medium">{ride.average_rating.toFixed(1)}</span>
-                        </div>
-                      )}
-                    </div>
-
-                    {/* Action Button */}
-                    <Button 
-                      className="w-full mt-3 bg-gradient-to-r from-primary/80 to-secondary/80 hover:from-primary hover:to-secondary transition-all duration-300"
-                      size="sm"
-                      onClick={() => navigate(`/parks/${ride.park?.slug}/rides/${ride.slug}`)}
-                    >
-                      View Details
-                    </Button>
-                  </CardContent>
-                </div>
-              </Card>
+              <RideCard key={ride.id} ride={ride} showParkName={true} />
             ))}
           </div>
         ) : (