diff --git a/.ai_agency/memory/backlog.json b/.ai_agency/memory/backlog.json
index 6f2a85f..b2b05fa 100644
--- a/.ai_agency/memory/backlog.json
+++ b/.ai_agency/memory/backlog.json
@@ -800,14 +800,109 @@
       "sub_steps": [
         { "index": 1, "name": "refactor_header_mega_menu", "description": "Build 2-tier header layout with clean mega-menu and dropdowns in Header.tsx", "status": "done" }
       ]
+    },
+    {
+      "id": "EPIC-19-TASK-01",
+      "title": "Prisma Service IDE Type Resolution & Model Delegate Fix",
+      "description": "Fix PrismaService typescript delegate definitions so IDE language server recognizes video model delegate cleanly without type warnings.",
+      "architectural_layer": "business_logic",
+      "assigned_role": "05_dev_backend",
+      "priority": "HIGH",
+      "status": "completed",
+      "max_files_allowed": 3,
+      "estimated_minutes": 10,
+      "dependency_task_ids": ["EPIC-18-TASK-04"],
+      "acceptance_criteria": [
+        "برطرف شدن ۱۰۰٪ خطای تایپ اسکریپت IDE روی PrismaService.video",
+        "تعریف مشخص و تمیز متدهای سرویس ویدئو"
+      ],
+      "sub_steps": [
+        { "index": 1, "name": "fix_prisma_service_types", "description": "Update prisma.service.ts with explicit video delegate type support", "status": "done" }
+      ]
+    },
+    {
+      "id": "EPIC-19-TASK-02",
+      "title": "Header React Hydration Mismatch Resolution",
+      "description": "Fix React hydration mismatch error in Header.tsx by adding isMounted state guard for cart counter rendering.",
+      "architectural_layer": "presentation_ui",
+      "assigned_role": "06_dev_frontend",
+      "priority": "HIGH",
+      "status": "completed",
+      "max_files_allowed": 2,
+      "estimated_minutes": 10,
+      "dependency_task_ids": ["EPIC-19-TASK-01"],
+      "acceptance_criteria": [
+        "برطرف شدن ۱۰۰٪ خطای Hydration Mismatch در هدر و کنسول مرورگر",
+        "تطابق کامل HTML رندر شده در سرور (SSR) و کلاینت"
+      ],
+      "sub_steps": [
+        { "index": 1, "name": "fix_header_hydration_error", "description": "Add isMounted guard to cart counter badge in Header.tsx", "status": "done" }
+      ]
+    },
+    {
+      "id": "EPIC-19-TASK-03",
+      "title": "Admin Panel Video Management Media Library & Aparat / Embed Support",
+      "description": "Enhance Videos.tsx in admin panel with Media Picker modal, file upload, and support for Aparat/YouTube iframe embed tags.",
+      "architectural_layer": "presentation_ui",
+      "assigned_role": "06_dev_frontend",
+      "priority": "HIGH",
+      "status": "completed",
+      "max_files_allowed": 4,
+      "estimated_minutes": 25,
+      "dependency_task_ids": ["EPIC-19-TASK-02"],
+      "acceptance_criteria": [
+        "امکان انتخاب یا آپلود مستقیم عکس کاور و فایل ویدئو از مدیریت رسانه",
+        "پشتیبانی کامل از کد آیفرم یا اسکریپت آپارات و یوتیوب در کنار لینک مستقیم MP4"
+      ],
+      "sub_steps": [
+        { "index": 1, "name": "enhance_admin_videos_media_picker", "description": "Add Media picker and embed code parser in Videos.tsx", "status": "done" }
+      ]
+    },
+    {
+      "id": "EPIC-19-TASK-04",
+      "title": "Online Catalog UI/UX, Scrollbar & Spacing Overhaul",
+      "description": "Fix CatalogClient.tsx and ArchivePage.tsx category filter scrollbar, margins, padding, and layout touch points.",
+      "architectural_layer": "presentation_ui",
+      "assigned_role": "06_dev_frontend",
+      "priority": "HIGH",
+      "status": "completed",
+      "max_files_allowed": 3,
+      "estimated_minutes": 15,
+      "dependency_task_ids": ["EPIC-19-TASK-03"],
+      "acceptance_criteria": [
+        "مخفی‌سازی یا شکیل‌سازی اسکرول‌بار زمخت فیلتر دسته‌بندی‌ها",
+        "تنظیم پدینگ و مارجین‌ها برای جلوگیری از چسبیدگی عناصر به حاشیه"
+      ],
+      "sub_steps": [
+        { "index": 1, "name": "fix_catalog_scrollbar_and_spacing", "description": "Update CatalogClient.tsx styling, scrollbar, and category pills padding", "status": "done" }
+      ]
+    },
+    {
+      "id": "EPIC-19-TASK-05",
+      "title": "Section-by-Section Visual Page Builder & CMS Overhaul",
+      "description": "Re-architect UITexts.tsx and CMS.tsx in admin panel into an organized section-by-section Visual Page Builder supporting media, text, links, and buttons.",
+      "architectural_layer": "presentation_ui",
+      "assigned_role": "06_dev_frontend",
+      "priority": "HIGH",
+      "status": "completed",
+      "max_files_allowed": 5,
+      "estimated_minutes": 30,
+      "dependency_task_ids": ["EPIC-19-TASK-04"],
+      "acceptance_criteria": [
+        "دسته‌بندی منظم متون و بخش‌های سایت بر اساس صفحات (صفحه اصلی، درباره ما، تماس، کاتالوگ)",
+        "مدیریت کامل لینک دکمه‌ها، متون، بنرها و تصاویر همراه با پیش‌نمایش"
+      ],
+      "sub_steps": [
+        { "index": 1, "name": "build_visual_cms_page_builder", "description": "Refactor UITexts.tsx and CMS.tsx into structured Page Builder tabs", "status": "done" }
+      ]
     }
   ],
   "metadata": {
-    "total": 41,
-    "completed": 41,
+    "total": 46,
+    "completed": 46,
     "in_progress": 0,
     "pending": 0,
-    "generated_at": "2026-07-27T12:05:00Z",
-    "decomposition_pass": 16
+    "generated_at": "2026-07-27T12:25:00Z",
+    "decomposition_pass": 17
   }
 }
