diff --git a/app/admin/artists/[id]/page.tsx b/app/admin/artists/[id]/page.tsx
index 8a96bd407..d6179009e 100644
--- a/app/admin/artists/[id]/page.tsx
+++ b/app/admin/artists/[id]/page.tsx
@@ -3,6 +3,7 @@
 import { useState, useEffect } from 'react'
 import { useParams } from 'next/navigation'
 import { ArtistForm } from '@/components/admin/artist-form'
+import { PortfolioManager } from '@/components/admin/portfolio-manager'
 import { useToast } from '@/hooks/use-toast'
 import type { Artist } from '@/types/database'
 
@@ -57,7 +58,7 @@ export default function EditArtistPage() {
       <div>
         <h1 className="text-3xl font-bold tracking-tight">Edit Artist</h1>
         <p className="text-muted-foreground">
-          Update {artist.name}'s information and portfolio
+          Update {artist.name}&apos;s information and portfolio
         </p>
       </div>
       
@@ -71,6 +72,14 @@ export default function EditArtistPage() {
           fetchArtist() // Refresh the data
         }}
       />
+
+      {/* Portfolio Management */}
+      <PortfolioManager 
+        artistId={artist.id}
+        onImagesUpdate={() => {
+          fetchArtist() // Refresh artist data when images are updated
+        }}
+      />
     </div>
   )
 }
diff --git a/components/admin/portfolio-manager.tsx b/components/admin/portfolio-manager.tsx
index 27fad0e6b..0406f46fe 100644
--- a/components/admin/portfolio-manager.tsx
+++ b/components/admin/portfolio-manager.tsx
@@ -1,608 +1,456 @@
-'use client'
+"use client"
 
 import { useState, useEffect } from 'react'
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card'
+import { useForm } from 'react-hook-form'
+import { zodResolver } from '@hookform/resolvers/zod'
+import { z } from 'zod'
+import Image from 'next/image'
 import { Button } from '@/components/ui/button'
+import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
 import { Input } from '@/components/ui/input'
 import { Label } from '@/components/ui/label'
+import { Textarea } from '@/components/ui/textarea'
 import { Badge } from '@/components/ui/badge'
-import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs'
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
-import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle, DialogTrigger } from '@/components/ui/dialog'
-import { AlertDialog, AlertDialogAction, AlertDialogCancel, AlertDialogContent, AlertDialogDescription, AlertDialogFooter, AlertDialogHeader, AlertDialogTitle, AlertDialogTrigger } from '@/components/ui/alert-dialog'
-import { Checkbox } from '@/components/ui/checkbox'
+import { Switch } from '@/components/ui/switch'
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from '@/components/ui/dialog'
+import {
+  AlertDialog,
+  AlertDialogAction,
+  AlertDialogCancel,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogFooter,
+  AlertDialogHeader,
+  AlertDialogTitle,
+} from '@/components/ui/alert-dialog'
 import { useToast } from '@/hooks/use-toast'
-import { useFileUpload } from '@/hooks/use-file-upload'
-import { LoadingSpinner } from './loading-states'
-import { ErrorBoundary } from './error-boundary'
-import { 
-  Upload, 
-  Search, 
-  Filter, 
-  Grid, 
-  List, 
-  Eye, 
-  Edit, 
-  Trash2, 
-  Download, 
-  Star, 
-  Calendar,
-  User,
-  Tag,
-  BarChart3,
-  Image as ImageIcon,
-  Plus,
-  X
-} from 'lucide-react'
-import Image from 'next/image'
-import { PortfolioImage, Artist } from '@/types/database'
+import { Loader2, Upload, Edit, Trash2, Eye, EyeOff, X, Plus } from 'lucide-react'
+import type { PortfolioImage } from '@/types/database'
 
