diff --git a/components/CardItem.js b/components/CardItem.js
index 909cb7a..209fbd1 100644
--- a/components/CardItem.js
+++ b/components/CardItem.js
@@ -9,9 +9,7 @@ export default function CardItem({
   onAddToCollection,
   onAddToDeck,
   onToggleFavorite,
-  isFavorited = false,
-  cardIndex = 0,
-  cardsPerRow = 4
+  isFavorited = false
 }) {
   const [imageError, setImageError] = useState(false);
   const router = useRouter();
@@ -77,9 +75,7 @@ export default function CardItem({
 
   const rarityEffects = getRarityEffects(card.rarity);
 
-  // Determine panel position based on card position in row
-  const isRightSide = (cardIndex % cardsPerRow) >= Math.floor(cardsPerRow / 2);
-  const panelPosition = isRightSide ? 'right' : 'left';
+  // Panel positioning no longer needed - using simple hover buttons
 
   if (viewMode === 'list') {
     return (
@@ -190,16 +186,19 @@ export default function CardItem({
 
   // Grid view
   return (
-    <div className={`card-item-container relative group bg-transparent rounded-xl transition-all duration-300 overflow-visible ${
-      isSelected ? 'selected scale-105' : ''
-    }`}>
+    <div className="card-item-container relative group bg-transparent rounded-xl transition-all duration-200 overflow-visible transform hover:scale-105 hover:z-10">
       {/* Main Card Container */}
       <div 
-        className={`relative bg-white rounded-xl border transition-all duration-300 overflow-hidden cursor-pointer ${
+        className={`relative rounded-xl border-2 transition-all duration-200 overflow-hidden cursor-pointer ${
           isSelected 
-            ? 'border-purple-500 shadow-xl ring-2 ring-purple-200' 
-            : `${rarityEffects.border} group-hover:border-gray-300 group-hover:shadow-lg ${rarityEffects.shadow ? `shadow-lg ${rarityEffects.shadow}` : ''}`
+            ? 'shadow-xl ring-2 ring-opacity-50' 
+            : 'group-hover:shadow-xl'
         } ${rarityEffects.glow}`}
+        style={{
+          backgroundColor: 'var(--bg-primary)',
+          borderColor: isSelected ? 'var(--accent-ember)' : 'var(--border)',
+          '--tw-ring-color': isSelected ? 'var(--accent-ember)' : 'transparent'
+        }}
         onClick={handleCardClick}
       >
         
@@ -207,34 +206,8 @@ export default function CardItem({
         {rarityEffects.particles && (
           <div className={`absolute inset-0 pointer-events-none ${rarityEffects.particles}`}></div>
         )}
-        {/* Selection Checkbox */}
-        <div className="absolute top-3 left-3 z-20">
-          <input
-            type="checkbox"
-            checked={isSelected}
-            onChange={handleSelectChange}
-            className="w-4 h-4 text-purple-600 bg-white border-gray-300 rounded focus:ring-purple-500 focus:ring-2 shadow-sm"
-          />
-        </div>
 
-        {/* Favorite Button */}
-        <div className="absolute top-3 right-3 z-20">
-          <button
-            onClick={(e) => {
-              e.stopPropagation();
-              onToggleFavorite(card);
-            }}
-            className={`p-2 rounded-full transition-all duration-300 ${
-              isFavorited 
-                ? 'text-red-500 bg-white shadow-sm' 
-                : 'text-gray-400 bg-white/90 hover:text-red-500 hover:bg-white shadow-sm opacity-0 group-hover:opacity-100'
-            }`}
-          >
-            <svg className="w-4 h-4" fill={isFavorited ? "currentColor" : "none"} stroke="currentColor" viewBox="0 0 24 24">
-              <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M4.318 6.318a4.5 4.5 0 000 6.364L12 20.364l7.682-7.682a4.5 4.5 0 00-6.364-6.364L12 7.636l-1.318-1.318a4.5 4.5 0 00-6.364 0z" />
-            </svg>
-          </button>
-        </div>
+
 
         {/* Card Image */}
         <div className="aspect-[2.5/3.5] bg-gray-200 overflow-hidden">
@@ -242,7 +215,7 @@ export default function CardItem({
             <img
               src={card.image_url}
               alt={card.name}
-              className="w-full h-full object-cover transition-transform duration-300 group-hover:scale-105"
+              className="w-full h-full object-cover"
               onError={handleImageError}
             />
           ) : (
@@ -258,245 +231,80 @@ export default function CardItem({
         </div>
       </div>
 
-      {/* Side Hover Panel */}
-      <div className={`card-side-panel absolute ${
-        panelPosition === 'right' 
-          ? 'right-full top-0 mr-2' 
-          : 'left-full top-0 ml-2'
-      } w-80 h-full transition-all duration-300 ease-out z-30 ${
-        panelPosition === 'right'
-          ? 'opacity-0 -translate-x-2 pointer-events-none group-hover:opacity-100 group-hover:translate-x-0 group-hover:pointer-events-auto delay-300 group-hover:delay-500'
-          : 'opacity-0 translate-x-2 pointer-events-none group-hover:opacity-100 group-hover:translate-x-0 group-hover:pointer-events-auto delay-300 group-hover:delay-500'
-      }`}>
-        <div className={`bg-white dark:bg-gray-800 rounded-xl border shadow-2xl h-full overflow-hidden ${
-          rarityEffects.border !== 'border-gray-200' 
-            ? `${rarityEffects.border} dark:${rarityEffects.border.replace('border-', 'border-')} ${rarityEffects.glow}` 
-            : 'border-gray-200 dark:border-gray-700'
-        }`}>
-          {/* Panel Header */}
-          <div className="p-4 border-b border-gray-200 dark:border-gray-700">
-            <div className="flex items-start justify-between mb-2">
-              <h3 className="font-bold text-gray-900 dark:text-white text-lg leading-tight pr-2">
-                {card.name}
-              </h3>
-              <span className="text-2xl font-bold text-green-600 dark:text-green-400 flex-shrink-0">
-                ${card.market_price}
-              </span>
-            </div>
-            
-            {/* TCG-Specific Info */}
-            {card.game === 'MTG' && (
-              <div className="flex items-center space-x-3 mb-2">
-                {card.mana_cost && (
-                  <div className="flex items-center space-x-1">
-                    <span className="text-sm text-gray-600 dark:text-gray-400">Cost:</span>
-                    <span className="px-2 py-1 bg-blue-100 dark:bg-blue-900 text-blue-800 dark:text-blue-200 rounded text-sm font-mono">
-                      {card.mana_cost}
-                    </span>
-                  </div>
-                )}
-                {card.power && card.toughness && (
-                  <div className="flex items-center space-x-1">
-                    <span className="text-sm text-gray-600 dark:text-gray-400">P/T:</span>
-                    <span className="px-2 py-1 bg-red-100 dark:bg-red-900 text-red-800 dark:text-red-200 rounded text-sm font-bold">
-                      {card.power}/{card.toughness}
-                    </span>
-                  </div>
-                )}
-              </div>
-            )}
+      {/* Hover Action Buttons */}
+      {/* Top Right - Checkbox and Favorite */}
+      <div className="absolute top-2 right-2 flex items-center space-x-1 opacity-0 group-hover:opacity-100 transition-opacity duration-200 z-20">
+        {/* Selection Checkbox */}
+        <button
+          onClick={(e) => {
+            e.stopPropagation();
+            onToggleSelect(card);
+          }}
+          className="p-1.5 rounded-lg shadow-lg transition-all duration-200 hover:scale-110"
+          style={{ backgroundColor: 'var(--bg-primary)' }}
+        >
+          <input
+            type="checkbox"
+            checked={isSelected}
+            onChange={() => {}}
+            className="w-4 h-4 rounded focus:ring-2 focus:ring-offset-2"
+            style={{ 
+              accentColor: 'var(--accent-ember)',
+              backgroundColor: 'var(--bg-primary)',
+              borderColor: 'var(--border)'
+            }}
+          />
+        </button>
 
-            {card.game === 'Pokemon' && card.power && (
-              <div className="flex items-center space-x-3 mb-2">
-                <div className="flex items-center space-x-1">
-                  <span className="text-sm text-gray-600 dark:text-gray-400">HP:</span>
-                  <span className="px-2 py-1 bg-yellow-100 dark:bg-yellow-900 text-yellow-800 dark:text-yellow-200 rounded text-sm font-bold">
-                    {card.power}
-                  </span>
-                </div>
-              </div>
-            )}
+        {/* Favorite Button */}
+        <button
+          onClick={(e) => {
+            e.stopPropagation();
+            onToggleFavorite(card);
+          }}
+          className="p-1.5 rounded-lg shadow-lg transition-all duration-200 hover:scale-110"
+          style={{ 
+            backgroundColor: isFavorited ? 'var(--accent-ember)' : 'var(--bg-primary)',
+            color: isFavorited ? 'white' : 'var(--accent-ember)'
+          }}
+          title="Toggle Favorite"
+        >
+          <svg className="w-4 h-4" fill={isFavorited ? "currentColor" : "none"} stroke="currentColor" viewBox="0 0 24 24">
+            <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M4.318 6.318a4.5 4.5 0 000 6.364L12 20.364l7.682-7.682a4.5 4.5 0 00-6.364-6.364L12 7.636l-1.318-1.318a4.5 4.5 0 00-6.364 0z" />
+          </svg>
+        </button>
+      </div>
 
-            {card.game === 'Lorcana' && card.cmc && (
-              <div className="flex items-center space-x-3 mb-2">
-                <div className="flex items-center space-x-1">
-                  <span className="text-sm text-gray-600 dark:text-gray-400">Cost:</span>
-                  <span className="px-2 py-1 bg-purple-100 dark:bg-purple-900 text-purple-800 dark:text-purple-200 rounded text-sm font-bold">
-                    {card.cmc}
-                  </span>
-                </div>
-                {card.power && card.toughness && (
-                  <div className="flex items-center space-x-1">
-                    <span className="text-sm text-gray-600 dark:text-gray-400">Str/Will:</span>
-                    <span className="px-2 py-1 bg-amber-100 dark:bg-amber-900 text-amber-800 dark:text-amber-200 rounded text-sm font-bold">
-                      {card.power}/{card.toughness}
-                    </span>
-                  </div>
-                )}
-              </div>
-            )}
-
-            <div className="flex items-center space-x-2">
-              <span className="px-2 py-1 text-sm font-medium rounded-full bg-blue-100 dark:bg-blue-900 text-blue-800 dark:text-blue-200">
-                {card.game}
-              </span>
-              <span className="text-sm text-gray-600 dark:text-gray-400">{card.set_name}</span>
-              {rarityEffects.glow && (
-                <div className="flex items-center space-x-1">
-                  <div className={`w-2 h-2 rounded-full ${
-                    card.rarity?.toLowerCase().includes('mythic') || card.rarity?.toLowerCase().includes('legendary') 
-                      ? 'bg-yellow-400 shadow-sm shadow-yellow-400/50' 
-                      : card.rarity?.toLowerCase().includes('rare') || card.rarity?.toLowerCase().includes('holo')
-                      ? 'bg-purple-400 shadow-sm shadow-purple-400/50'
-                      : card.rarity?.toLowerCase().includes('uncommon')
-                      ? 'bg-blue-400 shadow-sm shadow-blue-400/50'
-                      : card.rarity?.toLowerCase().includes('enchanted') || card.rarity?.toLowerCase().includes('secret')
-                      ? 'bg-pink-400 shadow-sm shadow-pink-400/50'
-                      : 'bg-gray-400'
-                  } animate-pulse`}></div>
-                </div>
-              )}
-            </div>
-          </div>
-
-          {/* Panel Body */}
-          <div className="p-4 flex-1 overflow-y-auto">
-            <div className="space-y-4">
-              {/* Card Details */}
-              <div>
-                <div className="grid grid-cols-2 gap-4 mb-4">
-                  <div>
-                    <span className="text-sm font-medium text-gray-500 dark:text-gray-400">Rarity</span>
-                    <p className="text-sm text-gray-900 dark:text-white font-medium">{card.rarity}</p>
-                  </div>
-                  <div>
-                    <span className="text-sm font-medium text-gray-500 dark:text-gray-400">Type</span>
-                    <p className="text-sm text-gray-900 dark:text-white font-medium">{card.card_type}</p>
-                  </div>
-                </div>
-
-                {/* Oracle Text */}
-                {card.oracle_text && (
-                  <div className="mb-4">
-                    <span className="text-sm font-medium text-gray-500 dark:text-gray-400">Description</span>
-                    <p className="text-sm text-gray-700 dark:text-gray-300 mt-1 leading-relaxed">
-                      {card.oracle_text}
-                    </p>
-                  </div>
-                )}
-
-                {/* Colors for MTG */}
-                {card.game === 'MTG' && card.colors && card.colors.length > 0 && (
-                  <div className="mb-4">
-                    <span className="text-sm font-medium text-gray-500 dark:text-gray-400">Colors</span>
-                    <div className="flex flex-wrap gap-1 mt-1">
-                      {card.colors.map((color, index) => (
-                        <span key={index} className="px-2 py-1 text-xs rounded-full bg-gray-100 dark:bg-gray-700 text-gray-700 dark:text-gray-300">
-                          {color}
-                        </span>
-                      ))}
-                    </div>
-                  </div>
-                )}
-              </div>
-            </div>
-          </div>
-
-          {/* Panel Footer - Actions */}
-          <div className="p-4 border-t border-gray-200 dark:border-gray-700 bg-gray-50 dark:bg-gray-900">
-            <div className="space-y-3">
-              {/* Primary Actions */}
-              <div className="grid grid-cols-2 gap-2">
-                <button
-                  onClick={(e) => {
-                    e.stopPropagation();
-                    onAddToCollection([card]);
-                  }}
-                  className="flex items-center justify-center space-x-2 px-3 py-2 bg-blue-600 hover:bg-blue-700 text-white rounded-lg transition-colors text-sm font-medium"
-                >
-                  <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                    <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M19 11H5m14 0a2 2 0 012 2v6a2 2 0 01-2 2H5a2 2 0 01-2-2v-6a2 2 0 012-2m14 0V9a2 2 0 00-2-2M5 11V9a2 2 0 012-2m0 0V5a2 2 0 012-2h6a2 2 0 012 2v2M7 7h10" />
-                  </svg>
-                  <span>Collection</span>
-                </button>
-
-                <button
-                  onClick={(e) => {
-                    e.stopPropagation();
-                    onAddToDeck([card]);
-                  }}
-                  className="flex items-center justify-center space-x-2 px-3 py-2 bg-green-600 hover:bg-green-700 text-white rounded-lg transition-colors text-sm font-medium"
-                >
-                  <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                    <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M19 11H5m14 0a2 2 0 012 2v6a2 2 0 01-2 2H5a2 2 0 01-2-2v-6a2 2 0 012-2m14 0V9a2 2 0 00-2-2M5 11V9a2 2 0 012-2m0 0V5a2 2 0 012-2h6a2 2 0 012 2v2M7 7h10" />
-                  </svg>
-                  <span>Deck</span>
-                </button>
-              </div>
-
-              {/* Secondary Actions */}
-              <div className="grid grid-cols-4 gap-2">
-                <button
-                  onClick={(e) => {
-                    e.stopPropagation();
-                    alert('Mark as owned (coming soon)');
-                  }}
-                  className="flex items-center justify-center p-2 bg-purple-100 dark:bg-purple-900 text-purple-700 dark:text-purple-300 rounded-lg hover:bg-purple-200 dark:hover:bg-purple-800 transition-colors"
-                  title="Mark as Owned"
-                >
-                  <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                    <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M5 13l4 4L19 7" />
-                  </svg>
-                </button>
-
-                <button
-                  onClick={(e) => {
-                    e.stopPropagation();
-                    onToggleFavorite(card);
-                  }}
-                  className={`flex items-center justify-center p-2 rounded-lg transition-colors ${
-                    isFavorited 
-                      ? 'bg-red-100 dark:bg-red-900 text-red-700 dark:text-red-300 hover:bg-red-200 dark:hover:bg-red-800' 
-                      : 'bg-gray-100 dark:bg-gray-700 text-gray-700 dark:text-gray-300 hover:bg-gray-200 dark:hover:bg-gray-600'
-                  }`}
-                  title="Toggle Favorite"
-                >
-                  <svg className="w-4 h-4" fill={isFavorited ? "currentColor" : "none"} stroke="currentColor" viewBox="0 0 24 24">
-                    <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M4.318 6.318a4.5 4.5 0 000 6.364L12 20.364l7.682-7.682a4.5 4.5 0 00-6.364-6.364L12 7.636l-1.318-1.318a4.5 4.5 0 00-6.364 0z" />
-                  </svg>
-                </button>
-
-                <button
-                  onClick={(e) => {
-                    e.stopPropagation();
-                    router.push(`/card/${card.id}`);
-                  }}
-                  className="flex items-center justify-center p-2 bg-gray-100 dark:bg-gray-700 text-gray-700 dark:text-gray-300 rounded-lg hover:bg-gray-200 dark:hover:bg-gray-600 transition-colors"
-                  title="View Details"
-                >
-                  <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                    <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" />
-                    <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M2.458 12C3.732 7.943 7.523 5 12 5c4.478 0 8.268 2.943 9.542 7-1.274 4.057-5.064 7-9.542 7-4.477 0-8.268-2.943-9.542-7z" />
-                  </svg>
-                </button>
-
-                <button
-                  onClick={(e) => {
-                    e.stopPropagation();
-                    navigator.clipboard.writeText(`${card.name} - ${card.set_name}`);
-                    // Could add a toast notification here
-                  }}
-                  className="flex items-center justify-center p-2 bg-gray-100 dark:bg-gray-700 text-gray-700 dark:text-gray-300 rounded-lg hover:bg-gray-200 dark:hover:bg-gray-600 transition-colors"
-                  title="Copy Card Info"
-                >
-                  <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                    <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M8 16H6a2 2 0 01-2-2V6a2 2 0 012-2h8a2 2 0 012 2v2m-6 12h8a2 2 0 002-2v-8a2 2 0 00-2-2h-8a2 2 0 00-2 2v8a2 2 0 002 2z" />
-                  </svg>
-                </button>
-              </div>
-            </div>
-          </div>
+      {/* Bottom Left - Ownership Status & Add Button */}
+      <div className="absolute bottom-2 left-2 flex items-center space-x-1 z-20">
+        {/* Ownership Indicator - Always visible */}
+        <div className="flex items-center space-x-1">
+          {/* This would be connected to actual ownership data */}
+          <div 
+            className="w-2 h-2 rounded-full"
+            style={{ 
+              backgroundColor: false ? 'var(--accent-gold)' : 'var(--text-secondary)',
+              opacity: 0.7
+            }}
+            title={false ? "You own this card" : "Not owned"}
+          />
         </div>
+
+        {/* Add/Own Button - Appears on hover */}
+        <button
+          onClick={(e) => {
+            e.stopPropagation();
+            // This would toggle ownership status
+            alert('Mark as owned (coming soon)');
+          }}
+          className="opacity-0 group-hover:opacity-100 transition-all duration-200 p-1.5 rounded-lg shadow-lg hover:scale-110"
+          style={{ backgroundColor: 'var(--accent-wood)' }}
+          title="Mark as Owned"
+        >
+          <svg className="w-4 h-4 text-white" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+            <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M12 4v16m8-8H4" />
+          </svg>
+        </button>
       </div>
     </div>
   );
diff --git a/pages/cards.js b/pages/cards.js
index bf5dae3..6da875d 100644
--- a/pages/cards.js
+++ b/pages/cards.js
@@ -816,34 +816,20 @@ export default function Cards() {
           </div>
         ) : (
           <>
-            <div className={viewMode === 'grid' ? 'card-grid-container grid grid-cols-2 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-3 xl:grid-cols-4 2xl:grid-cols-5 gap-3 sm:gap-4 lg:gap-6 p-3 sm:p-4 lg:p-6 xl:p-8 lg:pr-96' : 'space-y-4 p-6'}>
-              {cards.map((card, index) => {
-                // Calculate cards per row based on current breakpoint
-                const getCardsPerRow = () => {
-                  if (window.innerWidth >= 1536) return 5; // 2xl
-                  if (window.innerWidth >= 1280) return 4; // xl
-                  if (window.innerWidth >= 1024) return 3; // lg
-                  if (window.innerWidth >= 768) return 4;  // md
-                  if (window.innerWidth >= 640) return 3;  // sm
-                  return 2; // base
-                };
-
-                return (
-                  <CardItem
-                    key={card.id}
-                    card={card}
-                    viewMode={viewMode}
-                    isSelected={selectedCards.some(c => c.id === card.id)}
-                    onToggleSelect={handleToggleSelect}
-                    onAddToCollection={(card) => handleBulkAddToCollection([card])}
-                    onAddToDeck={handleBulkAddToDeck}
-                    onToggleFavorite={handleToggleFavorite}
-                    isFavorited={favoritedCards.has(card.id)}
-                    cardIndex={index}
-                    cardsPerRow={getCardsPerRow()}
-                  />
-                );
-              })}
+            <div className={viewMode === 'grid' ? 'card-grid-container grid grid-cols-2 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-4 xl:grid-cols-5 2xl:grid-cols-6 gap-3 sm:gap-4 lg:gap-6 p-3 sm:p-4 lg:p-6 xl:p-8' : 'space-y-4 p-6'}>
+              {cards.map((card) => (
+                <CardItem
+                  key={card.id}
+                  card={card}
+                  viewMode={viewMode}
+                  isSelected={selectedCards.some(c => c.id === card.id)}
+                  onToggleSelect={handleToggleSelect}
+                  onAddToCollection={(card) => handleBulkAddToCollection([card])}
+                  onAddToDeck={handleBulkAddToDeck}
+                  onToggleFavorite={handleToggleFavorite}
+                  isFavorited={favoritedCards.has(card.id)}
+                />
+              ))}
             </div>
             
             {/* Infinite Scroll Loading Indicator */}