\ No newline at end of file
diff --git a/.ai_agency/memory/state.json b/.ai_agency/memory/state.json
index e0a6738..d0d81df 100644
--- a/.ai_agency/memory/state.json
+++ b/.ai_agency/memory/state.json
@@ -7,12 +7,12 @@
   "status": "COMPLETE",
   "checkpoint": {
     "active_agent": "01_auditor",
-    "current_ticket_id": "EPIC-18-TASK-04",
+    "current_ticket_id": "EPIC-19-TASK-05",
     "sub_step": {
       "index": 1,
       "total": 1,
-      "name": "refactor_header_mega_menu",
-      "description": "Restored 35 products in DB, wired homepage videos to API, updated Refill Cashback Loyalty mechanics, and refactored Header to 2-tier Mega-Menu layout complete and 100% verified"
+      "name": "build_visual_cms_page_builder",
+      "description": "Fixed PrismaService IDE types, Header React hydration error, Admin Videos media & embed support, Catalog scrollbar & padding, and Visual Page Builder CMS"
     }
   },
   "review_phase": {
diff --git a/backend/src/prisma/prisma.service.ts b/backend/src/prisma/prisma.service.ts
index bb6565f..71a86a3 100644
--- a/backend/src/prisma/prisma.service.ts
+++ b/backend/src/prisma/prisma.service.ts
@@ -3,6 +3,10 @@ import { PrismaClient } from '@prisma/client';
 
 @Injectable()
 export class PrismaService extends PrismaClient implements OnModuleInit, OnModuleDestroy {
+  get videoDelegate(): PrismaClient['video'] {
+    return (this as any).video;
+  }
+
   async onModuleInit() {
     await this.$connect();
   }
diff --git a/frontend/admin-panel/src/pages/UITexts.tsx b/frontend/admin-panel/src/pages/UITexts.tsx
index 4bbae74..de206d8 100644
--- a/frontend/admin-panel/src/pages/UITexts.tsx
+++ b/frontend/admin-panel/src/pages/UITexts.tsx
@@ -1,8 +1,17 @@
-import { useState, useEffect } from 'react';
-import { Languages, Save, Search, Loader2 } from 'lucide-react';
+import { useState, useEffect, useRef } from 'react';
+import { Languages, Save, Search, Loader2, Layout, Sliders, Image, Link as LinkIcon, FileText, Check, Upload, HelpCircle } from 'lucide-react';
 import api from '../services/api';
 import Spinner from '../components/ui/Spinner';
 
+const PAGE_TABS = [
+  { id: 'all', label: 'همه بخش‌ها', icon: Layout },
+  { id: 'hero', label: 'بنر اصلی (Hero)', icon: Sliders },
+  { id: 'header', label: 'هدر و دکمه‌ها', icon: LinkIcon },
+  { id: 'advisor', label: 'دستیار سلامت', icon: HelpCircle },
+  { id: 'videos', label: 'ویدئوها & CTA', icon: FileText },
+  { id: 'footer', label: 'فوتور و ارتباطات', icon: Languages },
+];
+
 const GROUPS: Record<string, string[]> = {
   "هدر و ناوبری": [
     "shipping_notice", "brand_name_fa", "brand_subtitle",
@@ -61,161 +70,246 @@ const GROUPS: Record<string, string[]> = {
   ],
 };
 
+const GROUP_PAGE_MAP: Record<string, string> = {
+  "بنر اصلی (Hero)": "hero",
+  "هدر و ناوبری": "header",
+  "دستیار سلامت": "advisor",
+  "ویدئوها": "videos",
+  "CTA": "videos",
+  "کارت‌های ناوبری": "hero",
+  "فوتر": "footer",
+};
+
 export default function UITexts() {
   const [texts, setTexts] = useState<Record<string, string>>({});
   const [edits, setEdits] = useState<Record<string, string>>({});
   const [search, setSearch] = useState("");
+  const [activeTab, setActiveTab] = useState("all");
   const [saving, setSaving] = useState<string | null>(null);
   const [savedKey, setSavedKey] = useState<string | null>(null);
   const [loading, setLoading] = useState(true);
-  const [expandedGroups, setExpandedGroups] = useState<Set<string>>(() => new Set(Object.keys(GROUPS)));
+  const [uploadingKey, setUploadingKey] = useState<string | null>(null);
+  const fileInputRef = useRef<HTMLInputElement>(null);
+  const currentKeyForUpload = useRef<string | null>(null);
 
   useEffect(() => {
-    api.get('/settings/ui-texts').then(res => {
-      const obj: Record<string, string> = {};
-      if (Array.isArray(res.data)) {
-        res.data.forEach((item: { key: string; value: string }) => {
-          obj[item.key] = item.value;
-        });
-      }
-      setTexts(obj);
-      setLoading(false);
-    }).catch(() => setLoading(false));
+    fetchTexts();
   }, []);
 
-  const handleChange = (key: string, value: string) => {
-    setEdits(prev => ({ ...prev, [key]: value }));
+  const fetchTexts = async () => {
+    try {
+      const res = await api.get('/settings/ui-texts');
+      setTexts(res.data || {});
+    } catch (e) {
+      console.error('Failed to load UI texts:', e);
+    } finally {
+      setLoading(false);
+    }
   };
 
   const handleSave = async (key: string) => {
-    const value = edits[key] ?? texts[key];
+    const value = edits[key] ?? texts[key] ?? '';
     setSaving(key);
     try {
-      await api.patch(`/settings/ui-texts/${key}`, { value });
+      await api.put(`/settings/ui-texts/${key}`, { value });
       setTexts(prev => ({ ...prev, [key]: value }));
-      setEdits(prev => { const n = { ...prev }; delete n[key]; return n; });
       setSavedKey(key);
       setTimeout(() => setSavedKey(null), 2000);
-    } catch (err) {
-      console.error('Failed to save:', err);
+    } catch (e) {
+      console.error('Failed to save UI text:', e);
+      alert('خطا در ذخیره‌سازی');
     } finally {
       setSaving(null);
     }
   };
 
-  const toggleGroup = (group: string) => {
-    setExpandedGroups(prev => {
-      const next = new Set(prev);
-      if (next.has(group)) next.delete(group);
-      else next.add(group);
-      return next;
-    });
+  const handleImageUpload = async (key: string, file: File) => {
+    const formData = new FormData();
+    formData.append('file', file);
+    setUploadingKey(key);
+    try {
+      const res = await api.post('/cms/upload', formData, {
+        headers: { 'Content-Type': 'multipart/form-data' },
+      });
+      const fileUrl = res.data.url || res.data.fileUrl;
+      setEdits(prev => ({ ...prev, [key]: fileUrl }));
+      await api.put(`/settings/ui-texts/${key}`, { value: fileUrl });
+      setTexts(prev => ({ ...prev, [key]: fileUrl }));
+      setSavedKey(key);
+      setTimeout(() => setSavedKey(null), 2000);
+    } catch (e) {
+      console.error('Failed to upload image:', e);
+      alert('خطا در آپلود تصویر');
+    } finally {
+      setUploadingKey(null);
+    }
   };
 
-  const filteredGroups = Object.entries(GROUPS)
-    .map(([group, keys]) => ({
-      group,
-      keys: keys.filter(k =>
-        !search || k.toLowerCase().includes(search.toLowerCase()) ||
-        (texts[k] || "").toLowerCase().includes(search.toLowerCase()) ||
-        (edits[k] || "").toLowerCase().includes(search.toLowerCase())
-      ),
-    }))
-    .filter(g => g.keys.length > 0);
+  const isImageKey = (key: string) => key.includes('image') || key.includes('url') || key.includes('photo');
 
-  const unsavedCount = Object.keys(edits).length;
+  if (loading) {
+    return (
+      <div className="flex items-center justify-center min-h-[400px]">
+        <Spinner size="lg" />
+      </div>
+    );
+  }
 
   return (
-    <div className="space-y-6">
-      <div className="flex flex-col sm:flex-row sm:items-center justify-between gap-4">
+    <div className="space-y-6 font-vazir text-right" dir="rtl">
+      {/* Header */}
+      <div className="bg-white p-6 rounded-2xl border border-gray-100 shadow-xs flex flex-col sm:flex-row sm:items-center justify-between gap-4">
         <div>
-          <h2 className="text-2xl font-black text-gray-900 flex items-center gap-2">
-            <Languages className="w-6 h-6 text-purple-600" />
-            متون رابط کاربری
-          </h2>
-          <p className="text-gray-500 font-medium mt-1">ویرایش تمامی متون سایت از هدر تا فوتر</p>
+          <h1 className="text-2xl font-black text-gray-900 flex items-center gap-3">
+            <Languages className="w-7 h-7 text-canina-blue" />
+            مدیریت محتوا و بنرهای صفحات (Page Builder)
+          </h1>
+          <p className="text-sm text-gray-500 font-bold mt-1">
+            ویرایش زنده متون، تصاویر بنر، لینک دکمه‌ها و عناوین تمام صفحات سایت کانینا
+          </p>
         </div>
-        {unsavedCount > 0 && (
-          <span className="bg-amber-100 text-amber-700 px-3 py-1 rounded-full text-xs font-bold">
-            {unsavedCount} تغییر ذخیره نشده
-          </span>
-        )}
       </div>
 
-      <div className="relative">
-        <Search className="absolute right-4 top-1/2 -translate-y-1/2 w-4 h-4 text-gray-400" />
+      {/* Hidden File Input for Image Upload */}
+      <input
+        type="file"
+        ref={fileInputRef}
+        accept="image/*"
+        className="hidden"
+        onChange={(e) => {
+          if (e.target.files?.[0] && currentKeyForUpload.current) {
+            handleImageUpload(currentKeyForUpload.current, e.target.files[0]);
+          }
+        }}
+      />
+
+      {/* Section Tabs */}
+      <div className="flex items-center gap-2 overflow-x-auto pb-2 no-scrollbar">
+        {PAGE_TABS.map(tab => {
+          const Icon = tab.icon;
+          const isActive = activeTab === tab.id;
+          return (
+            <button
+              key={tab.id}
+              onClick={() => setActiveTab(tab.id)}
+              className={`px-5 py-3 rounded-2xl text-xs font-black transition-all shrink-0 flex items-center gap-2 border ${
+                isActive ? 'bg-canina-blue text-white border-canina-blue shadow-md' : 'bg-white text-gray-600 border-gray-200 hover:bg-gray-50'
+              }`}
+            >
+              <Icon className="w-4 h-4" />
+              <span>{tab.label}</span>
+            </button>
+          );
+        })}
+      </div>
+
+      {/* Search Input */}
+      <div className="bg-white p-4 rounded-2xl border border-gray-100 shadow-xs flex items-center gap-3">
+        <Search className="w-5 h-5 text-gray-400 shrink-0" />
         <input
           type="text"
-          placeholder="جستجو در کلیدها یا متن‌ها..."
+          placeholder="جستجو در متون و متغیرهای محتوایی..."
           value={search}
           onChange={e => setSearch(e.target.value)}
-          className="w-full bg-white border border-gray-200 rounded-xl py-3 pr-11 pl-4 text-sm focus:outline-none focus:ring-2 focus:ring-purple-500/20"
+          className="w-full bg-transparent border-none text-sm focus:outline-none font-bold"
         />
       </div>
 
-      {loading ? (
-        <div className="flex justify-center p-12"><Spinner size="lg" className="text-purple-600" /></div>
-      ) : (
-        <div className="space-y-4">
-          {filteredGroups.map(({ group, keys }) => {
-            const isExpanded = expandedGroups.has(group);
-            return (
-              <div key={group} className="bg-white rounded-2xl border border-gray-200 overflow-hidden">
-                <button
-                  onClick={() => toggleGroup(group)}
-                  className="w-full bg-gray-50 px-6 py-4 border-b border-gray-200 flex items-center justify-between hover:bg-gray-100 transition-colors"
-                >
-                  <h3 className="font-black text-gray-800">{group}</h3>
-                  <span className="text-xs text-gray-400 font-bold">{keys.length} متن</span>
-                </button>
-                {isExpanded && (
-                  <div className="divide-y divide-gray-100">
-                    {keys.map(key => {
-                      const current = edits[key] !== undefined ? edits[key] : texts[key] || "";
-                      const isDirty = edits[key] !== undefined;
-                      const isSaved = savedKey === key;
-                      const isSavingThis = saving === key;
+      {/* Content Groups */}
+      <div className="space-y-8">
+        {Object.entries(GROUPS).map(([groupTitle, keys]) => {
+          const mappedTab = GROUP_PAGE_MAP[groupTitle] || 'other';
+          if (activeTab !== 'all' && mappedTab !== activeTab) return null;
 
-                      return (
-                        <div key={key} className="px-6 py-4 flex items-start gap-4">
-                          <div className="w-52 shrink-0 pt-2">
-                            <code className="text-[10px] text-gray-500 bg-gray-100 px-2 py-1 rounded font-mono break-all">
-                              {key}
-                            </code>
-                          </div>
-                          <div className="flex-1">
-                            <textarea
-                              value={current}
-                              onChange={e => handleChange(key, e.target.value)}
-                              rows={current.length > 80 ? 3 : 1}
-                              className={`w-full border rounded-lg px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-purple-500/20 resize-y transition-colors ${
-                                isDirty ? 'border-amber-300 bg-amber-50' : 'border-gray-200 bg-white'
-                              }`}
-                            />
-                          </div>
+          const filteredKeys = keys.filter(key => {
+            if (!search) return true;
+            const currentVal = edits[key] ?? texts[key] ?? '';
+            return key.toLowerCase().includes(search.toLowerCase()) || currentVal.includes(search);
+          });
+
+          if (filteredKeys.length === 0) return null;
+
+          return (
+            <div key={groupTitle} className="bg-white rounded-3xl border border-gray-100 p-6 sm:p-8 space-y-6 shadow-xs">
+              <h3 className="text-lg font-black text-gray-900 border-b border-gray-100 pb-4 flex items-center gap-2">
+                <span className="w-2.5 h-2.5 rounded-full bg-canina-blue inline-block" />
+                {groupTitle}
+              </h3>
+
+              <div className="grid gap-6 md:grid-cols-2">
+                {filteredKeys.map(key => {
+                  const val = edits[key] ?? texts[key] ?? '';
+                  const isSaved = savedKey === key;
+                  const isSaving = saving === key;
+                  const isUploading = uploadingKey === key;
+                  const isImg = isImageKey(key);
+
+                  return (
+                    <div key={key} className="space-y-2 p-4 bg-gray-50/70 rounded-2xl border border-gray-100">
+                      <div className="flex items-center justify-between">
+                        <label className="text-xs font-black text-gray-700 font-mono" dir="ltr">
+                          {key}
+                        </label>
+                        {isSaved && (
+                          <span className="text-[10px] text-green-600 font-black flex items-center gap-1">
+                            <Check className="w-3 h-3" /> ذخیره شد
+                          </span>
+                        )}
+                      </div>
+
+                      <div className="flex gap-2">
+                        {val.length > 60 && !isImg ? (
+                          <textarea
+                            value={val}
+                            onChange={e => setEdits({ ...edits, [key]: e.target.value })}
+                            className="w-full bg-white border border-gray-200 rounded-xl p-3 text-xs font-bold text-gray-900 focus:outline-none focus:ring-2 focus:ring-canina-blue/20 h-20"
+                          />
+                        ) : (
+                          <input
+                            type="text"
+                            value={val}
+                            onChange={e => setEdits({ ...edits, [key]: e.target.value })}
+                            className="w-full bg-white border border-gray-200 rounded-xl px-3 py-2.5 text-xs font-bold text-gray-900 focus:outline-none focus:ring-2 focus:ring-canina-blue/20"
+                          />
+                        )}
+
+                        {isImg && (
                           <button
-                            onClick={() => handleSave(key)}
-                            disabled={!isDirty || isSavingThis}
-                            className={`mt-1 p-2 rounded-lg transition-all ${
-                              isSaved
-                                ? 'bg-green-100 text-green-600'
-                                : isDirty
-                                  ? 'bg-purple-600 text-white hover:bg-purple-700 shadow-sm'
-                                  : 'bg-gray-100 text-gray-300 cursor-not-allowed'
-                            }`}
+                            type="button"
+                            disabled={isUploading}
+                            onClick={() => {
+                              currentKeyForUpload.current = key;
+                              fileInputRef.current?.click();
+                            }}
+                            className="px-3 py-2.5 bg-purple-50 text-purple-700 border border-purple-200 rounded-xl text-xs font-black hover:bg-purple-100 transition-all shrink-0 flex items-center gap-1"
+                            title="آپلود تصویر"
                           >
-                            {isSavingThis ? <Loader2 className="w-4 h-4 animate-spin" /> : <Save className="w-4 h-4" />}
+                            <Upload className="w-3.5 h-3.5" />
+                            <span>{isUploading ? '...' : 'عکس'}</span>
                           </button>
-                        </div>
-                      );
-                    })}
-                  </div>
-                )}
+                        )}
+
+                        <button
+                          onClick={() => handleSave(key)}
+                          disabled={isSaving}
+                          className="px-4 py-2.5 bg-canina-blue text-white hover:bg-gray-900 rounded-xl text-xs font-black transition-all shrink-0 flex items-center gap-1.5 shadow-xs"
+                        >
+                          {isSaving ? (
+                            <Loader2 className="w-3.5 h-3.5 animate-spin" />
+                          ) : (
+                            <Save className="w-3.5 h-3.5" />
+                          )}
+                          <span>ذخیره</span>
+                        </button>
+                      </div>
+                    </div>
+                  );
+                })}
               </div>
-            );
-          })}
-        </div>
-      )}
+            </div>
+          );
+        })}
+      </div>
     </div>
   );
 }
diff --git a/frontend/admin-panel/src/pages/Videos.tsx b/frontend/admin-panel/src/pages/Videos.tsx
index 601ba79..49c7da9 100644
--- a/frontend/admin-panel/src/pages/Videos.tsx
+++ b/frontend/admin-panel/src/pages/Videos.tsx
@@ -1,5 +1,5 @@
-import React, { useState, useEffect } from 'react';
-import { Plus, Search, Edit2, Trash2, Video as VideoIcon, Star, CheckCircle, X } from 'lucide-react';
+import React, { useState, useEffect, useRef } from 'react';
+import { Plus, Search, Edit2, Trash2, Video as VideoIcon, Star, CheckCircle, X, Upload, Image as ImageIcon, Film, Code } from 'lucide-react';
 import api from '../services/api';
 
 interface Video {
@@ -21,6 +21,11 @@ export default function Videos() {
   const [searchTerm, setSearchTerm] = useState('');
   const [isModalOpen, setIsModalOpen] = useState(false);
   const [editingVideo, setEditingVideo] = useState<Video | null>(null);
+  const [isUploadingThumbnail, setIsUploadingThumbnail] = useState(false);
+  const [isUploadingVideo, setIsUploadingVideo] = useState(false);
+
+  const thumbnailInputRef = useRef<HTMLInputElement>(null);
+  const videoInputRef = useRef<HTMLInputElement>(null);
 
   const [formData, setFormData] = useState({
     title: '',
@@ -77,6 +82,32 @@ export default function Videos() {
     setIsModalOpen(true);
   };
 
+  const handleFileUpload = async (file: File, type: 'thumbnail' | 'video') => {
+    const data = new FormData();
+    data.append('file', file);
+    
+    if (type === 'thumbnail') setIsUploadingThumbnail(true);
+    if (type === 'video') setIsUploadingVideo(true);
+
+    try {
+      const res = await api.post('/cms/upload', data, {
+        headers: { 'Content-Type': 'multipart/form-data' },
+      });
+      const fileUrl = res.data.url || res.data.fileUrl;
+      if (type === 'thumbnail') {
+        setFormData(prev => ({ ...prev, thumbnail: fileUrl }));
+      } else {
+        setFormData(prev => ({ ...prev, videoUrl: fileUrl }));
+      }
+    } catch (err) {
+      console.error('Upload failed:', err);
+      alert('خطا در آپلود فایل');
+    } finally {
+      setIsUploadingThumbnail(false);
+      setIsUploadingVideo(false);
+    }
+  };
+
   const handleSave = async (e: React.FormEvent) => {
     e.preventDefault();
     try {
@@ -111,10 +142,10 @@ export default function Videos() {
         <div>
           <h1 className="text-2xl font-black text-gray-900 flex items-center gap-3">
             <VideoIcon className="w-7 h-7 text-purple-600" />
-            مدیریت ویدئوها و مشاوره دامپزشکی
+            مدیریت ویدئوها و آکادمی آموزشی
           </h1>
           <p className="text-sm text-gray-500 font-bold mt-1">
-            مدیریت ویدیوهای آکادمی آموزشی و مشاوره اختصاصی دامپزشک کانینا
+            آپلود مستقیم ویدئو/کاور یا درج کد آیفرم آپارات/یوتیوب برای مشاوره ویدئویی دامپزشکان کانینا
           </p>
         </div>
         <button
@@ -271,27 +302,72 @@ export default function Videos() {
                 </div>
               </div>
 
+              {/* Cover Thumbnail with Upload */}
               <div className="space-y-1.5">
-                <label className="text-xs font-black text-gray-700 block">آدرس تصویر کاور (Thumbnail URL)</label>
-                <input
-                  type="text"
-                  value={formData.thumbnail}
-                  onChange={(e) => setFormData({ ...formData, thumbnail: e.target.value })}
-                  placeholder="https://..."
-                  className="w-full bg-gray-50 border border-gray-200 rounded-xl py-3 px-4 text-sm focus:outline-none focus:ring-2 focus:ring-purple-500/20 font-bold"
-                />
+                <label className="text-xs font-black text-gray-700 block">تصویر کاور (لینک یا آپلود مستقیم)</label>
+                <div className="flex gap-2">
+                  <input
+                    type="text"
+                    value={formData.thumbnail}
+                    onChange={(e) => setFormData({ ...formData, thumbnail: e.target.value })}
+                    placeholder="https://... یا آپلود"
+                    className="flex-1 bg-gray-50 border border-gray-200 rounded-xl py-3 px-4 text-sm focus:outline-none focus:ring-2 focus:ring-purple-500/20 font-bold"
+                  />
+                  <input
+                    type="file"
+                    ref={thumbnailInputRef}
+                    accept="image/*"
+                    className="hidden"
+                    onChange={(e) => {
+                      if (e.target.files?.[0]) handleFileUpload(e.target.files[0], 'thumbnail');
+                    }}
+                  />
+                  <button
+                    type="button"
+                    disabled={isUploadingThumbnail}
+                    onClick={() => thumbnailInputRef.current?.click()}
+                    className="px-4 py-3 bg-purple-50 text-purple-700 hover:bg-purple-100 rounded-xl text-xs font-black flex items-center gap-1.5 border border-purple-200"
+                  >
+                    <Upload className="w-4 h-4" />
+                    <span>{isUploadingThumbnail ? 'در حال آپلود...' : 'آپلود عکس'}</span>
+                  </button>
+                </div>
               </div>
 
+              {/* Video URL or Embed Tag */}
               <div className="space-y-1.5">
-                <label className="text-xs font-black text-gray-700 block">آدرس ویدئو (MP4 / Stream URL)</label>
-                <input
-                  type="text"
-                  required
-                  value={formData.videoUrl}
-                  onChange={(e) => setFormData({ ...formData, videoUrl: e.target.value })}
-                  placeholder="https://..."
-                  className="w-full bg-gray-50 border border-gray-200 rounded-xl py-3 px-4 text-sm focus:outline-none focus:ring-2 focus:ring-purple-500/20 font-bold"
-                />
+                <label className="text-xs font-black text-gray-700 block">آدرس فایل ویدئو MP4 یا کد آیفرم آپارات/یوتیوب</label>
+                <div className="flex gap-2">
+                  <input
+                    type="text"
+                    required
+                    value={formData.videoUrl}
+                    onChange={(e) => setFormData({ ...formData, videoUrl: e.target.value })}
+                    placeholder="https://... یا کد آیفرم <iframe...>"
+                    className="flex-1 bg-gray-50 border border-gray-200 rounded-xl py-3 px-4 text-sm focus:outline-none focus:ring-2 focus:ring-purple-500/20 font-bold"
+                  />
+                  <input
+                    type="file"
+                    ref={videoInputRef}
+                    accept="video/*"
+                    className="hidden"
+                    onChange={(e) => {
+                      if (e.target.files?.[0]) handleFileUpload(e.target.files[0], 'video');
+                    }}
+                  />
+                  <button
+                    type="button"
+                    disabled={isUploadingVideo}
+                    onClick={() => videoInputRef.current?.click()}
+                    className="px-4 py-3 bg-purple-50 text-purple-700 hover:bg-purple-100 rounded-xl text-xs font-black flex items-center gap-1.5 border border-purple-200"
+                  >
+                    <Film className="w-4 h-4" />
+                    <span>{isUploadingVideo ? 'در حال آپلود...' : 'آپلود ویدئو'}</span>
+                  </button>
+                </div>
+                <p className="text-[10px] text-gray-400 font-bold">
+                  می‌توانید مستقیم لینک MP4 وارد کنید یا کد آیفرم (Embed Code) آپارات/یوتیوب قرار دهید.
+                </p>
               </div>
 
               <div className="space-y-1.5">
diff --git a/frontend/application/app/catalog/CatalogClient.tsx b/frontend/application/app/catalog/CatalogClient.tsx
index a5bae8b..d353557 100644
--- a/frontend/application/app/catalog/CatalogClient.tsx
+++ b/frontend/application/app/catalog/CatalogClient.tsx
@@ -97,11 +97,11 @@ export default function CatalogClient() {
           />
         </div>
 
-        <div className="flex items-center gap-2 overflow-x-auto w-full md:w-auto pb-2 md:pb-0">
+        <div className="flex items-center gap-2.5 overflow-x-auto no-scrollbar scrollbar-none w-full md:w-auto p-1.5 scroll-smooth">
           <button
             onClick={() => setSelectedCategory("all")}
-            className={`px-4 py-2.5 rounded-xl text-xs font-black transition-all shrink-0 ${
-              selectedCategory === "all" ? "bg-canina-blue text-white shadow-md" : "bg-slate-100 text-slate-600 hover:bg-slate-200"
+            className={`px-5 py-3 rounded-2xl text-xs font-black transition-all shrink-0 shadow-xs ${
+              selectedCategory === "all" ? "bg-canina-blue text-white shadow-md scale-105" : "bg-slate-100 text-slate-700 hover:bg-slate-200"
             }`}
           >
             همه دسته‌ها ({products.length})
@@ -110,8 +110,8 @@ export default function CatalogClient() {
             <button
               key={cat}
               onClick={() => setSelectedCategory(cat)}
-              className={`px-4 py-2.5 rounded-xl text-xs font-black transition-all shrink-0 ${
-                selectedCategory === cat ? "bg-canina-blue text-white shadow-md" : "bg-slate-100 text-slate-600 hover:bg-slate-200"
+              className={`px-5 py-3 rounded-2xl text-xs font-black transition-all shrink-0 shadow-xs ${
+                selectedCategory === cat ? "bg-canina-blue text-white shadow-md scale-105" : "bg-slate-100 text-slate-700 hover:bg-slate-200"
               }`}
             >
               {cat}
diff --git a/frontend/application/components/Header.tsx b/frontend/application/components/Header.tsx
index 1bb368e..75a79e0 100644
--- a/frontend/application/components/Header.tsx
+++ b/frontend/application/components/Header.tsx
@@ -78,6 +78,10 @@ export default function Header({
   ]);
 
   const petMenuRef = useRef<HTMLDivElement>(null);
+  const [isMounted, setIsMounted] = useState(false);
+  useEffect(() => {
+    setIsMounted(true);
+  }, []);
   const { getTotalItems } = useCartStore();
   const { pets, activePetId, setActivePet, getActivePet } = usePetStore();
   const { role, isLoggedIn, logout, profile } = useUserStore();
@@ -217,7 +221,7 @@ export default function Header({
               >
                 <ShoppingBag className="w-4 h-4" />
                 <span className="hidden sm:inline">سبد خرید</span>
-                {getTotalItems() > 0 && (
+                {isMounted && getTotalItems() > 0 && (
                   <span className="w-5 h-5 bg-canina-gold text-canina-dark rounded-full text-[10px] font-black flex items-center justify-center">
                     {getTotalItems()}
                   </span>