-interface PortfolioStats {
-  totalImages: number
-  totalViews: number
-  totalLikes: number
-  averageRating: number
-  storageUsed: string
-  recentUploads: number
+const imageEditSchema = z.object({
+  caption: z.string().optional(),
+  tags: z.array(z.string()),
+  isPublic: z.boolean(),
+})
+
+type ImageEditData = z.infer<typeof imageEditSchema>
+
+interface PortfolioManagerProps {
+  artistId: string
+  onImagesUpdate?: () => void
 }
 
-export function PortfolioManager() {
-  const [portfolioImages, setPortfolioImages] = useState<PortfolioImage[]>([])
-  const [artists, setArtists] = useState<Artist[]>([])
-  const [stats, setStats] = useState<PortfolioStats | null>(null)
-  const [loading, setLoading] = useState(true)
-  const [viewMode, setViewMode] = useState<'grid' | 'list'>('grid')
-  const [searchTerm, setSearchTerm] = useState('')
-  const [selectedArtist, setSelectedArtist] = useState<string>('all')
-  const [selectedCategory, setSelectedCategory] = useState<string>('all')
-  const [selectedImages, setSelectedImages] = useState<Set<string>>(new Set())
-  const [showUploadDialog, setShowUploadDialog] = useState(false)
-  
+export function PortfolioManager({ artistId, onImagesUpdate }: PortfolioManagerProps) {
   const { toast } = useToast()
-  const { uploadFiles, isUploading, progress } = useFileUpload({
-    maxFiles: 20,
-    maxSize: 5 * 1024 * 1024, // 5MB
-    allowedTypes: ['image/jpeg', 'image/png', 'image/webp'],
+  const [images, setImages] = useState<PortfolioImage[]>([])
+  const [loading, setLoading] = useState(true)
+  const [uploading, setUploading] = useState(false)
+  const [editingImage, setEditingImage] = useState<PortfolioImage | null>(null)
+  const [deletingImage, setDeletingImage] = useState<PortfolioImage | null>(null)
+  const [newTag, setNewTag] = useState('')
+
+  const {
+    register,
+    handleSubmit,
+    watch,
+    setValue,
+    reset,
+    formState: { errors, isSubmitting }
+  } = useForm<ImageEditData>({
+    resolver: zodResolver(imageEditSchema),
+    defaultValues: {
+      caption: '',
+      tags: [],
+      isPublic: true,
+    }
   })
 
-  useEffect(() => {
-    loadPortfolioData()
-    loadArtists()
-    loadStats()
-  }, [])
+  const tags = watch('tags')
 
-  const loadPortfolioData = async () => {
+  const fetchImages = async () => {
     try {
-      const response = await fetch('/api/portfolio')
-      if (!response.ok) throw new Error('Failed to load portfolio')
+      setLoading(true)
+      const response = await fetch(`/api/artists/${artistId}`)
+      if (!response.ok) throw new Error('Failed to fetch images')
+      
       const data = await response.json()
-      setPortfolioImages(data)
+      setImages(data.portfolioImages || [])
     } catch (error) {
+      console.error('Error fetching images:', error)
       toast({
         title: 'Error',
         description: 'Failed to load portfolio images',
         variant: 'destructive',
       })
-    }
-  }
-
-  const loadArtists = async () => {
-    try {
-      const response = await fetch('/api/artists')
-      if (!response.ok) throw new Error('Failed to load artists')
-      const data = await response.json()
-      setArtists(data)
-    } catch (error) {
-      console.error('Failed to load artists:', error)
-    }
-  }
-
-  const loadStats = async () => {
-    try {
-      const response = await fetch('/api/portfolio/stats')
-      if (!response.ok) throw new Error('Failed to load stats')
-      const data = await response.json()
-      setStats(data)
-    } catch (error) {
-      console.error('Failed to load stats:', error)
     } finally {
       setLoading(false)
     }
   }
 
-  const handleFileUpload = async (files: FileList) => {
+  useEffect(() => {
+    fetchImages()
+  }, [artistId])
+
+  const handleFileUpload = async (files: FileList | null) => {
+    if (!files || files.length === 0) return
+
+    setUploading(true)
+    const formData = new FormData()
+    formData.append('artistId', artistId)
+
+    Array.from(files).forEach((file) => {
+      formData.append('files', file)
+    })
+
     try {
-      const fileArray = Array.from(files)
-      await uploadFiles(fileArray)
-      await loadPortfolioData()
-      await loadStats()
-      setShowUploadDialog(false)
+      const response = await fetch('/api/portfolio', {
+        method: 'POST',
+        body: formData,
+      })
+
+      if (!response.ok) {
+        const error = await response.json()
+        throw new Error(error.error || 'Upload failed')
+      }
+
       toast({
         title: 'Success',
-        description: `Uploaded ${fileArray.length} images successfully`,
+        description: 'Images uploaded successfully',
       })
+
+      fetchImages()
+      onImagesUpdate?.()
     } catch (error) {
+      console.error('Upload error:', error)
       toast({
         title: 'Error',
-        description: 'Failed to upload images',
+        description: error instanceof Error ? error.message : 'Failed to upload images',
+        variant: 'destructive',
+      })
+    } finally {
+      setUploading(false)
+    }
+  }
+
+  const openEditDialog = (image: PortfolioImage) => {
+    setEditingImage(image)
+    reset({
+      caption: image.caption || '',
+      tags: image.tags || [],
+      isPublic: image.isPublic,
+    })
+  }
+
+  const closeEditDialog = () => {
+    setEditingImage(null)
+    reset()
+  }
+
+  const addTag = () => {
+    if (newTag.trim() && !tags.includes(newTag.trim())) {
+      setValue('tags', [...tags, newTag.trim()])
+      setNewTag('')
+    }
+  }
+
+  const removeTag = (tag: string) => {
+    setValue('tags', tags.filter(t => t !== tag))
+  }
+
+  const onSubmitEdit = async (data: ImageEditData) => {
+    if (!editingImage) return
+
+    try {
+      const response = await fetch(`/api/portfolio/${editingImage.id}`, {
+        method: 'PUT',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify(data),
+      })
+
+      if (!response.ok) {
+        const error = await response.json()
+        throw new Error(error.error || 'Update failed')
+      }
+
+      toast({
+        title: 'Success',
+        description: 'Image updated successfully',
+      })
+
+      closeEditDialog()
+      fetchImages()
+      onImagesUpdate?.()
+    } catch (error) {
+      console.error('Update error:', error)
+      toast({
+        title: 'Error',
+        description: error instanceof Error ? error.message : 'Failed to update image',
         variant: 'destructive',
       })
     }
   }
 
-  const handleDeleteImage = async (imageId: string) => {
+  const handleDelete = async () => {
+    if (!deletingImage) return
+
     try {
-      const response = await fetch(`/api/portfolio/${imageId}`, {
+      const response = await fetch(`/api/portfolio/${deletingImage.id}`, {
         method: 'DELETE',
       })
-      if (!response.ok) throw new Error('Failed to delete image')
-      
-      await loadPortfolioData()
-      await loadStats()
+
+      if (!response.ok) {
+        const error = await response.json()
+        throw new Error(error.error || 'Delete failed')
+      }
+
       toast({
         title: 'Success',
         description: 'Image deleted successfully',
       })
+
+      setDeletingImage(null)
+      fetchImages()
+      onImagesUpdate?.()
     } catch (error) {
+      console.error('Delete error:', error)
       toast({
         title: 'Error',
-        description: 'Failed to delete image',
+        description: error instanceof Error ? error.message : 'Failed to delete image',
         variant: 'destructive',
       })
     }
   }
 
-  const handleBulkDelete = async () => {
-    try {
-      const response = await fetch('/api/portfolio/bulk-delete', {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ imageIds: Array.from(selectedImages) }),
-      })
-      if (!response.ok) throw new Error('Failed to delete images')
-      
-      await loadPortfolioData()
-      await loadStats()
-      setSelectedImages(new Set())
-      toast({
-        title: 'Success',
-        description: `Deleted ${selectedImages.size} images successfully`,
-      })
-    } catch (error) {
-      toast({
-        title: 'Error',
-        description: 'Failed to delete images',
-        variant: 'destructive',
-      })
-    }
-  }
-
-  const toggleImageSelection = (imageId: string) => {
-    const newSelection = new Set(selectedImages)
-    if (newSelection.has(imageId)) {
-      newSelection.delete(imageId)
-    } else {
-      newSelection.add(imageId)
-    }
-    setSelectedImages(newSelection)
-  }
-
-  const selectAllImages = () => {
-    setSelectedImages(new Set(filteredImages.map(img => img.id)))
-  }
-
-  const clearSelection = () => {
-    setSelectedImages(new Set())
-  }
-
-  const filteredImages = portfolioImages.filter(image => {
-    const matchesSearch = image.caption?.toLowerCase().includes(searchTerm.toLowerCase()) ||
-                         image.tags?.some(tag => tag.toLowerCase().includes(searchTerm.toLowerCase()))
-    
-    const matchesArtist = selectedArtist === 'all' || image.artistId === selectedArtist
-    
-    return matchesSearch && matchesArtist
-  })
-
-  const categories = ['Traditional', 'Realism', 'Blackwork', 'Watercolor', 'Geometric', 'Japanese']
-
   if (loading) {
-    return <LoadingSpinner />
+    return (
+      <Card>
+        <CardHeader>
+          <CardTitle>Portfolio Images</CardTitle>
+        </CardHeader>
+        <CardContent>
+          <div className="flex items-center justify-center py-12">
+            <Loader2 className="h-8 w-8 animate-spin text-muted-foreground" />
+          </div>
+        </CardContent>
+      </Card>
+    )
   }
 
   return (
-    <ErrorBoundary>
-      <div className="space-y-6">
-        {/* Stats Cards */}
-        {stats && (
-          <div className="grid gap-4 md:grid-cols-2 lg:grid-cols-4">
-            <Card>
-              <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
-                <CardTitle className="text-sm font-medium">Total Images</CardTitle>
-                <ImageIcon className="h-4 w-4 text-muted-foreground" />
-              </CardHeader>
-              <CardContent>
-                <div className="text-2xl font-bold">{stats.totalImages}</div>
-                <p className="text-xs text-muted-foreground">
-                  +{stats.recentUploads} this week
-                </p>
-              </CardContent>
-            </Card>
-            
-            <Card>
-              <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
-                <CardTitle className="text-sm font-medium">Total Views</CardTitle>
-                <Eye className="h-4 w-4 text-muted-foreground" />
-              </CardHeader>
-              <CardContent>
-                <div className="text-2xl font-bold">{stats.totalViews.toLocaleString()}</div>
-                <p className="text-xs text-muted-foreground">
-                  Portfolio engagement
-                </p>
-              </CardContent>
-            </Card>
-            
-            <Card>
-              <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
-                <CardTitle className="text-sm font-medium">Average Rating</CardTitle>
-                <Star className="h-4 w-4 text-muted-foreground" />
-              </CardHeader>
-              <CardContent>
-                <div className="text-2xl font-bold">{stats.averageRating.toFixed(1)}</div>
-                <p className="text-xs text-muted-foreground">
-                  Out of 5.0 stars
-                </p>
-              </CardContent>
-            </Card>
-            
-            <Card>
-              <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
-                <CardTitle className="text-sm font-medium">Storage Used</CardTitle>
-                <BarChart3 className="h-4 w-4 text-muted-foreground" />
-              </CardHeader>
-              <CardContent>
-                <div className="text-2xl font-bold">{stats.storageUsed}</div>
-                <p className="text-xs text-muted-foreground">
-                  R2 storage usage
-                </p>
-              </CardContent>
-            </Card>
-          </div>
-        )}
-
-        {/* Controls */}
-        <Card>
-          <CardHeader>
-            <CardTitle>Portfolio Management</CardTitle>
-            <CardDescription>
-              Manage your portfolio images, organize galleries, and track performance.
-            </CardDescription>
-          </CardHeader>
-          <CardContent className="space-y-4">
-            {/* Search and Filters */}
-            <div className="flex flex-col gap-4 md:flex-row md:items-center md:justify-between">
-              <div className="flex flex-1 items-center space-x-2">
-                <Search className="h-4 w-4 text-muted-foreground" />
-                <Input
-                  placeholder="Search images..."
-                  value={searchTerm}
-                  onChange={(e) => setSearchTerm(e.target.value)}
-                  className="max-w-sm"
-                />
-              </div>
-              
-              <div className="flex items-center space-x-2">
-                <Select value={selectedArtist} onValueChange={setSelectedArtist}>
-                  <SelectTrigger className="w-[180px]">
-                    <SelectValue placeholder="Filter by artist" />
-                  </SelectTrigger>
-                  <SelectContent>
-                    <SelectItem value="all">All Artists</SelectItem>
-                    {artists.map((artist) => (
-                      <SelectItem key={artist.id} value={artist.id}>
-                        {artist.name}
-                      </SelectItem>
-                    ))}
-                  </SelectContent>
-                </Select>
-                
-                <Select value={selectedCategory} onValueChange={setSelectedCategory}>
-                  <SelectTrigger className="w-[180px]">
-                    <SelectValue placeholder="Filter by category" />
-                  </SelectTrigger>
-                  <SelectContent>
-                    <SelectItem value="all">All Categories</SelectItem>
-                    {categories.map((category) => (
-                      <SelectItem key={category} value={category}>
-                        {category}
-                      </SelectItem>
-                    ))}
-                  </SelectContent>
-                </Select>
-              </div>
+    <>
+      <Card>
+        <CardHeader>
+          <CardTitle>Portfolio Images ({images.length})</CardTitle>
+        </CardHeader>
+        <CardContent className="space-y-6">
+          {/* Upload Section */}
+          <div className="border-2 border-dashed border-gray-300 rounded-lg p-6 text-center hover:border-gray-400 transition-colors">
+            <Upload className="mx-auto h-12 w-12 text-gray-400" />
+            <div className="mt-4">
+              <Label htmlFor="portfolio-upload" className="cursor-pointer">
+                <span className="mt-2 block text-sm font-medium">
+                  {uploading ? 'Uploading...' : 'Upload portfolio images'}
+                </span>
+                <span className="mt-1 block text-xs text-muted-foreground">
+                  PNG, JPG, WebP up to 5MB each
+                </span>
+              </Label>
+              <Input
+                id="portfolio-upload"
+                type="file"
+                multiple
+                accept="image/*"
+                className="hidden"
+                onChange={(e) => handleFileUpload(e.target.files)}
+                disabled={uploading}
+              />
             </div>
-
-            {/* Action Bar */}
-            <div className="flex items-center justify-between">
-              <div className="flex items-center space-x-2">
-                <Dialog open={showUploadDialog} onOpenChange={setShowUploadDialog}>
-                  <DialogTrigger asChild>
-                    <Button>
-                      <Plus className="mr-2 h-4 w-4" />
-                      Upload Images
-                    </Button>
-                  </DialogTrigger>
-                  <DialogContent>
-                    <DialogHeader>
-                      <DialogTitle>Upload Portfolio Images</DialogTitle>
-                      <DialogDescription>
-                        Select multiple images to upload to the portfolio.
-                      </DialogDescription>
-                    </DialogHeader>
-                    <div className="space-y-4">
-                      <div>
-                        <Label htmlFor="images">Select Images</Label>
-                        <Input
-                          id="images"
-                          type="file"
-                          multiple
-                          accept="image/*"
-                          onChange={(e) => e.target.files && handleFileUpload(e.target.files)}
-                          disabled={isUploading}
-                        />
-                      </div>
-                      {isUploading && (
-                        <div className="space-y-2">
-                          <div className="text-sm text-muted-foreground">
-                            Uploading... {progress.length > 0 ? Math.round(progress[0].progress || 0) : 0}%
-                          </div>
-                          <div className="w-full bg-secondary rounded-full h-2">
-                            <div 
-                              className="bg-primary h-2 rounded-full transition-all duration-300"
-                              style={{ width: `${progress.length > 0 ? progress[0].progress || 0 : 0}%` }}
-                            />
-                          </div>
-                        </div>
-                      )}
-                    </div>
-                  </DialogContent>
-                </Dialog>
-
-                {selectedImages.size > 0 && (
-                  <>
-                    <AlertDialog>
-                      <AlertDialogTrigger asChild>
-                        <Button variant="destructive" size="sm">
-                          <Trash2 className="mr-2 h-4 w-4" />
-                          Delete Selected ({selectedImages.size})
-                        </Button>
-                      </AlertDialogTrigger>
-                      <AlertDialogContent>
-                        <AlertDialogHeader>
-                          <AlertDialogTitle>Delete Images</AlertDialogTitle>
-                          <AlertDialogDescription>
-                            Are you sure you want to delete {selectedImages.size} selected images? 
-                            This action cannot be undone.
-                          </AlertDialogDescription>
-                        </AlertDialogHeader>
-                        <AlertDialogFooter>
-                          <AlertDialogCancel>Cancel</AlertDialogCancel>
-                          <AlertDialogAction onClick={handleBulkDelete}>
-                            Delete
-                          </AlertDialogAction>
-                        </AlertDialogFooter>
-                      </AlertDialogContent>
-                    </AlertDialog>
-                    
-                    <Button variant="outline" size="sm" onClick={clearSelection}>
-                      <X className="mr-2 h-4 w-4" />
-                      Clear Selection
-                    </Button>
-                  </>
-                )}
+            {uploading && (
+              <div className="mt-4">
+                <Loader2 className="h-6 w-6 animate-spin mx-auto text-primary" />
               </div>
-
-              <div className="flex items-center space-x-2">
-                <Button
-                  variant="outline"
-                  size="sm"
-                  onClick={selectedImages.size === filteredImages.length ? clearSelection : selectAllImages}
-                >
-                  {selectedImages.size === filteredImages.length ? 'Deselect All' : 'Select All'}
-                </Button>
-                
-                <div className="flex items-center border rounded-md">
-                  <Button
-                    variant={viewMode === 'grid' ? 'default' : 'ghost'}
-                    size="sm"
-                    onClick={() => setViewMode('grid')}
-                    className="rounded-r-none"
-                  >
-                    <Grid className="h-4 w-4" />
-                  </Button>
-                  <Button
-                    variant={viewMode === 'list' ? 'default' : 'ghost'}
-                    size="sm"
-                    onClick={() => setViewMode('list')}
-                    className="rounded-l-none"
-                  >
-                    <List className="h-4 w-4" />
-                  </Button>
-                </div>
-              </div>
-            </div>
-          </CardContent>
-        </Card>
-
-        {/* Portfolio Grid/List */}
-        <div className="space-y-4">
-          <div className="flex items-center justify-between">
-            <h3 className="text-lg font-semibold">
-              Portfolio Images ({filteredImages.length})
-            </h3>
+            )}
           </div>
 
-          {viewMode === 'grid' ? (
-            <div className="grid gap-4 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4">
-              {filteredImages.map((image) => (
-                <Card key={image.id} className="overflow-hidden">
-                  <div className="relative aspect-square">
-                    <Image
-                      src={image.url}
-                      alt={image.caption || 'Portfolio image'}
-                      fill
-                      className="object-cover"
-                    />
-                    <div className="absolute top-2 left-2">
-                      <Checkbox
-                        checked={selectedImages.has(image.id)}
-                        onCheckedChange={() => toggleImageSelection(image.id)}
-                        className="bg-background"
-                      />
-                    </div>
-                    <div className="absolute top-2 right-2 flex space-x-1">
-                      <Button size="sm" variant="secondary" className="h-8 w-8 p-0">
-                        <Eye className="h-4 w-4" />
-                      </Button>
-                      <Button size="sm" variant="secondary" className="h-8 w-8 p-0">
-                        <Edit className="h-4 w-4" />
-                      </Button>
-                      <AlertDialog>
-                        <AlertDialogTrigger asChild>
-                          <Button size="sm" variant="destructive" className="h-8 w-8 p-0">
-                            <Trash2 className="h-4 w-4" />
-                          </Button>
-                        </AlertDialogTrigger>
-                        <AlertDialogContent>
-                          <AlertDialogHeader>
-                            <AlertDialogTitle>Delete Image</AlertDialogTitle>
-                            <AlertDialogDescription>
-                              Are you sure you want to delete this image? This action cannot be undone.
-                            </AlertDialogDescription>
-                          </AlertDialogHeader>
-                          <AlertDialogFooter>
-                            <AlertDialogCancel>Cancel</AlertDialogCancel>
-                            <AlertDialogAction onClick={() => handleDeleteImage(image.id)}>
-                              Delete
-                            </AlertDialogAction>
-                          </AlertDialogFooter>
-                        </AlertDialogContent>
-                      </AlertDialog>
-                    </div>
-                  </div>
-                  <CardContent className="p-4">
-                    <div className="space-y-2">
-                      <h4 className="font-semibold truncate">{image.caption || 'Untitled'}</h4>
-                      <div className="flex items-center justify-between text-xs text-muted-foreground">
-                        <span>{artists.find(a => a.id === image.artistId)?.name || 'Unknown'}</span>
-                        <span>{new Date(image.createdAt).toLocaleDateString()}</span>
-                      </div>
-                      {image.tags && image.tags.length > 0 && (
-                        <div className="flex flex-wrap gap-1">
-                          {image.tags.slice(0, 3).map((tag, index) => (
-                            <Badge key={index} variant="secondary" className="text-xs">
-                              {tag}
-                            </Badge>
-                          ))}
-                          {image.tags.length > 3 && (
-                            <Badge variant="outline" className="text-xs">
-                              +{image.tags.length - 3}
-                            </Badge>
-                          )}
-                        </div>
-                      )}
-                    </div>
-                  </CardContent>
-                </Card>
-              ))}
+          {/* Images Grid */}
+          {images.length === 0 ? (
+            <div className="text-center py-12 text-muted-foreground">
+              <p>No portfolio images yet. Upload some to get started!</p>
             </div>
           ) : (
-            <div className="space-y-2">
-              {filteredImages.map((image) => (
-                <Card key={image.id}>
-                  <CardContent className="p-4">
-                    <div className="flex items-center space-x-4">
-                      <Checkbox
-                        checked={selectedImages.has(image.id)}
-                        onCheckedChange={() => toggleImageSelection(image.id)}
-                      />
-                      <div className="relative h-16 w-16 flex-shrink-0">
-                        <Image
-                          src={image.url}
-                          alt={image.caption || 'Portfolio image'}
-                          fill
-                          className="object-cover rounded"
-                        />
-                      </div>
-                      <div className="flex-1 space-y-1">
-                        <h4 className="font-semibold">{image.caption || 'Untitled'}</h4>
-                        <p className="text-sm text-muted-foreground">
-                          {artists.find(a => a.id === image.artistId)?.name || 'Unknown Artist'}
-                        </p>
-                      </div>
-                      <div className="flex items-center space-x-2">
-                        <Badge variant="outline">Portfolio</Badge>
-                        <span className="text-sm text-muted-foreground">
-                          {new Date(image.createdAt).toLocaleDateString()}
-                        </span>
-                        <div className="flex space-x-1">
-                          <Button size="sm" variant="ghost" className="h-8 w-8 p-0">
-                            <Eye className="h-4 w-4" />
-                          </Button>
-                          <Button size="sm" variant="ghost" className="h-8 w-8 p-0">
-                            <Edit className="h-4 w-4" />
-                          </Button>
-                          <AlertDialog>
-                            <AlertDialogTrigger asChild>
-                              <Button size="sm" variant="ghost" className="h-8 w-8 p-0 text-destructive">
-                                <Trash2 className="h-4 w-4" />
-                              </Button>
-                            </AlertDialogTrigger>
-                            <AlertDialogContent>
-                              <AlertDialogHeader>
-                                <AlertDialogTitle>Delete Image</AlertDialogTitle>
-                                <AlertDialogDescription>
-                                  Are you sure you want to delete this image? This action cannot be undone.
-                                </AlertDialogDescription>
-                              </AlertDialogHeader>
-                              <AlertDialogFooter>
-                                <AlertDialogCancel>Cancel</AlertDialogCancel>
-                                <AlertDialogAction onClick={() => handleDeleteImage(image.id)}>
-                                  Delete
-                                </AlertDialogAction>
-                              </AlertDialogFooter>
-                            </AlertDialogContent>
-                          </AlertDialog>
-                        </div>
-                      </div>
+            <div className="grid grid-cols-2 md:grid-cols-3 lg:grid-cols-4 gap-4">
+              {images.map((image) => (
+                <div
+                  key={image.id}
+                  className="group relative aspect-square rounded-lg overflow-hidden border border-gray-200 hover:border-gray-300 transition-colors"
+                >
+                  {/* Image */}
+                  <Image
+                    src={image.url || '/placeholder.svg'}
+                    alt={image.caption || 'Portfolio image'}
+                    fill
+                    className="object-cover"
+                    sizes="(max-width: 768px) 50vw, (max-width: 1024px) 33vw, 25vw"
+                  />
+
+                  {/* Visibility Badge */}
+                  <div className="absolute top-2 right-2">
+                    <Badge variant={image.isPublic ? 'default' : 'secondary'} className="text-xs">
+                      {image.isPublic ? (
+                        <><Eye className="h-3 w-3 mr-1" /> Public</>
+                      ) : (
+                        <><EyeOff className="h-3 w-3 mr-1" /> Private</>
+                      )}
+                    </Badge>
+                  </div>
+
+                  {/* Hover Overlay */}
+                  <div className="absolute inset-0 bg-black/60 opacity-0 group-hover:opacity-100 transition-opacity flex items-center justify-center gap-2">
+                    <Button
+                      size="sm"
+                      variant="secondary"
+                      onClick={() => openEditDialog(image)}
+                    >
+                      <Edit className="h-4 w-4" />
+                    </Button>
+                    <Button
+                      size="sm"
+                      variant="destructive"
+                      onClick={() => setDeletingImage(image)}
+                    >
+                      <Trash2 className="h-4 w-4" />
+                    </Button>
+                  </div>
+
+                  {/* Caption */}
+                  {image.caption && (
+                    <div className="absolute bottom-0 left-0 right-0 bg-black/70 p-2">
+                      <p className="text-xs text-white line-clamp-2">{image.caption}</p>
                     </div>
-                  </CardContent>
-                </Card>
+                  )}
+                </div>
               ))}
             </div>
           )}
+        </CardContent>
+      </Card>
 
-          {filteredImages.length === 0 && (
-            <Card>
-              <CardContent className="flex flex-col items-center justify-center py-12">
-                <ImageIcon className="h-12 w-12 text-muted-foreground mb-4" />
-                <h3 className="text-lg font-semibold mb-2">No images found</h3>
-                <p className="text-muted-foreground text-center mb-4">
-                  {searchTerm || selectedArtist !== 'all' || selectedCategory !== 'all'
-                    ? 'Try adjusting your search or filters'
-                    : 'Upload your first portfolio images to get started'}
-                </p>
-                {!searchTerm && selectedArtist === 'all' && selectedCategory === 'all' && (
-                  <Button onClick={() => setShowUploadDialog(true)}>
-                    <Plus className="mr-2 h-4 w-4" />
-                    Upload Images
-                  </Button>
+      {/* Edit Dialog */}
+      <Dialog open={!!editingImage} onOpenChange={(open) => !open && closeEditDialog()}>
+        <DialogContent className="max-w-2xl">
+          <DialogHeader>
+            <DialogTitle>Edit Portfolio Image</DialogTitle>
+            <DialogDescription>
+              Update image details, tags, and visibility
+            </DialogDescription>
+          </DialogHeader>
+
+          {editingImage && (
+            <form onSubmit={handleSubmit(onSubmitEdit)} className="space-y-6">
+              {/* Image Preview */}
+              <div className="relative aspect-video w-full rounded-lg overflow-hidden bg-gray-100">
+                <Image
+                  src={editingImage.url || '/placeholder.svg'}
+                  alt={editingImage.caption || 'Portfolio image'}
+                  fill
+                  className="object-contain"
+                  sizes="(max-width: 768px) 100vw, 50vw"
+                />
+              </div>
+
+              {/* Caption */}
+              <div className="space-y-2">
+                <Label htmlFor="caption">Caption</Label>
+                <Textarea
+                  id="caption"
+                  {...register('caption')}
+                  placeholder="Describe this work..."
+                  rows={3}
+                />
+                {errors.caption && (
+                  <p className="text-sm text-red-600">{errors.caption.message}</p>
                 )}
-              </CardContent>
-            </Card>
+              </div>
+
+              {/* Tags */}
+              <div className="space-y-2">
+                <Label>Tags</Label>
+                <div className="flex gap-2">
+                  <Input
+                    value={newTag}
+                    onChange={(e) => setNewTag(e.target.value)}
+                    placeholder="Add a tag (e.g., Traditional, Portrait)"
+                    onKeyPress={(e) => e.key === 'Enter' && (e.preventDefault(), addTag())}
+                  />
+                  <Button type="button" onClick={addTag} size="sm">
+                    <Plus className="h-4 w-4" />
+                  </Button>
+                </div>
+                <div className="flex flex-wrap gap-2">
+                  {tags.map((tag) => (
+                    <Badge key={tag} variant="secondary" className="flex items-center gap-1">
+                      {tag}
+                      <button
+                        type="button"
+                        onClick={() => removeTag(tag)}
+                        className="ml-1 hover:text-red-600"
+                      >
+                        <X className="h-3 w-3" />
+                      </button>
+                    </Badge>
+                  ))}
+                </div>
+              </div>
+
+              {/* Visibility */}
+              <div className="flex items-center space-x-2">
+                <Switch
+                  id="isPublic"
+                  checked={watch('isPublic')}
+                  onCheckedChange={(checked) => setValue('isPublic', checked)}
+                />
+                <Label htmlFor="isPublic">Public (visible on artist profile)</Label>
+              </div>
+
+              <DialogFooter>
+                <Button type="button" variant="outline" onClick={closeEditDialog}>
+                  Cancel
+                </Button>
+                <Button type="submit" disabled={isSubmitting}>
+                  {isSubmitting ? 'Saving...' : 'Save Changes'}
+                </Button>
+              </DialogFooter>
+            </form>
           )}
-        </div>
-      </div>
-    </ErrorBoundary>
+        </DialogContent>
+      </Dialog>
+
+      {/* Delete Confirmation */}
+      <AlertDialog open={!!deletingImage} onOpenChange={(open) => !open && setDeletingImage(null)}>
+        <AlertDialogContent>
+          <AlertDialogHeader>
+            <AlertDialogTitle>Delete Portfolio Image?</AlertDialogTitle>
+            <AlertDialogDescription>
+              This action cannot be undone. This will permanently delete this image from the portfolio.
+            </AlertDialogDescription>
+          </AlertDialogHeader>
+          <AlertDialogFooter>
+            <AlertDialogCancel>Cancel</AlertDialogCancel>
+            <AlertDialogAction onClick={handleDelete} className="bg-red-600 hover:bg-red-700">
+              Delete
+            </AlertDialogAction>
+          </AlertDialogFooter>
+        </AlertDialogContent>
+      </AlertDialog>
+    </>
   )
 }