diff --git a/src/components/homepage/ContentTabs.tsx b/src/components/homepage/ContentTabs.tsx
index 4124a1d1..a2916f4f 100644
--- a/src/components/homepage/ContentTabs.tsx
+++ b/src/components/homepage/ContentTabs.tsx
@@ -108,115 +108,121 @@ export function ContentTabs() {
     ).join(' ');
   };
 
-  const RideCard = ({ ride }: { ride: Ride }) => (
-    <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={() => navigate(`/parks/${ride.park?.slug}/rides/${ride.slug}`)}
-    >
-      <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)}
+  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>
-          )}
-          
-          {/* 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>
+
+            {/* 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 && (
+                  <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 && (
+                  <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 && (
+                  <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>
-
-        <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 && (
-                <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 && (
-                <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 && (
-                <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>
-  );
+      </Card>
+    );
+  };
 
   if (loading) {
     return (
@@ -269,7 +275,7 @@ export function ContentTabs() {
             </div>
             <div className="grid md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 2xl:grid-cols-6 gap-6">
               {popularParks.map((park) => (
-                <ParkCard key={park.id} park={park} onClick={() => navigate(`/parks/${park.slug}`)} />
+                <ParkCard key={park.id} park={park} />
               ))}
             </div>
           </TabsContent>
@@ -281,7 +287,7 @@ export function ContentTabs() {
             </div>
             <div className="grid md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 2xl:grid-cols-6 gap-6">
               {trendingParks.map((park) => (
-                <ParkCard key={park.id} park={park} onClick={() => navigate(`/parks/${park.slug}`)} />
+                <ParkCard key={park.id} park={park} />
               ))}
             </div>
           </TabsContent>
@@ -317,7 +323,7 @@ export function ContentTabs() {
             </div>
             <div className="grid md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 2xl:grid-cols-6 gap-6">
               {recentParks.map((park) => (
-                <ParkCard key={park.id} park={park} onClick={() => navigate(`/parks/${park.slug}`)} />
+                <ParkCard key={park.id} park={park} />
               ))}
             </div>
           </TabsContent>
diff --git a/src/components/parks/ParkCard.tsx b/src/components/parks/ParkCard.tsx
index 9831e21e..db6808be 100644
--- a/src/components/parks/ParkCard.tsx
+++ b/src/components/parks/ParkCard.tsx
@@ -1,16 +1,19 @@
 import { MapPin, Star, Users, Clock, Castle, FerrisWheel, Waves, Tent } from 'lucide-react';
+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 { Park } from '@/types/database';
+
 interface ParkCardProps {
   park: Park;
-  onClick?: () => void;
 }
-export function ParkCard({
-  park,
-  onClick
-}: ParkCardProps) {
+export function ParkCard({ park }: ParkCardProps) {
+  const navigate = useNavigate();
+  
+  const handleClick = () => {
+    navigate(`/parks/${park.slug}`);
+  };
   const getStatusColor = (status: string) => {
     switch (status) {
       case 'operating':
@@ -40,7 +43,7 @@ export function ParkCard({
   const formatParkType = (type: string) => {
     return type.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]" onClick={onClick}>
+  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={handleClick}>
       <div className="relative overflow-hidden">
         {/* Image Placeholder with Gradient */}
         <div className="aspect-video bg-gradient-to-br from-primary/20 via-secondary/20 to-accent/20 flex items-center justify-center relative">
diff --git a/src/components/parks/ParkGrid.tsx b/src/components/parks/ParkGrid.tsx
index 6e445104..b2efab30 100644
--- a/src/components/parks/ParkGrid.tsx
+++ b/src/components/parks/ParkGrid.tsx
@@ -255,10 +255,6 @@ export function ParkGrid() {
             <ParkCard 
               key={park.id} 
               park={park}
-              onClick={() => {
-                // Navigate to park detail page
-                console.log('Navigate to park:', park.slug);
-              }}
             />
           ))}
         </div>
diff --git a/src/components/parks/ParkGridView.tsx b/src/components/parks/ParkGridView.tsx
index e8e7a8f0..36127f14 100644
--- a/src/components/parks/ParkGridView.tsx
+++ b/src/components/parks/ParkGridView.tsx
@@ -3,17 +3,15 @@ import { Park } from '@/types/database';
 
 interface ParkGridViewProps {
   parks: Park[];
-  onParkClick: (park: Park) => void;
 }
 
-export function ParkGridView({ parks, onParkClick }: ParkGridViewProps) {
+export function ParkGridView({ parks }: ParkGridViewProps) {
   return (
     <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 2xl:grid-cols-5 gap-6">
       {parks.map((park) => (
         <ParkCard 
           key={park.id} 
           park={park} 
-          onClick={() => onParkClick(park)}
         />
       ))}
     </div>
diff --git a/src/pages/Parks.tsx b/src/pages/Parks.tsx
index 1a6cdb22..9adc7c96 100644
--- a/src/pages/Parks.tsx
+++ b/src/pages/Parks.tsx
@@ -354,7 +354,6 @@ export default function Parks() {
             {viewMode === 'grid' ? (
               <ParkGridView 
                 parks={filteredAndSortedParks} 
-                onParkClick={handleParkClick}
               />
             ) : (
               <ParkListView