diff --git a/.gitignore b/.gitignore
index 02c1146..34688ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,6 +51,7 @@ Thumbs.db
 # Python virtual environments
 venv/
 venv_new/
+venv_local/
 env/
 ENV/
 .venv/
@@ -76,3 +77,19 @@ Files/
 .vscode/
 .claude/
 
+# Database files
+*.db
+*.sqlite
+*.sqlite3
+
+# Server files
+server.pid
+server.log
+nohup.out
+
+# Test files
+test_*.csv
+test_*.xlsx
+test_*.json
+TEST_REPORT.md
+
diff --git a/README.md b/README.md
index 679d9ff..a7c983e 100644
--- a/README.md
+++ b/README.md
@@ -1,97 +1,486 @@
-# Oliver Metadata Tool
+# Oliver Metadata Tool v3.1 Enterprise Edition
 
-Universal metadata creation and management tool for all file types. Create, import, and manage metadata from multiple sources with an intuitive web interface.
+Universal metadata creation and management tool for all file types. Create, import, and manage metadata from multiple sources with an intuitive web interface, user authentication, and AI-powered metadata generation.
+
+**Developer:** Vadym Samoilenko
+**License:** Corporate License - Oliver Marketing
+**Version:** 3.1 (Enterprise Edition)
+
+---
 
 ## Features
 
-- **Excel-based metadata lookup**: Reads metadata from "Celum ID to Adobe Asset Path Mapping Spreadsheet"
-- **Multi-format support**: PDF, images (JPG, PNG, etc.), Office documents (Word, Excel, PowerPoint), video files
-- **Unicode support**: Full support for Chinese, Japanese, Korean characters (CGA region)
-- **OCR capabilities**: Multi-language text extraction with Tesseract
-- **Web interface**: Flask-based UI for easy batch processing
-- **Dual-sheet Excel lookup**: Primary lookup from DSB sheet, fallback to Medsurg sheet
+### Multiple Metadata Sources
+- **📊 Excel Lookup**: Configure custom Excel files with column mapping
+- **🤖 AI Generation**: OpenAI-powered intelligent metadata generation
+- **✏️ Manual Entry**: Direct editing with real-time validation
+- **📂 File Import**: Import from CSV, Excel, or JSON with custom mapping
+- **📋 Templates**: Reusable metadata templates with variables
+
+### Enterprise Features
+- **🔐 Authentication**: Local user authentication + Microsoft SSO support
+- **👥 User Management**: SQLite database for users and sessions
+- **📊 Audit Logging**: Track all user actions and metadata changes
+- **🔍 AI Usage Tracking**: Monitor OpenAI token usage and costs
+
+### File Support
+- **300+ File Formats** via ExifTool integration
+- **PDF Files**: Full metadata support (title, subject, keywords, author, copyright)
+- **Images**: JPEG, PNG, GIF, HEIC, TIFF, RAW formats
+- **Office Documents**: Word, Excel, PowerPoint
+- **Video Files**: MP4, MOV, AVI, MKV
+- **Unicode Support**: Full support for Chinese, Japanese, Korean characters
+
+### Advanced Capabilities
+- **Smart Field Mapping**: Auto-detect columns with fuzzy matching
+- **Batch Processing**: Process multiple files with selective updates
+- **Custom Metadata Fields**: Add unlimited custom fields
+- **CSV Export**: Export metadata and processing results
+- **Template Variables**: {filename}, {date}, {user}, custom variables
+
+---
 
 ## Requirements
 
-- Python 3.8+
-- Tesseract OCR (for image text extraction)
-- Poppler (for PDF processing)
-- **ExifTool 12.15+** (recommended - enables 300+ file formats and improved performance)
+### System Dependencies
+- **Python 3.8+**
+- **ExifTool 12.15+** (required for 300+ format support)
+- **Tesseract OCR** (optional - for image text extraction)
+- **Poppler** (optional - for PDF content extraction)
+
+### Python Dependencies
+All listed in `requirements.txt`:
+- Flask 2.3.0+ (Web framework)
+- pandas, openpyxl (Excel/CSV processing)
+- PyExifTool 0.5.6+ (Metadata operations)
+- openai 1.0.0+ (AI generation)
+- tiktoken 0.5.0+ (Token counting)
+- tenacity 8.2.0+ (Retry logic)
+- msal (Microsoft SSO - optional)
+
+---
 
 ## Installation
 
-1. Install system dependencies:
-```bash
-# macOS
-brew install tesseract tesseract-lang poppler exiftool
+### 1. Install System Dependencies
 
-# Linux (Ubuntu/Debian)
-sudo apt-get install tesseract-ocr tesseract-ocr-chi-sim tesseract-ocr-chi-tra tesseract-ocr-jpn tesseract-ocr-kor poppler-utils libimage-exiftool-perl
+**macOS:**
+```bash
+brew install exiftool tesseract tesseract-lang poppler
 ```
 
-**Note:** ExifTool is optional but highly recommended. It provides:
-- Support for 300+ file formats
-- 10-60x faster batch operations
-- Better PDF metadata writing
-- See [docs/EXIFTOOL_SETUP.md](docs/EXIFTOOL_SETUP.md) for detailed setup instructions
-
-2. Create virtual environment and install Python packages:
+**Linux (Ubuntu/Debian):**
+```bash
+sudo apt-get install libimage-exiftool-perl tesseract-ocr tesseract-ocr-chi-sim tesseract-ocr-chi-tra tesseract-ocr-jpn tesseract-ocr-kor poppler-utils
+```
+
+**Windows:**
+```bash
+# Install ExifTool from: https://exiftool.org/
+choco install exiftool tesseract
+```
+
+**Verify ExifTool Installation:**
+```bash
+exiftool -ver
+# Should show version 12.15 or higher
+```
+
+See [docs/EXIFTOOL_SETUP.md](docs/EXIFTOOL_SETUP.md) for detailed setup instructions.
+
+### 2. Create Virtual Environment
+
+```bash
+python3 -m venv venv_local
+source venv_local/bin/activate  # On Windows: venv_local\Scripts\activate
+```
+
+### 3. Install Python Dependencies
+
 ```bash
-python3 -m venv venv
-source venv/bin/activate  # On Windows: venv\Scripts\activate
 pip install -r requirements.txt
 ```
 
-3. Set up environment variables (create `.env` file):
+### 4. Configure Environment Variables
+
+Create a `.env` file in the project root:
+
+```env
+# Required: OpenAI API Key (for AI metadata generation)
+OPENAI_API_KEY=your-openai-api-key-here
+
+# Optional: Microsoft SSO (for enterprise authentication)
+# AZURE_CLIENT_ID=your-azure-client-id
+# AZURE_CLIENT_SECRET=your-azure-client-secret
+# AZURE_TENANT_ID=your-azure-tenant-id
+# REDIRECT_URI=http://localhost:5001/auth/callback
+
+# Optional: Flask secret key (auto-generated if not set)
+# SECRET_KEY=your-secret-key-here
+
+# Optional: AI settings (defaults shown)
+# AI_MODEL=gpt-4o-mini
+# MAX_TOKENS=500
+# TEMPERATURE=0.5
+# API_TIMEOUT=30
+# API_MAX_RETRIES=3
 ```
-UPLOAD_FOLDER=uploads
-OUTPUT_FOLDER=output
-TESSERACT_PATH=/opt/homebrew/bin/tesseract
-OCR_LANGUAGES=eng+chi_sim+chi_tra+jpn+kor
+
+### 5. Initialize Database
+
+The database will be created automatically on first run. To manually initialize:
+
+```bash
+python -c "from src.database import Database; db = Database(); print('Database initialized')"
 ```
 
+---
+
 ## Usage
 
-### Web Interface
+### Starting the Web Application
 
 ```bash
 python web_app.py
 ```
 
-Open browser at `http://localhost:5001`
+The application will:
+1. ✅ Check for ExifTool availability
+2. ✅ Initialize SQLite database (users, sessions, audit_log)
+3. ✅ Start Flask server on http://localhost:5001
+4. 🌐 Open browser automatically
 
-### GUI Application
+### Login
 
-```bash
-python run_gui.py
+**Test Account:**
+- Username: `tester`
+- Password: `oliveradmin`
+
+**Microsoft SSO** (if configured):
+- Click "Sign in with Microsoft" button
+- Authenticate via Azure AD
+- Users auto-created on first login
+
+### Using Metadata Sources
+
+#### 1. Excel Lookup
+1. Click "Upload Excel File"
+2. Configure mapping modal:
+   - Select sheet name
+   - Map columns: Filename (required), Title, Description, Keywords
+   - Preview first 3 rows
+3. Confirm mapping
+4. Upload files to process
+
+#### 2. AI Generation
+1. Select "AI Generation" from metadata source dropdown
+2. Upload files
+3. AI generates metadata (10-30 seconds per file)
+4. Review and edit generated metadata
+5. Save changes
+
+#### 3. Manual Entry
+1. Select "Manual Entry"
+2. Upload files
+3. Fill in metadata fields manually
+4. Save changes
+
+#### 4. Import from File
+1. Click "Import from File"
+2. Upload CSV/Excel/JSON file
+3. Configure column mapping (same as Excel)
+4. Upload files to match metadata
+
+#### 5. Templates
+1. Create template with variables
+2. Select template from dropdown
+3. Apply to selected files
+4. Review and save
+
+### Batch Operations
+
+1. Upload multiple files
+2. Use checkboxes to select files
+3. "Select All" / "Deselect All" buttons
+4. Edit metadata individually
+5. Click "Update Selected Files" to save all at once
+6. Export results to CSV
+
+---
+
+## Configuration
+
+### Database Schema
+
+**Users Table:**
+- id, username, password_hash, email, full_name
+- auth_method (local/sso)
+- created_at, last_login, is_active
+
+**Sessions Table:**
+- session_id, user_id, created_at, expires_at
+- ip_address, user_agent
+
+**Audit Log Table:**
+- id, user_id, action, details, timestamp
+
+### AI Usage Tracking
+
+Every AI metadata generation is logged with:
+- User ID
+- Timestamp
+- Tokens used (prompt + completion)
+- Cost estimate (based on gpt-4o-mini pricing)
+
+View logs in database:
+```sql
+SELECT * FROM audit_log WHERE action = 'ai_generation' ORDER BY timestamp DESC;
 ```
 
-## Excel Data Structure
+### User Management
 
-The tool reads metadata from Excel file with two sheets:
+**Create New User:**
+```python
+from src.database import Database
+db = Database()
+db.create_user(
+    username='newuser',
+    password='password123',
+    email='user@example.com',
+    full_name='New User',
+    auth_method='local'
+)
+```
 
-### Sheet 1: DSB Celum ID to Path mapping (Primary)
-- Column B: Celum ID
-- Column E: Title
-- Column F: External Description/Alt Text
+**List All Users:**
+```python
+users = db.get_all_users()
+for user in users:
+    print(f"{user['username']} - Last login: {user['last_login']}")
+```
 
-### Sheet 2: Medsurg Metadata Cheat (Fallback)
-- Column: Solventum DAM Asset Path (contains filename)
-- Metadata columns for Title and Description
-
-Lookup is performed by filename (without extension), case-insensitive.
+---
 
 ## Architecture
 
-- `web_app.py` - Flask web application
-- `run_gui.py` - GUI launcher
-- `src/` - Core modules
-  - `extractors/` - Content extraction for different file types
-  - `updaters/` - Metadata update for different file types
-  - `excel_metadata_lookup.py` - Excel-based metadata lookup
-  - `main.py` - Core processing logic
-  - `config.py` - Configuration management
+### File Structure
 
-## License
+```
+oliver-metadata-tool/
+├── web_app.py              # Flask web application (main entry point)
+├── requirements.txt        # Python dependencies
+├── .env                    # Environment configuration
+├── oliver_metadata.db      # SQLite database (auto-created)
+├── src/
+│   ├── config.py           # Configuration management
+│   ├── database.py         # Database operations
+│   ├── auth.py             # Authentication logic
+│   ├── metadata_analyzer.py    # AI metadata generation
+│   ├── metadata_importer.py    # Import from files
+│   ├── template_manager.py     # Template system
+│   ├── field_mapper.py         # Column mapping
+│   ├── excel_metadata_lookup.py # Excel lookup
+│   ├── extractors/
+│   │   ├── pdf_extractor.py
+│   │   ├── image_extractor.py
+│   │   ├── office_extractor.py
+│   │   ├── video_extractor.py
+│   │   └── exiftool_extractor.py
+│   └── updaters/
+│       ├── pdf_updater.py
+│       ├── image_updater.py
+│       ├── office_updater.py
+│       ├── video_updater.py
+│       └── exiftool_updater.py
+├── templates/
+│   ├── index.html          # Main UI
+│   └── login.html          # Login page
+└── docs/
+    └── EXIFTOOL_SETUP.md   # ExifTool setup guide
+```
 
-Proprietary - Solventum
+### Technology Stack
+
+- **Backend:** Flask (Python)
+- **Database:** SQLite
+- **Frontend:** HTML5, CSS3, JavaScript (Vanilla)
+- **Design:** Montserrat font, Dark & Gold theme
+- **Authentication:** Flask-Session, werkzeug.security, MSAL
+- **AI:** OpenAI API (gpt-4o-mini)
+- **Metadata:** PyExifTool, pypdf, python-docx, openpyxl
+
+---
+
+## API Endpoints
+
+### Authentication
+- `GET /login` - Login page
+- `POST /login` - Authenticate user
+- `GET /logout` - Destroy session
+- `GET /login/microsoft` - Microsoft SSO redirect
+- `GET /auth/callback` - SSO callback
+
+### File Operations
+- `POST /upload` - Upload files and generate metadata
+- `POST /update-manual` - Update file metadata manually
+- `GET /download/<filename>` - Download processed file
+
+### Metadata Sources
+- `POST /upload-excel` - Upload Excel file for mapping
+- `POST /preview-excel-sheet` - Preview Excel sheet structure
+- `POST /configure-excel-mapping` - Configure Excel column mapping
+- `POST /import-metadata` - Upload import file for mapping
+- `POST /configure-import-mapping` - Configure import column mapping
+
+### Templates
+- `GET /templates/list` - List all templates
+- `POST /templates/save` - Save new template
+- `POST /templates/load` - Load template by name
+- `DELETE /templates/delete` - Delete template
+- `POST /templates/apply` - Apply template to files
+- `POST /templates/preview` - Preview template output
+
+---
+
+## Security & Privacy
+
+### Authentication
+- Passwords hashed with werkzeug.security (pbkdf2:sha256)
+- Session tokens: 32-byte cryptographically secure random strings
+- Sessions expire after 24 hours
+- Microsoft SSO via OAuth2 + Azure AD
+
+### Data Protection
+- All credentials stored in `.env` (excluded from git)
+- Database file excluded from git
+- API keys never logged or exposed to frontend
+- Audit trail for all user actions
+
+### Production Recommendations
+1. **HTTPS:** Use SSL/TLS certificates in production
+2. **Database:** Migrate to PostgreSQL for better concurrency
+3. **Rate Limiting:** Add rate limits to prevent abuse
+4. **CSRF Protection:** Enable Flask-WTF for form security
+5. **Error Tracking:** Integrate Sentry or similar service
+6. **Backups:** Regular database backups
+7. **Monitoring:** Track AI token usage for cost management
+
+---
+
+## Troubleshooting
+
+### Common Issues
+
+**ExifTool not found:**
+```bash
+# Verify installation
+exiftool -ver
+
+# macOS: Reinstall with Homebrew
+brew reinstall exiftool
+
+# Linux: Reinstall with apt
+sudo apt-get install --reinstall libimage-exiftool-perl
+```
+
+**Database locked error:**
+```bash
+# Stop all instances
+lsof -ti:5001 | xargs kill -9
+
+# Restart application
+python web_app.py
+```
+
+**OpenAI API errors:**
+- Check API key in `.env` file
+- Verify API key is valid at https://platform.openai.com/api-keys
+- Check token usage limits on OpenAI dashboard
+
+**Import failed - column not found:**
+- Use the mapping modal to manually select columns
+- Check that your file has headers in the first row
+- Verify file encoding is UTF-8
+
+---
+
+## Development
+
+### Running Tests
+
+```bash
+# Unit tests (if implemented)
+pytest tests/
+
+# Manual integration test
+python -c "from src.database import Database; from src.config import Config; print('✅ All imports successful')"
+```
+
+### Git Workflow
+
+```bash
+# Check status
+git status
+
+# Add changes
+git add .
+
+# Commit with message
+git commit -m "Your commit message"
+
+# Push to remote
+git push origin main
+```
+
+---
+
+## License & Credits
+
+**License:** Corporate License - Oliver Marketing
+All rights reserved. Unauthorized copying, distribution, or modification is prohibited.
+
+**Developer:** Vadym Samoilenko
+**Company:** Oliver Marketing
+**Version:** 3.1 Enterprise Edition
+**Release Date:** January 2026
+
+**Third-Party Software:**
+- ExifTool by Phil Harvey (Perl Artistic License)
+- Flask by Pallets (BSD License)
+- OpenAI API (Commercial License)
+- PyExifTool (LGPL License)
+
+---
+
+## Support
+
+For issues, questions, or feature requests:
+- **Internal Support:** Contact IT department
+- **Developer:** Vadym Samoilenko
+- **Documentation:** See `docs/` folder
+
+---
+
+## Changelog
+
+### v3.1 (January 2026) - Enterprise Edition
+- ✅ User authentication (local + Microsoft SSO)
+- ✅ SQLite database with audit logging
+- ✅ Smart column mapping for Excel/CSV import
+- ✅ Custom metadata fields support
+- ✅ AI usage tracking and cost monitoring
+- ✅ Dark & Gold UI redesign
+- ✅ Template variables and preview
+- ✅ Batch selection and CSV export
+
+### v3.0 (January 2026)
+- ✅ ExifTool integration (300+ formats)
+- ✅ Multiple metadata sources (Excel, AI, Manual, Import)
+- ✅ Field mapping with fuzzy matching
+- ✅ Metadata templates system
+- ✅ Rebranded to Oliver Metadata Tool
+
+### v2.x (Prior)
+- Basic Excel lookup functionality
+- Multi-format file support
+- Web and GUI interfaces
diff --git a/templates/index.html b/templates/index.html
index 22f2cd8..ef31f23 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -4,51 +4,174 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Oliver Metadata Tool</title>
+    <link href="https://fonts.googleapis.com/css2?family=Montserrat:wght@300;400;500;600;700&display=swap" rel="stylesheet">
     <style>
+        /* ========== CSS VARIABLES ========== */
+        :root {
+            /* Main colors */
+            --primary-gold: #FFC407;
+            --primary-gold-dark: #e6b007;
+            --primary-gold-light: #ffcf33;
+
+            /* Dark colors */
+            --dark-primary: #2c2c2c;
+            --dark-secondary: #1a1a1a;
+
+            /* Light colors */
+            --white: #ffffff;
+            --light-bg: #fafafa;
+            --light-bg-gradient: #f8fafc;
+
+            /* Text colors */
+            --text-primary: #1f2937;
+            --text-secondary: #374151;
+            --text-muted: #6b7280;
+
+            /* Status colors */
+            --success-green: #4ade80;
+            --error-red: #ef4444;
+
+            /* Opacity */
+            --overlay-light: rgba(255, 255, 255, 0.95);
+            --overlay-dark: rgba(0, 0, 0, 0.5);
+            --border-light: rgba(255, 255, 255, 0.2);
+            --border-subtle: rgba(0, 0, 0, 0.05);
+
+            /* Shadows */
+            --shadow-sm: 0 2px 8px rgba(0, 0, 0, 0.1);
+            --shadow-md: 0 10px 25px rgba(0, 0, 0, 0.15);
+            --shadow-lg: 0 20px 40px rgba(0, 0, 0, 0.1);
+
+            /* Radius */
+            --radius-sm: 4px;
+            --radius-md: 12px;
+            --radius-lg: 18px;
+            --radius-xl: 20px;
+
+            /* Spacing */
+            --spacing-xs: 4px;
+            --spacing-sm: 8px;
+            --spacing-md: 12px;
+            --spacing-lg: 16px;
+            --spacing-xl: 20px;
+            --spacing-2xl: 25px;
+
+            /* Fonts */
+            --font-family: 'Montserrat', -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+
+            /* Transitions */
+            --transition-fast: 0.15s ease;
+            --transition-normal: 0.3s ease;
+            --transition-slow: 0.5s ease;
+        }
+
         * { margin: 0; padding: 0; box-sizing: border-box; }
+
         body {
-            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
-            background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+            font-family: var(--font-family);
+            background: linear-gradient(135deg, var(--dark-primary) 0%, var(--dark-secondary) 100%);
             min-height: 100vh;
             padding: 20px;
         }
         .container {
             max-width: 1200px;
             margin: 0 auto;
-            background: white;
-            border-radius: 20px;
-            box-shadow: 0 20px 60px rgba(0,0,0,0.3);
+            background: var(--overlay-light);
+            backdrop-filter: blur(20px);
+            border-radius: var(--radius-xl);
+            box-shadow: var(--shadow-lg);
             overflow: hidden;
+            border: 1px solid var(--border-light);
         }
         .header {
-            background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-            color: white;
+            background: linear-gradient(135deg, var(--primary-gold) 0%, var(--primary-gold-dark) 100%);
+            color: var(--dark-secondary);
             padding: 30px;
             text-align: center;
+            position: relative;
+        }
+        .header::before {
+            content: '';
+            position: absolute;
+            top: 0;
+            left: 0;
+            right: 0;
+            bottom: 0;
+            background: linear-gradient(45deg, transparent 30%, rgba(255,255,255,0.1) 50%, transparent 70%);
+            animation: shimmer 3s infinite;
+            pointer-events: none;
+        }
+        .header h1 {
+            font-size: 28px;
+            margin-bottom: 10px;
+            font-weight: 600;
+            position: relative;
+            z-index: 1;
+        }
+        .header p {
+            opacity: 0.9;
+            font-size: 14px;
+            position: relative;
+            z-index: 1;
+        }
+        @keyframes shimmer {
+            0% { transform: translateX(-100%); }
+            100% { transform: translateX(100%); }
+        }
+        .content {
+            padding: 40px;
+            background: linear-gradient(180deg, var(--light-bg) 0%, var(--light-bg-gradient) 100%);
+        }
+
+        @keyframes slideIn {
+            from {
+                opacity: 0;
+                transform: translateY(20px);
+            }
+            to {
+                opacity: 1;
+                transform: translateY(0);
+            }
+        }
+
+        @keyframes fadeIn {
+            from { opacity: 0; }
+            to { opacity: 1; }
+        }
+
+        @keyframes pulse {
+            0%, 100% { transform: scale(1); }
+            50% { transform: scale(1.05); }
         }
-        .header h1 { font-size: 28px; margin-bottom: 10px; }
-        .header p { opacity: 0.9; font-size: 14px; }
-        .content { padding: 40px; }
 
         .upload-section {
-            background: #f8f9ff;
-            border-radius: 10px;
+            background: var(--white);
+            border-radius: var(--radius-md);
             padding: 20px;
             margin-bottom: 30px;
+            box-shadow: var(--shadow-sm);
         }
 
         .upload-area {
-            border: 3px dashed #667eea;
-            border-radius: 10px;
+            border: 3px dashed var(--primary-gold);
+            border-radius: var(--radius-md);
             padding: 60px 20px;
             text-align: center;
             cursor: pointer;
-            transition: all 0.3s;
-            background: white;
+            transition: all var(--transition-normal);
+            background: var(--light-bg);
             margin-bottom: 20px;
         }
-        .upload-area:hover { background: #f0f2ff; border-color: #764ba2; }
-        .upload-area.dragover { background: #e8ebff; transform: scale(1.02); }
+        .upload-area:hover {
+            background: #fffbf0;
+            border-color: var(--primary-gold-dark);
+            transform: translateY(-2px);
+        }
+        .upload-area.dragover {
+            background: #fff9e6;
+            transform: scale(1.02);
+            border-color: var(--primary-gold-dark);
+        }
 
         #fileInput { display: none; }
         .upload-icon { font-size: 48px; margin-bottom: 15px; }
@@ -73,8 +196,15 @@
             flex: 1;
             padding: 10px;
             border: 2px solid #dee2e6;
-            border-radius: 5px;
+            border-radius: var(--radius-sm);
             font-size: 14px;
+            font-family: var(--font-family);
+            transition: border-color var(--transition-fast);
+        }
+
+        #outputDir:focus {
+            outline: none;
+            border-color: var(--primary-gold);
         }
 
         .output-dir-hint {
@@ -84,19 +214,30 @@
         }
 
         .btn {
-            background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-            color: white;
+            background: linear-gradient(135deg, var(--primary-gold), var(--primary-gold-dark));
+            color: var(--dark-secondary);
             border: none;
             padding: 12px 30px;
-            border-radius: 25px;
+            border-radius: var(--radius-md);
             cursor: pointer;
             font-size: 16px;
             font-weight: 600;
-            transition: transform 0.2s;
+            font-family: var(--font-family);
+            transition: all var(--transition-fast);
             margin: 5px;
         }
-        .btn:hover { transform: translateY(-2px); }
-        .btn:disabled { opacity: 0.5; cursor: not-allowed; transform: none; }
+        .btn:hover:not(:disabled) {
+            transform: translateY(-2px);
+            box-shadow: 0 4px 12px rgba(255, 196, 7, 0.4);
+        }
+        .btn:active:not(:disabled) {
+            transform: translateY(0);
+        }
+        .btn:disabled {
+            opacity: 0.5;
+            cursor: not-allowed;
+            transform: none;
+        }
 
         .btn-small {
             padding: 8px 20px;
@@ -115,12 +256,12 @@
 
         .progress-fill {
             height: 100%;
-            background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-            transition: width 0.3s;
+            background: linear-gradient(135deg, var(--primary-gold), var(--primary-gold-dark));
+            transition: width var(--transition-normal);
             display: flex;
             align-items: center;
             justify-content: center;
-            color: white;
+            color: var(--dark-secondary);
             font-weight: 600;
             font-size: 14px;
         }
@@ -131,14 +272,15 @@
         }
 
         .batch-toolbar {
-            background: #f8f9ff;
-            border-radius: 10px;
+            background: var(--white);
+            border-radius: var(--radius-md);
             padding: 15px;
             margin-bottom: 20px;
             display: flex;
             justify-content: space-between;
             align-items: center;
             gap: 15px;
+            box-shadow: var(--shadow-sm);
         }
 
         .batch-toolbar-left {
@@ -184,16 +326,23 @@
         }
 
         .file-item {
-            background: #f8f9fa;
-            border-radius: 10px;
+            background: var(--white);
+            border-radius: var(--radius-md);
             padding: 20px;
             margin-bottom: 20px;
-            border-left: 4px solid #667eea;
+            border-left: 4px solid var(--primary-gold);
+            box-shadow: var(--shadow-sm);
+            transition: all var(--transition-fast);
+        }
+
+        .file-item:hover {
+            box-shadow: var(--shadow-md);
+            transform: translateX(2px);
         }
 
         .file-item.selected {
-            background: #e8f4f8;
-            border-left-color: #28a745;
+            background: #fffbf0;
+            border-left-color: var(--success-green);
         }
 
         .file-header {
@@ -222,11 +371,12 @@
         }
 
         .file-type {
-            background: #667eea;
-            color: white;
+            background: linear-gradient(135deg, var(--primary-gold), var(--primary-gold-dark));
+            color: var(--dark-secondary);
             padding: 4px 12px;
             border-radius: 12px;
             font-size: 12px;
+            font-weight: 600;
         }
 
         .metadata-comparison {
@@ -236,15 +386,17 @@
         }
 
         .metadata-box {
-            background: white;
-            border-radius: 8px;
+            background: var(--light-bg);
+            border-radius: var(--radius-sm);
             padding: 15px;
+            border: 1px solid var(--border-subtle);
         }
 
         .metadata-box h4 {
-            color: #667eea;
+            color: var(--primary-gold-dark);
             margin-bottom: 10px;
             font-size: 14px;
+            font-weight: 600;
         }
 
         .metadata-item {
@@ -275,7 +427,7 @@
 
         .spinner {
             border: 3px solid #f3f3f3;
-            border-top: 3px solid #667eea;
+            border-top: 3px solid var(--primary-gold);
             border-radius: 50%;
             width: 40px;
             height: 40px;
@@ -317,11 +469,17 @@
         .source-select {
             flex: 1;
             padding: 10px;
-            border: 2px solid #667eea;
-            border-radius: 5px;
+            border: 2px solid var(--primary-gold);
+            border-radius: var(--radius-sm);
             font-size: 14px;
+            font-family: var(--font-family);
             cursor: pointer;
-            background: white;
+            background: var(--white);
+            transition: border-color var(--transition-fast);
+        }
+        .source-select:focus {
+            outline: none;
+            border-color: var(--primary-gold-dark);
         }
 
         .source-info {
@@ -343,7 +501,8 @@
 
         .editable-field:focus {
             outline: none;
-            border-color: #667eea;
+            border-color: var(--primary-gold);
+            box-shadow: 0 0 0 3px rgba(255, 196, 7, 0.1);
         }
 
         .editable-field.invalid {
@@ -438,7 +597,7 @@
         }
 
         .import-section.active {
-            border-color: #28a745;
+            border-color: var(--success-green);
             background: #f0fff4;
         }
 
@@ -477,8 +636,8 @@
         }
 
         .template-section.active {
-            border-color: #667eea;
-            background: #f8f9ff;
+            border-color: var(--primary-gold);
+            background: #fffbf0;
         }
 
         .template-controls {
@@ -492,26 +651,35 @@
             flex: 1;
             min-width: 200px;
             padding: 8px;
-            border: 2px solid #667eea;
-            border-radius: 5px;
+            border: 2px solid var(--primary-gold);
+            border-radius: var(--radius-sm);
             font-size: 13px;
+            font-family: var(--font-family);
             cursor: pointer;
+            transition: border-color var(--transition-fast);
+        }
+
+        .template-select:focus {
+            outline: none;
+            border-color: var(--primary-gold-dark);
         }
 
         .btn-template {
-            background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-            color: white;
+            background: linear-gradient(135deg, var(--primary-gold), var(--primary-gold-dark));
+            color: var(--dark-secondary);
             border: none;
             padding: 8px 16px;
-            border-radius: 20px;
+            border-radius: var(--radius-md);
             cursor: pointer;
             font-size: 13px;
             font-weight: 600;
-            transition: transform 0.2s;
+            font-family: var(--font-family);
+            transition: all var(--transition-fast);
         }
 
-        .btn-template:hover {
+        .btn-template:hover:not(:disabled) {
             transform: translateY(-2px);
+            box-shadow: 0 4px 12px rgba(255, 196, 7, 0.3);
         }
 
         .btn-template:disabled {
@@ -536,7 +704,7 @@
 
         .template-preview-label {
             font-weight: 600;
-            color: #667eea;
+            color: var(--primary-gold-dark);
         }
 
         /* Modal Styles */
@@ -569,8 +737,9 @@
         }
 
         .modal-header h3 {
-            color: #667eea;
+            color: var(--primary-gold-dark);
             margin: 0;
+            font-weight: 600;
         }
 
         .close-modal {
@@ -601,9 +770,17 @@
             width: 100%;
             padding: 10px;
             border: 2px solid #dee2e6;
-            border-radius: 5px;
+            border-radius: var(--radius-sm);
             font-size: 13px;
-            font-family: inherit;
+            font-family: var(--font-family);
+            transition: border-color var(--transition-fast);
+        }
+
+        .form-group input:focus,
+        .form-group textarea:focus {
+            outline: none;
+            border-color: var(--primary-gold);
+            box-shadow: 0 0 0 3px rgba(255, 196, 7, 0.1);
         }
 
         .form-group textarea {
@@ -619,12 +796,13 @@
         }
 
         .variable-hint {
-            background: #f8f9ff;
+            background: #fffbf0;
             padding: 8px;
-            border-radius: 5px;
+            border-radius: var(--radius-sm);
             font-size: 11px;
-            color: #667eea;
+            color: var(--primary-gold-dark);
             margin-top: 5px;
+            border: 1px solid rgba(255, 196, 7, 0.2);
         }
 
         @media (max-width: 768px) {
@@ -661,6 +839,18 @@
                     <span class="source-info">ℹ️ Choose how to generate metadata</span>
                 </div>
 
+                <div class="import-section" id="excelSection" style="display: block;">
+                    <h4 style="margin-bottom: 10px; color: #495057;">📊 Excel Lookup File</h4>
+                    <p style="font-size: 13px; color: #6c757d; margin-bottom: 10px;">
+                        Upload your Excel file with metadata (columns: filename, title, description)
+                    </p>
+                    <input type="file" id="excelFileInput" accept=".xlsx,.xls" style="display: none;">
+                    <button class="btn-import" onclick="document.getElementById('excelFileInput').click()">
+                        📤 Upload Excel File
+                    </button>
+                    <div id="excelStats" class="import-stats" style="display: none;"></div>
+                </div>
+
                 <div class="import-section" id="importSection" style="display: none;">
                     <h4 style="margin-bottom: 10px; color: #495057;">📂 Import Metadata File</h4>
                     <p style="font-size: 13px; color: #6c757d; margin-bottom: 10px;">
@@ -705,10 +895,13 @@
 
                 <div class="output-dir-section">
                     <label for="outputDir">Save to folder:</label>
-                    <input type="text" id="outputDir" placeholder="Leave empty to save in original location" />
+                    <input type="text" id="outputDir" placeholder="Leave empty to save in original location or enter path like /Users/username/Desktop" />
+                    <button class="btn-small" onclick="clearOutputFolder()" type="button" title="Clear output folder">
+                        🗑️ Clear
+                    </button>
                 </div>
                 <div class="output-dir-hint">
-                    💡 Tip: Paste the folder path where you want to save processed files (e.g., /Users/YourName/Desktop/ProcessedFiles)
+                    💡 Tip: Enter the full path where you want to save files (e.g., /Users/yourname/Desktop/Output)
                 </div>
             </div>
 
@@ -749,6 +942,32 @@
         </div>
     </div>
 
+    <!-- Excel Mapping Modal -->
+    <div id="excelMappingModal" class="modal">
+        <div class="modal-content" style="max-width: 700px;">
+            <div class="modal-header">
+                <h3>Configure Excel Mapping</h3>
+                <span class="close-modal" onclick="closeExcelMappingModal()">&times;</span>
+            </div>
+            <div id="excelMappingContent">
+                <!-- Will be populated dynamically -->
+            </div>
+        </div>
+    </div>
+
+    <!-- Import Mapping Modal -->
+    <div id="importMappingModal" class="modal">
+        <div class="modal-content" style="max-width: 700px;">
+            <div class="modal-header">
+                <h3>Configure Import Mapping</h3>
+                <span class="close-modal" onclick="closeImportMappingModal()">&times;</span>
+            </div>
+            <div id="importMappingContent">
+                <!-- Will be populated dynamically -->
+            </div>
+        </div>
+    </div>
+
     <!-- Create Template Modal -->
     <div id="createTemplateModal" class="modal">
         <div class="modal-content">
@@ -832,23 +1051,348 @@
         const importFileInput = document.getElementById('importFileInput');
         importFileInput.addEventListener('change', handleImportFile);
 
-        function handleSourceChange() {
-            const source = document.getElementById('metadataSource').value;
-            const importSection = document.getElementById('importSection');
+        // Excel file input
+        const excelFileInput = document.getElementById('excelFileInput');
+        excelFileInput.addEventListener('change', handleExcelFile);
 
-            if (source === 'import') {
-                importSection.style.display = 'block';
-            } else {
-                importSection.style.display = 'none';
+        let excelSessionId = null;
+
+        function clearOutputFolder() {
+            document.getElementById('outputDir').value = '';
+            showInfo('Output folder cleared. Files will be saved to original location.');
+        }
+
+        let currentExcelData = null;
+
+        async function handleExcelFile(e) {
+            const file = e.target.files[0];
+            if (!file) return;
+
+            hideAlerts();
+            showInfo(`Uploading Excel file: ${file.name}...`);
+
+            const formData = new FormData();
+            formData.append('excel_file', file);
+
+            try {
+                const response = await fetch('/upload-excel', {
+                    method: 'POST',
+                    body: formData
+                });
+
+                const data = await response.json();
+
+                if (data.error) {
+                    showError(data.error);
+                    return;
+                }
+
+                // Store excel data and show mapping modal
+                currentExcelData = data;
+                showExcelMappingModal(data);
+
+            } catch (error) {
+                showError(`Excel upload failed: ${error.message}`);
             }
         }
 
+        function showExcelMappingModal(data) {
+            const modal = document.getElementById('excelMappingModal');
+            const content = document.getElementById('excelMappingContent');
+
+            // Build sheet selector
+            let sheetsHTML = '<div class="form-group">';
+            sheetsHTML += '<label for="excelSheetSelect">Select Sheet *</label>';
+            sheetsHTML += '<select id="excelSheetSelect" class="form-control" onchange="updateColumnPreview()">';
+            data.sheets.forEach(sheet => {
+                sheetsHTML += `<option value="${sheet}">${sheet}</option>`;
+            });
+            sheetsHTML += '</select></div>';
+
+            // Get first sheet preview
+            const firstSheet = data.sheets[0];
+            const preview = data.preview[firstSheet];
+
+            content.innerHTML = `
+                ${sheetsHTML}
+
+                <div class="form-group">
+                    <label>Column Mappings *</label>
+                    <div style="background: #f8f9ff; padding: 15px; border-radius: 8px; margin-top: 10px;">
+                        <div class="form-group">
+                            <label for="filenameColumn">Filename Column *</label>
+                            <select id="filenameColumn" class="form-control">
+                                <option value="">-- Select Column --</option>
+                                ${preview.columns.map(col => `<option value="${col}">${col}</option>`).join('')}
+                            </select>
+                            <small style="color: #6b7280;">Column containing filenames (with or without extension)</small>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="titleColumn">Title Column</label>
+                            <select id="titleColumn" class="form-control">
+                                <option value="">-- Select Column (Optional) --</option>
+                                ${preview.columns.map(col => `<option value="${col}">${col}</option>`).join('')}
+                            </select>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="descriptionColumn">Description Column</label>
+                            <select id="descriptionColumn" class="form-control">
+                                <option value="">-- Select Column (Optional) --</option>
+                                ${preview.columns.map(col => `<option value="${col}">${col}</option>`).join('')}
+                            </select>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="keywordsColumn">Keywords Column</label>
+                            <select id="keywordsColumn" class="form-control">
+                                <option value="">-- Select Column (Optional) --</option>
+                                ${preview.columns.map(col => `<option value="${col}">${col}</option>`).join('')}
+                            </select>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Preview (First 3 rows)</label>
+                    <div id="excelPreviewTable" style="overflow-x: auto; margin-top: 10px;">
+                        ${buildPreviewTable(preview)}
+                    </div>
+                </div>
+
+                <div style="display: flex; gap: 10px; margin-top: 20px;">
+                    <button onclick="confirmExcelMapping()" class="btn btn-primary" style="flex: 1;">
+                        ✅ Confirm Mapping
+                    </button>
+                    <button onclick="closeExcelMappingModal()" class="btn btn-secondary" style="flex: 1;">
+                        Cancel
+                    </button>
+                </div>
+            `;
+
+            // Auto-select likely columns
+            autoSelectColumns(preview.columns);
+
+            modal.style.display = 'flex';
+        }
+
+        function autoSelectColumns(columns) {
+            // Try to auto-detect filename column
+            const filenameCandidates = ['filename', 'file name', 'file', 'name', 'path', 'asset path'];
+            for (const col of columns) {
+                if (filenameCandidates.some(c => col.toLowerCase().includes(c))) {
+                    document.getElementById('filenameColumn').value = col;
+                    break;
+                }
+            }
+
+            // Try to auto-detect title column
+            const titleCandidates = ['title', 'heading', 'name'];
+            for (const col of columns) {
+                if (titleCandidates.some(c => col.toLowerCase() === c)) {
+                    document.getElementById('titleColumn').value = col;
+                    break;
+                }
+            }
+
+            // Try to auto-detect description column
+            const descCandidates = ['description', 'desc', 'subject', 'alt text', 'external description'];
+            for (const col of columns) {
+                if (descCandidates.some(c => col.toLowerCase().includes(c))) {
+                    document.getElementById('descriptionColumn').value = col;
+                    break;
+                }
+            }
+
+            // Try to auto-detect keywords column
+            const keywordsCandidates = ['keywords', 'keyword', 'tags', 'tag', 'categories'];
+            for (const col of columns) {
+                if (keywordsCandidates.some(c => col.toLowerCase().includes(c))) {
+                    document.getElementById('keywordsColumn').value = col;
+                    break;
+                }
+            }
+        }
+
+        function buildPreviewTable(preview) {
+            if (!preview || !preview.sample_data || preview.sample_data.length === 0) {
+                return '<p style="color: #6b7280;">No preview data available</p>';
+            }
+
+            let html = '<table style="width: 100%; border-collapse: collapse; font-size: 13px;">';
+
+            // Header
+            html += '<thead><tr style="background: var(--primary-gold); color: var(--dark-secondary);">';
+            preview.columns.forEach(col => {
+                html += `<th style="padding: 8px; border: 1px solid #dee2e6; font-weight: 600;">${col}</th>`;
+            });
+            html += '</tr></thead>';
+
+            // Rows
+            html += '<tbody>';
+            preview.sample_data.forEach((row, idx) => {
+                html += `<tr style="background: ${idx % 2 === 0 ? '#fff' : '#f8f9ff'};">`;
+                preview.columns.forEach(col => {
+                    const value = row[col] || '';
+                    html += `<td style="padding: 8px; border: 1px solid #dee2e6;">${value}</td>`;
+                });
+                html += '</tr>';
+            });
+            html += '</tbody></table>';
+
+            return html;
+        }
+
+        async function updateColumnPreview() {
+            const sheetName = document.getElementById('excelSheetSelect').value;
+            if (!currentExcelData || !sheetName) return;
+
+            try {
+                showInfo('Loading sheet preview...');
+
+                const response = await fetch('/preview-excel-sheet', {
+                    method: 'POST',
+                    headers: {'Content-Type': 'application/json'},
+                    body: JSON.stringify({
+                        excel_session_id: currentExcelData.excel_session_id,
+                        sheet_name: sheetName
+                    })
+                });
+
+                const data = await response.json();
+
+                if (data.error) {
+                    showError(data.error);
+                    return;
+                }
+
+                // Update column dropdowns
+                const columns = data.columns;
+                ['filenameColumn', 'titleColumn', 'descriptionColumn', 'keywordsColumn'].forEach(id => {
+                    const select = document.getElementById(id);
+                    const currentValue = select.value;
+                    select.innerHTML = id === 'filenameColumn'
+                        ? '<option value="">-- Select Column --</option>'
+                        : '<option value="">-- Select Column (Optional) --</option>';
+                    columns.forEach(col => {
+                        select.innerHTML += `<option value="${col}">${col}</option>`;
+                    });
+                    // Try to restore selection
+                    if (columns.includes(currentValue)) {
+                        select.value = currentValue;
+                    }
+                });
+
+                // Update preview table
+                document.getElementById('excelPreviewTable').innerHTML = buildPreviewTable(data);
+
+                // Auto-select columns again
+                autoSelectColumns(columns);
+
+                hideAlerts();
+
+            } catch (error) {
+                showError(`Failed to load sheet preview: ${error.message}`);
+            }
+        }
+
+        async function confirmExcelMapping() {
+            const sheetName = document.getElementById('excelSheetSelect').value;
+            const filenameColumn = document.getElementById('filenameColumn').value;
+            const titleColumn = document.getElementById('titleColumn').value;
+            const descriptionColumn = document.getElementById('descriptionColumn').value;
+            const keywordsColumn = document.getElementById('keywordsColumn').value;
+
+            if (!filenameColumn) {
+                showError('Please select a filename column');
+                return;
+            }
+
+            try {
+                showInfo('Configuring Excel mapping...');
+
+                const response = await fetch('/configure-excel-mapping', {
+                    method: 'POST',
+                    headers: {'Content-Type': 'application/json'},
+                    body: JSON.stringify({
+                        excel_session_id: currentExcelData.excel_session_id,
+                        sheet_name: sheetName,
+                        column_mapping: {
+                            filename: filenameColumn,
+                            title: titleColumn,
+                            description: descriptionColumn,
+                            keywords: keywordsColumn
+                        }
+                    })
+                });
+
+                const data = await response.json();
+
+                if (data.error) {
+                    showError(data.error);
+                    return;
+                }
+
+                // Store excel session ID
+                excelSessionId = data.excel_session_id;
+
+                // Display stats
+                const excelStats = document.getElementById('excelStats');
+                const stats = data.stats;
+                excelStats.innerHTML = `
+                    ✅ ${data.message}<br>
+                    <small>
+                        Loaded ${stats.total_records} records •
+                        ${stats.with_title} with title •
+                        ${stats.with_description} with description •
+                        ${stats.with_keywords} with keywords
+                    </small>
+                `;
+                excelStats.style.display = 'block';
+
+                // Mark excel section as active
+                document.getElementById('excelSection').classList.add('active');
+
+                closeExcelMappingModal();
+                showSuccess(`✅ ${data.message}`);
+
+            } catch (error) {
+                showError(`Excel configuration failed: ${error.message}`);
+            }
+        }
+
+        function closeExcelMappingModal() {
+            const modal = document.getElementById('excelMappingModal');
+            modal.style.display = 'none';
+            currentExcelData = null;
+        }
+
+        function handleSourceChange() {
+            const source = document.getElementById('metadataSource').value;
+            const excelSection = document.getElementById('excelSection');
+            const importSection = document.getElementById('importSection');
+
+            // Hide all sections first
+            excelSection.style.display = 'none';
+            importSection.style.display = 'none';
+
+            // Show relevant section
+            if (source === 'excel') {
+                excelSection.style.display = 'block';
+            } else if (source === 'import') {
+                importSection.style.display = 'block';
+            }
+        }
+
+        let currentImportData = null;
+
         async function handleImportFile(e) {
             const file = e.target.files[0];
             if (!file) return;
 
             hideAlerts();
-            showInfo(`Importing metadata from ${file.name}...`);
+            showInfo(`Uploading import file: ${file.name}...`);
 
             const formData = new FormData();
             formData.append('import_file', file);
@@ -866,6 +1410,187 @@
                     return;
                 }
 
+                // Store import data and show mapping modal
+                currentImportData = data;
+                showImportMappingModal(data);
+
+            } catch (error) {
+                showError(`Import upload failed: ${error.message}`);
+            }
+        }
+
+        function showImportMappingModal(data) {
+            const modal = document.getElementById('importMappingModal');
+            const content = document.getElementById('importMappingContent');
+
+            content.innerHTML = `
+                <div class="form-group">
+                    <label>File: <strong>${data.filename}</strong></label>
+                </div>
+
+                <div class="form-group">
+                    <label>Column Mappings *</label>
+                    <div style="background: #f8f9ff; padding: 15px; border-radius: 8px; margin-top: 10px;">
+                        <div class="form-group">
+                            <label for="importFilenameColumn">Filename Column *</label>
+                            <select id="importFilenameColumn" class="form-control">
+                                <option value="">-- Select Column --</option>
+                                ${data.columns.map(col => `<option value="${col}">${col}</option>`).join('')}
+                            </select>
+                            <small style="color: #6b7280;">Column containing filenames (with or without extension)</small>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="importTitleColumn">Title Column</label>
+                            <select id="importTitleColumn" class="form-control">
+                                <option value="">-- Select Column (Optional) --</option>
+                                ${data.columns.map(col => `<option value="${col}">${col}</option>`).join('')}
+                            </select>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="importSubjectColumn">Subject/Description Column</label>
+                            <select id="importSubjectColumn" class="form-control">
+                                <option value="">-- Select Column (Optional) --</option>
+                                ${data.columns.map(col => `<option value="${col}">${col}</option>`).join('')}
+                            </select>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="importKeywordsColumn">Keywords Column</label>
+                            <select id="importKeywordsColumn" class="form-control">
+                                <option value="">-- Select Column (Optional) --</option>
+                                ${data.columns.map(col => `<option value="${col}">${col}</option>`).join('')}
+                            </select>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Preview (First 3 rows)</label>
+                    <div style="overflow-x: auto; margin-top: 10px;">
+                        ${buildImportPreviewTable(data)}
+                    </div>
+                </div>
+
+                <div style="display: flex; gap: 10px; margin-top: 20px;">
+                    <button onclick="confirmImportMapping()" class="btn btn-primary" style="flex: 1;">
+                        ✅ Confirm Mapping
+                    </button>
+                    <button onclick="closeImportMappingModal()" class="btn btn-secondary" style="flex: 1;">
+                        Cancel
+                    </button>
+                </div>
+            `;
+
+            // Auto-select likely columns
+            autoSelectImportColumns(data.columns);
+
+            modal.style.display = 'flex';
+        }
+
+        function autoSelectImportColumns(columns) {
+            // Try to auto-detect filename column
+            const filenameCandidates = ['filename', 'file name', 'file', 'name', 'path'];
+            for (const col of columns) {
+                if (filenameCandidates.some(c => col.toLowerCase().includes(c))) {
+                    document.getElementById('importFilenameColumn').value = col;
+                    break;
+                }
+            }
+
+            // Try to auto-detect title column
+            const titleCandidates = ['title', 'heading', 'name'];
+            for (const col of columns) {
+                if (titleCandidates.some(c => col.toLowerCase() === c)) {
+                    document.getElementById('importTitleColumn').value = col;
+                    break;
+                }
+            }
+
+            // Try to auto-detect subject column
+            const subjectCandidates = ['description', 'desc', 'subject', 'summary'];
+            for (const col of columns) {
+                if (subjectCandidates.some(c => col.toLowerCase().includes(c))) {
+                    document.getElementById('importSubjectColumn').value = col;
+                    break;
+                }
+            }
+
+            // Try to auto-detect keywords column
+            const keywordsCandidates = ['keywords', 'keyword', 'tags', 'tag'];
+            for (const col of columns) {
+                if (keywordsCandidates.some(c => col.toLowerCase().includes(c))) {
+                    document.getElementById('importKeywordsColumn').value = col;
+                    break;
+                }
+            }
+        }
+
+        function buildImportPreviewTable(data) {
+            if (!data || !data.sample_data || data.sample_data.length === 0) {
+                return '<p style="color: #6b7280;">No preview data available</p>';
+            }
+
+            let html = '<table style="width: 100%; border-collapse: collapse; font-size: 13px;">';
+
+            // Header
+            html += '<thead><tr style="background: var(--primary-gold); color: var(--dark-secondary);">';
+            data.columns.forEach(col => {
+                html += `<th style="padding: 8px; border: 1px solid #dee2e6; font-weight: 600;">${col}</th>`;
+            });
+            html += '</tr></thead>';
+
+            // Rows
+            html += '<tbody>';
+            data.sample_data.slice(0, 3).forEach((row, idx) => {
+                html += `<tr style="background: ${idx % 2 === 0 ? '#fff' : '#f8f9ff'};">`;
+                data.columns.forEach(col => {
+                    const value = row[col] || '';
+                    html += `<td style="padding: 8px; border: 1px solid #dee2e6;">${value}</td>`;
+                });
+                html += '</tr>';
+            });
+            html += '</tbody></table>';
+
+            return html;
+        }
+
+        async function confirmImportMapping() {
+            const filenameColumn = document.getElementById('importFilenameColumn').value;
+            const titleColumn = document.getElementById('importTitleColumn').value;
+            const subjectColumn = document.getElementById('importSubjectColumn').value;
+            const keywordsColumn = document.getElementById('importKeywordsColumn').value;
+
+            if (!filenameColumn) {
+                showError('Please select a filename column');
+                return;
+            }
+
+            try {
+                showInfo('Configuring import mapping...');
+
+                const response = await fetch('/configure-import-mapping', {
+                    method: 'POST',
+                    headers: {'Content-Type': 'application/json'},
+                    body: JSON.stringify({
+                        import_session_id: currentImportData.import_session_id,
+                        column_mapping: {
+                            filename: filenameColumn,
+                            title: titleColumn,
+                            subject: subjectColumn,
+                            keywords: keywordsColumn
+                        }
+                    })
+                });
+
+                const data = await response.json();
+
+                if (data.error) {
+                    showError(data.error);
+                    return;
+                }
+
                 // Store import session ID
                 importSessionId = data.import_session_id;
 
@@ -885,13 +1610,20 @@
                 // Mark import section as active
                 document.getElementById('importSection').classList.add('active');
 
+                closeImportMappingModal();
                 showSuccess(`✅ ${data.message}`);
 
             } catch (error) {
-                showError(`Import failed: ${error.message}`);
+                showError(`Import configuration failed: ${error.message}`);
             }
         }
 
+        function closeImportMappingModal() {
+            const modal = document.getElementById('importMappingModal');
+            modal.style.display = 'none';
+            currentImportData = null;
+        }
+
         function handleFileSelect(e) {
             const files = e.target.files;
             if (files.length > 0) {
@@ -909,7 +1641,13 @@
 
             const metadataSource = document.getElementById('metadataSource').value;
 
-            // Validate import source
+            // Validate metadata sources
+            if (metadataSource === 'excel' && !excelSessionId) {
+                showError('Please upload an Excel file first using the "Upload Excel File" button');
+                hideSpinner();
+                return;
+            }
+
             if (metadataSource === 'import' && !importSessionId) {
                 showError('Please import a metadata file first using the "Choose Import File" button');
                 hideSpinner();
@@ -925,6 +1663,9 @@
 
             const formData = new FormData();
             formData.append('metadata_source', metadataSource);
+            if (excelSessionId) {
+                formData.append('excel_session_id', excelSessionId);
+            }
             if (importSessionId) {
                 formData.append('import_session_id', importSessionId);
             }
@@ -1042,9 +1783,6 @@
                         <button class="btn-save" onclick="saveMetadata(${index})" id="saveBtn-${index}">
                             💾 Save Changes
                         </button>
-                        <button class="btn-reset" onclick="resetMetadata(${index})">
-                            🔄 Reset
-                        </button>
                     </div>
                 `;
 
@@ -1132,8 +1870,9 @@
             const title = metadata?.title || '';
             const subject = metadata?.subject || '';
             const keywords = metadata?.keywords || '';
-
-            // Don't show internal metadata fields in the form
+            const author = metadata?.author || metadata?.creator || '';
+            const copyright = metadata?.copyright || '';
+            const comments = metadata?.comments || '';
 
             return `
                 <div class="metadata-field">
@@ -1144,7 +1883,8 @@
                            value="${escapeHtml(title)}"
                            maxlength="200"
                            data-field="title"
-                           data-index="${index}" />
+                           data-index="${index}"
+                           placeholder="e.g., Product Brochure 2026" />
                     <span class="char-count" id="title-count-${index}">0/200</span>
                 </div>
                 <div class="metadata-field">
@@ -1153,7 +1893,8 @@
                               class="editable-field"
                               maxlength="300"
                               data-field="subject"
-                              data-index="${index}">${escapeHtml(subject)}</textarea>
+                              data-index="${index}"
+                              placeholder="e.g., Marketing brochure for product line">${escapeHtml(subject)}</textarea>
                     <span class="char-count" id="subject-count-${index}">0/300</span>
                 </div>
                 <div class="metadata-field">
@@ -1164,9 +1905,50 @@
                            value="${escapeHtml(keywords)}"
                            maxlength="500"
                            data-field="keywords"
-                           data-index="${index}" />
+                           data-index="${index}"
+                           placeholder="e.g., product, marketing, 2026" />
                     <span class="char-count" id="keywords-count-${index}">0/500</span>
                 </div>
+                <div class="metadata-field">
+                    <label for="author-${index}">Author/Creator:</label>
+                    <input type="text"
+                           id="author-${index}"
+                           class="editable-field"
+                           value="${escapeHtml(author)}"
+                           maxlength="100"
+                           data-field="author"
+                           data-index="${index}"
+                           placeholder="e.g., John Smith" />
+                    <span class="char-count" id="author-count-${index}">0/100</span>
+                </div>
+                <div class="metadata-field">
+                    <label for="copyright-${index}">Copyright:</label>
+                    <input type="text"
+                           id="copyright-${index}"
+                           class="editable-field"
+                           value="${escapeHtml(copyright)}"
+                           maxlength="150"
+                           data-field="copyright"
+                           data-index="${index}"
+                           placeholder="e.g., Copyright 2026 Company Name" />
+                    <span class="char-count" id="copyright-count-${index}">0/150</span>
+                </div>
+                <div class="metadata-field">
+                    <label for="comments-${index}">Comments/Notes:</label>
+                    <textarea id="comments-${index}"
+                              class="editable-field"
+                              maxlength="500"
+                              data-field="comments"
+                              data-index="${index}"
+                              placeholder="e.g., Internal notes about this file">${escapeHtml(comments)}</textarea>
+                    <span class="char-count" id="comments-count-${index}">0/500</span>
+                </div>
+                <div id="custom-fields-${index}" style="margin-top: 10px;">
+                    <!-- Custom fields will be added here -->
+                </div>
+                <button class="btn-small" onclick="addCustomField(${index})" type="button" style="margin-top: 10px; background: #17a2b8;">
+                    ➕ Add Custom Field
+                </button>
             `;
         }
 
@@ -1177,8 +1959,15 @@
         }
 
         function initCharCounters(index) {
-            const fields = ['title', 'subject', 'keywords'];
-            const limits = { title: 200, subject: 300, keywords: 500 };
+            const fields = ['title', 'subject', 'keywords', 'author', 'copyright', 'comments'];
+            const limits = {
+                title: 200,
+                subject: 300,
+                keywords: 500,
+                author: 100,
+                copyright: 150,
+                comments: 500
+            };
 
             fields.forEach(field => {
                 const input = document.getElementById(`${field}-${index}`);
@@ -1225,6 +2014,12 @@
             const title = document.getElementById(`title-${index}`).value.trim();
             const subject = document.getElementById(`subject-${index}`).value.trim();
             const keywords = document.getElementById(`keywords-${index}`).value.trim();
+            const author = document.getElementById(`author-${index}`).value.trim();
+            const copyright = document.getElementById(`copyright-${index}`).value.trim();
+            const comments = document.getElementById(`comments-${index}`).value.trim();
+
+            // Get custom fields
+            const customFields = getCustomFields(index);
 
             try {
                 const response = await fetch('/update-manual', {
@@ -1235,7 +2030,11 @@
                         file_index: index,
                         title: title,
                         subject: subject,
-                        keywords: keywords
+                        keywords: keywords,
+                        author: author,
+                        copyright: copyright,
+                        comments: comments,
+                        custom_fields: customFields
                     })
                 });
 
@@ -1249,7 +2048,9 @@
                 }
 
                 // Update the file in currentFiles
-                currentFiles[index].suggested_metadata = { title, subject, keywords };
+                currentFiles[index].suggested_metadata = {
+                    title, subject, keywords, author, copyright, comments
+                };
 
                 // Show success indicator
                 const fileItem = document.getElementById(`file-${index}`);
@@ -1288,27 +2089,6 @@
             }
         }
 
-        function resetMetadata(index) {
-            const file = currentFiles[index];
-            if (!file || file.error) return;
-
-            // Reset to original suggested metadata
-            const original = file.suggested_metadata;
-            document.getElementById(`title-${index}`).value = original?.title || '';
-            document.getElementById(`subject-${index}`).value = original?.subject || '';
-            document.getElementById(`keywords-${index}`).value = original?.keywords || '';
-
-            // Update character counters
-            initCharCounters(index);
-
-            // Remove any success messages
-            const fileItem = document.getElementById(`file-${index}`);
-            if (fileItem) {
-                const successMsg = fileItem.querySelector('.save-success');
-                if (successMsg) successMsg.remove();
-                fileItem.style.borderLeftColor = '#667eea';
-            }
-        }
 
         async function updateAllFiles() {
             if (selectedFiles.size === 0) {
@@ -1488,6 +2268,99 @@
             infoAlert.style.display = 'none';
         }
 
+        // Custom Fields Management
+        let customFieldCounters = {}; // Track number of custom fields per file
+
+        function addCustomField(index) {
+            if (!customFieldCounters[index]) {
+                customFieldCounters[index] = 0;
+            }
+
+            const fieldId = customFieldCounters[index]++;
+            const container = document.getElementById(`custom-fields-${index}`);
+
+            const customFieldDiv = document.createElement('div');
+            customFieldDiv.className = 'metadata-field';
+            customFieldDiv.id = `custom-field-container-${index}-${fieldId}`;
+            customFieldDiv.style.border = '1px dashed #17a2b8';
+            customFieldDiv.style.padding = '10px';
+            customFieldDiv.style.borderRadius = '5px';
+            customFieldDiv.style.marginTop = '10px';
+            customFieldDiv.style.background = '#f0f9ff';
+
+            customFieldDiv.innerHTML = `
+                <div style="display: flex; gap: 10px; align-items: flex-start;">
+                    <div style="flex: 1;">
+                        <label style="display: block; font-weight: 600; color: #495057; font-size: 12px; margin-bottom: 5px;">
+                            Field Name:
+                        </label>
+                        <input type="text"
+                               id="custom-field-name-${index}-${fieldId}"
+                               class="editable-field"
+                               placeholder="e.g., Department, Project, Location"
+                               style="margin-bottom: 10px;" />
+
+                        <label style="display: block; font-weight: 600; color: #495057; font-size: 12px; margin-bottom: 5px;">
+                            Field Value:
+                        </label>
+                        <input type="text"
+                               id="custom-field-value-${index}-${fieldId}"
+                               class="editable-field"
+                               placeholder="Enter value"
+                               maxlength="200" />
+                        <span class="char-count" id="custom-field-count-${index}-${fieldId}">0/200</span>
+                    </div>
+                    <button onclick="removeCustomField(${index}, ${fieldId})"
+                            style="background: #dc3545; color: white; border: none; padding: 5px 10px; border-radius: 5px; cursor: pointer; margin-top: 25px;"
+                            type="button">
+                        ✕
+                    </button>
+                </div>
+            `;
+
+            container.appendChild(customFieldDiv);
+
+            // Initialize character counter for value field
+            const valueInput = document.getElementById(`custom-field-value-${index}-${fieldId}`);
+            const counter = document.getElementById(`custom-field-count-${index}-${fieldId}`);
+            if (valueInput && counter) {
+                valueInput.addEventListener('input', () => {
+                    updateCharCount(valueInput, counter, 200);
+                });
+                updateCharCount(valueInput, counter, 200);
+            }
+        }
+
+        function removeCustomField(index, fieldId) {
+            const container = document.getElementById(`custom-field-container-${index}-${fieldId}`);
+            if (container) {
+                container.remove();
+            }
+        }
+
+        function getCustomFields(index) {
+            const customFields = {};
+            const container = document.getElementById(`custom-fields-${index}`);
+
+            if (container) {
+                const fieldContainers = container.querySelectorAll('[id^="custom-field-container-"]');
+                fieldContainers.forEach(fieldContainer => {
+                    const match = fieldContainer.id.match(/custom-field-container-(\d+)-(\d+)/);
+                    if (match && match[1] === String(index)) {
+                        const fieldId = match[2];
+                        const nameInput = document.getElementById(`custom-field-name-${index}-${fieldId}`);
+                        const valueInput = document.getElementById(`custom-field-value-${index}-${fieldId}`);
+
+                        if (nameInput && valueInput && nameInput.value.trim()) {
+                            customFields[nameInput.value.trim()] = valueInput.value.trim();
+                        }
+                    }
+                });
+            }
+
+            return customFields;
+        }
+
         // Template Management Functions
         async function loadTemplateList() {
             try {
diff --git a/templates/login.html b/templates/login.html
index 5815198..d2f3eef 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -4,11 +4,41 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Login - Oliver Metadata Tool</title>
+    <link href="https://fonts.googleapis.com/css2?family=Montserrat:wght@300;400;500;600;700&display=swap" rel="stylesheet">
     <style>
+        :root {
+            --primary-gold: #FFC407;
+            --primary-gold-dark: #e6b007;
+            --primary-gold-light: #ffcf33;
+            --dark-primary: #2c2c2c;
+            --dark-secondary: #1a1a1a;
+            --white: #ffffff;
+            --text-primary: #1f2937;
+            --text-muted: #6b7280;
+            --overlay-light: rgba(255, 255, 255, 0.95);
+            --border-light: rgba(255, 255, 255, 0.2);
+            --shadow-lg: 0 20px 40px rgba(0, 0, 0, 0.1);
+            --radius-md: 12px;
+            --radius-xl: 20px;
+            --font-family: 'Montserrat', -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+            --transition-fast: 0.15s ease;
+        }
+
         * { margin: 0; padding: 0; box-sizing: border-box; }
+
+        @keyframes shimmer {
+            0% { transform: translateX(-100%); }
+            100% { transform: translateX(100%); }
+        }
+
+        @keyframes pulse {
+            0%, 100% { transform: scale(1); }
+            50% { transform: scale(1.05); }
+        }
+
         body {
-            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
-            background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+            font-family: var(--font-family);
+            background: linear-gradient(135deg, var(--dark-primary) 0%, var(--dark-secondary) 100%);
             min-height: 100vh;
             display: flex;
             align-items: center;
@@ -17,9 +47,11 @@
         }
 
         .login-container {
-            background: white;
-            border-radius: 20px;
-            box-shadow: 0 20px 60px rgba(0,0,0,0.3);
+            background: var(--overlay-light);
+            backdrop-filter: blur(20px);
+            border-radius: var(--radius-xl);
+            box-shadow: var(--shadow-lg);
+            border: 1px solid var(--border-light);
             width: 100%;
             max-width: 450px;
             padding: 40px;
@@ -28,17 +60,21 @@
         .logo {
             text-align: center;
             margin-bottom: 30px;
+            position: relative;
         }
 
         .logo h1 {
-            color: #667eea;
-            font-size: 28px;
+            color: var(--primary-gold-dark);
+            font-size: 32px;
             margin-bottom: 10px;
+            font-weight: 700;
+            text-shadow: 0 2px 4px rgba(255, 196, 7, 0.2);
         }
 
         .logo p {
-            color: #6c757d;
+            color: var(--text-muted);
             font-size: 14px;
+            font-weight: 500;
         }
 
         .divider {
@@ -53,15 +89,16 @@
             left: 0;
             right: 0;
             top: 50%;
-            height: 1px;
-            background: #dee2e6;
+            height: 2px;
+            background: linear-gradient(90deg, transparent, var(--primary-gold-light), transparent);
         }
 
         .divider span {
-            background: white;
+            background: var(--overlay-light);
             padding: 0 15px;
-            color: #6c757d;
+            color: var(--text-muted);
             font-size: 13px;
+            font-weight: 600;
             position: relative;
             z-index: 1;
         }
@@ -73,7 +110,7 @@
         .form-group label {
             display: block;
             font-weight: 600;
-            color: #495057;
+            color: var(--text-primary);
             margin-bottom: 8px;
             font-size: 14px;
         }
@@ -82,25 +119,28 @@
             width: 100%;
             padding: 12px;
             border: 2px solid #dee2e6;
-            border-radius: 8px;
+            border-radius: var(--radius-md);
             font-size: 14px;
-            transition: border-color 0.3s;
+            font-family: var(--font-family);
+            transition: all var(--transition-fast);
         }
 
         .form-group input:focus {
             outline: none;
-            border-color: #667eea;
+            border-color: var(--primary-gold);
+            box-shadow: 0 0 0 3px rgba(255, 196, 7, 0.1);
         }
 
         .btn {
             width: 100%;
             padding: 14px;
             border: none;
-            border-radius: 8px;
+            border-radius: var(--radius-md);
             font-size: 16px;
             font-weight: 600;
+            font-family: var(--font-family);
             cursor: pointer;
-            transition: transform 0.2s;
+            transition: all var(--transition-fast);
         }
 
         .btn:hover {
@@ -108,60 +148,79 @@
         }
 
         .btn-primary {
-            background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-            color: white;
+            background: linear-gradient(135deg, var(--primary-gold), var(--primary-gold-dark));
+            color: var(--dark-secondary);
             margin-bottom: 15px;
+            box-shadow: 0 4px 12px rgba(255, 196, 7, 0.3);
+        }
+
+        .btn-primary:hover {
+            box-shadow: 0 6px 16px rgba(255, 196, 7, 0.4);
         }
 
         .btn-sso {
-            background: white;
-            color: #495057;
-            border: 2px solid #dee2e6;
+            background: var(--white);
+            color: var(--text-primary);
+            border: 2px solid var(--primary-gold);
         }
 
         .btn-sso:hover {
-            border-color: #667eea;
-            color: #667eea;
+            border-color: var(--primary-gold-dark);
+            background: #fffbf0;
+            color: var(--primary-gold-dark);
         }
 
         .alert {
             padding: 12px;
-            border-radius: 8px;
+            border-radius: var(--radius-md);
             margin-bottom: 20px;
             font-size: 14px;
+            font-weight: 500;
         }
 
         .alert-error {
-            background: #f8d7da;
-            color: #721c24;
-            border: 1px solid #f5c6cb;
+            background: #fee;
+            color: #c33;
+            border: 2px solid #fcc;
         }
 
         .alert-info {
-            background: #d1ecf1;
-            color: #0c5460;
-            border: 1px solid #bee5eb;
+            background: #fffbf0;
+            color: var(--primary-gold-dark);
+            border: 2px solid var(--primary-gold-light);
         }
 
         .test-user-info {
-            background: #f8f9ff;
-            border: 2px dashed #667eea;
-            border-radius: 8px;
+            background: #fffbf0;
+            border: 2px dashed var(--primary-gold);
+            border-radius: var(--radius-md);
             padding: 15px;
             margin-bottom: 20px;
             font-size: 13px;
-            color: #495057;
+            color: var(--text-primary);
+            animation: pulse 3s infinite;
         }
 
         .test-user-info strong {
-            color: #667eea;
+            color: var(--primary-gold-dark);
+            font-weight: 600;
+        }
+
+        .test-user-info code {
+            background: rgba(255, 196, 7, 0.15);
+            padding: 2px 6px;
+            border-radius: 4px;
+            font-family: 'Courier New', monospace;
+            color: var(--primary-gold-dark);
+            font-weight: 600;
         }
 
         .footer-text {
             text-align: center;
             margin-top: 20px;
             font-size: 12px;
-            color: #6c757d;
+            color: var(--text-muted);
+            font-weight: 500;
         }
 
         .microsoft-icon {
diff --git a/web_app.py b/web_app.py
index 5d9b9c0..a4280bb 100644
--- a/web_app.py
+++ b/web_app.py
@@ -6,7 +6,7 @@ Flask-based web app for local or server deployment.
 Supports multiple metadata sources: Excel, AI, manual entry, and file import.
 """
 
-from flask import Flask, render_template, request, jsonify, send_file
+from flask import Flask, render_template, request, jsonify, send_file, session, redirect, url_for
 from werkzeug.utils import secure_filename  # noqa: F401 - kept as fallback
 from pathlib import Path
 import os
@@ -259,7 +259,19 @@ def upload_file():
     }
 
     # Get metadata lookup (only if using Excel source)
-    lookup = get_metadata_lookup() if metadata_source == 'excel' else None
+    excel_session_id = request.form.get('excel_session_id')
+    lookup = None
+
+    if metadata_source == 'excel':
+        if excel_session_id and excel_session_id in imported_metadata:
+            # Use uploaded Excel file
+            lookup = imported_metadata[excel_session_id]
+        else:
+            # Try default Excel file if available
+            try:
+                lookup = get_metadata_lookup()
+            except:
+                return jsonify({'error': 'Please upload an Excel file first using the Upload Excel File button'}), 400
 
     # Get imported metadata (only if using import source)
     import_map = None
@@ -504,9 +516,22 @@ def update_manual_metadata():
     custom_metadata = {
         'title': data.get('title', '').strip()[:200],
         'subject': data.get('subject', '').strip()[:300],
-        'keywords': data.get('keywords', '').strip()[:500]
+        'keywords': data.get('keywords', '').strip()[:500],
+        'author': data.get('author', '').strip()[:100],
+        'copyright': data.get('copyright', '').strip()[:150],
+        'comments': data.get('comments', '').strip()[:500]
     }
 
+    # Add custom fields if provided
+    custom_fields = data.get('custom_fields', {})
+    if custom_fields and isinstance(custom_fields, dict):
+        for field_name, field_value in custom_fields.items():
+            # Sanitize custom field names and values
+            safe_name = str(field_name).strip()[:50]
+            safe_value = str(field_value).strip()[:200]
+            if safe_name and safe_value:
+                custom_metadata[safe_name] = safe_value
+
     # Validate session
     if not session_id or session_id not in sessions:
         return jsonify({'error': 'Invalid or expired session'}), 400
@@ -566,10 +591,178 @@ def download_file(filename):
         return send_file(filepath, as_attachment=True)
     return jsonify({'error': 'File not found'}), 404
 
+@app.route('/upload-excel', methods=['POST'])
+@login_required
+def upload_excel():
+    """Upload Excel file for Excel Lookup metadata source."""
+    if 'excel_file' not in request.files:
+        return jsonify({'error': 'No file provided'}), 400
+
+    file = request.files['excel_file']
+    if file.filename == '':
+        return jsonify({'error': 'No file selected'}), 400
+
+    try:
+        import pandas as pd
+
+        # Save temp file
+        excel_filename = safe_filename(file.filename)
+        temp_path = Path(app.config['UPLOAD_FOLDER']) / excel_filename
+        file.save(str(temp_path))
+
+        # Preview Excel structure instead of loading directly
+        excel_file = pd.ExcelFile(str(temp_path))
+        sheet_names = excel_file.sheet_names
+
+        # Get columns and sample data from first sheet
+        preview_data = {}
+        for sheet_name in sheet_names[:5]:  # Limit to first 5 sheets
+            df = pd.read_excel(excel_file, sheet_name=sheet_name, nrows=5)
+            preview_data[sheet_name] = {
+                'columns': df.columns.tolist(),
+                'sample_data': df.head(3).fillna('').to_dict('records')
+            }
+
+        # Store file path temporarily for later configuration
+        excel_session_id = f"excel_{secrets.token_urlsafe(8)}"
+        if 'excel_files' not in imported_metadata:
+            imported_metadata['excel_files'] = {}
+        imported_metadata['excel_files'][excel_session_id] = {
+            'path': str(temp_path),
+            'filename': excel_filename,
+            'sheet_names': sheet_names
+        }
+
+        return jsonify({
+            'success': True,
+            'excel_session_id': excel_session_id,
+            'filename': excel_filename,
+            'sheets': sheet_names,
+            'preview': preview_data,
+            'message': f'Excel file uploaded. Please configure column mapping.'
+        })
+
+    except Exception as e:
+        import logging
+        logging.getLogger(__name__).error(f"Excel upload failed: {e}")
+        return jsonify({'error': f'Excel upload failed: {str(e)}'}), 500
+
+@app.route('/preview-excel-sheet', methods=['POST'])
+@login_required
+def preview_excel_sheet():
+    """Preview a specific sheet from uploaded Excel file."""
+    try:
+        import pandas as pd
+
+        data = request.json
+        excel_session_id = data.get('excel_session_id')
+        sheet_name = data.get('sheet_name')
+
+        if not excel_session_id or excel_session_id not in imported_metadata.get('excel_files', {}):
+            return jsonify({'error': 'Invalid session ID'}), 400
+
+        excel_info = imported_metadata['excel_files'][excel_session_id]
+        excel_path = excel_info['path']
+
+        # Read the specific sheet
+        df = pd.read_excel(excel_path, sheet_name=sheet_name, nrows=10)
+
+        return jsonify({
+            'success': True,
+            'columns': df.columns.tolist(),
+            'sample_data': df.head(5).fillna('').to_dict('records')
+        })
+
+    except Exception as e:
+        import logging
+        logging.getLogger(__name__).error(f"Sheet preview failed: {e}")
+        return jsonify({'error': f'Sheet preview failed: {str(e)}'}), 500
+
+@app.route('/configure-excel-mapping', methods=['POST'])
+@login_required
+def configure_excel_mapping():
+    """Configure Excel column mapping and load metadata."""
+    try:
+        import pandas as pd
+
+        data = request.json
+        excel_session_id = data.get('excel_session_id')
+        sheet_name = data.get('sheet_name')
+        column_mapping = data.get('column_mapping', {})  # {filename: 'col', title: 'col', ...}
+
+        if not excel_session_id or excel_session_id not in imported_metadata.get('excel_files', {}):
+            return jsonify({'error': 'Invalid session ID'}), 400
+
+        excel_info = imported_metadata['excel_files'][excel_session_id]
+        excel_path = excel_info['path']
+
+        # Read the configured sheet
+        df = pd.read_excel(excel_path, sheet_name=sheet_name)
+
+        # Build metadata map using configured columns
+        metadata_map = {}
+        filename_col = column_mapping.get('filename')
+        title_col = column_mapping.get('title')
+        description_col = column_mapping.get('description')
+        keywords_col = column_mapping.get('keywords')
+
+        if not filename_col:
+            return jsonify({'error': 'Filename column is required'}), 400
+
+        for _, row in df.iterrows():
+            filename = row.get(filename_col)
+            if pd.notna(filename) and str(filename).strip():
+                # Get filename without extension for indexing (case-insensitive)
+                filename_stem = Path(str(filename).strip()).stem.lower()
+
+                metadata = {
+                    'title': str(row.get(title_col, '')).strip() if title_col and pd.notna(row.get(title_col)) else '',
+                    'description': str(row.get(description_col, '')).strip() if description_col and pd.notna(row.get(description_col)) else '',
+                    'keywords': str(row.get(keywords_col, '')).strip() if keywords_col and pd.notna(row.get(keywords_col)) else '',
+                    'original_filename': str(filename).strip()
+                }
+
+                metadata_map[filename_stem] = metadata
+
+        # Create a simple lookup object
+        class ConfiguredExcelLookup:
+            def __init__(self, metadata_map):
+                self.metadata_map = metadata_map
+                self.filename_to_metadata = metadata_map
+
+            def lookup_by_filename(self, filename: str):
+                filename_stem = Path(filename).stem.lower()
+                return self.metadata_map.get(filename_stem)
+
+        lookup = ConfiguredExcelLookup(metadata_map)
+
+        # Store configured lookup
+        imported_metadata[excel_session_id] = lookup
+
+        # Get stats
+        stats = {
+            'total_records': len(metadata_map),
+            'with_title': sum(1 for v in metadata_map.values() if v.get('title')),
+            'with_description': sum(1 for v in metadata_map.values() if v.get('description')),
+            'with_keywords': sum(1 for v in metadata_map.values() if v.get('keywords'))
+        }
+
+        return jsonify({
+            'success': True,
+            'excel_session_id': excel_session_id,
+            'stats': stats,
+            'message': f'Configured mapping for {stats["total_records"]} records from sheet "{sheet_name}"'
+        })
+
+    except Exception as e:
+        import logging
+        logging.getLogger(__name__).error(f"Excel configuration failed: {e}")
+        return jsonify({'error': f'Excel configuration failed: {str(e)}'}), 500
+
 @app.route('/import-metadata', methods=['POST'])
 @login_required
 def import_metadata():
-    """Import metadata from external file (CSV, Excel, JSON)."""
+    """Upload import file and preview structure for mapping."""
     if 'import_file' not in request.files:
         return jsonify({'error': 'No file provided'}), 400
 
@@ -578,45 +771,142 @@ def import_metadata():
         return jsonify({'error': 'No file selected'}), 400
 
     try:
+        import pandas as pd
+
         # Save temp file
         import_filename = safe_filename(file.filename)
         temp_path = Path(app.config['UPLOAD_FOLDER']) / import_filename
         file.save(str(temp_path))
 
-        # Import based on file type
-        importer = MetadataImporter()
         file_ext = temp_path.suffix.lower()
 
+        # Read file and get structure
         if file_ext == '.csv':
-            metadata_map = importer.import_from_csv(str(temp_path))
+            df = pd.read_csv(str(temp_path), nrows=5, encoding='utf-8')
         elif file_ext in ['.xlsx', '.xls']:
-            metadata_map = importer.import_from_excel(str(temp_path))
+            df = pd.read_excel(str(temp_path), nrows=5)
         elif file_ext == '.json':
-            metadata_map = importer.import_from_json(str(temp_path))
+            import json
+            with open(str(temp_path), 'r', encoding='utf-8') as f:
+                data = json.load(f)
+                # Convert to DataFrame
+                if isinstance(data, list):
+                    df = pd.DataFrame(data[:5])
+                elif isinstance(data, dict):
+                    df = pd.DataFrame([data])
+                else:
+                    return jsonify({'error': 'Invalid JSON format'}), 400
         else:
-            return jsonify({'error': f'Unsupported file format: {file_ext}. Supported: .csv, .xlsx, .xls, .json'}), 400
+            return jsonify({'error': f'Unsupported file format: {file_ext}'}), 400
 
-        # Validate import
-        stats = importer.validate_import(metadata_map)
+        columns = df.columns.tolist()
+        sample_data = df.fillna('').to_dict('records')
 
-        # Store in global dict with unique session ID
-        import_session_id = f"import_{len(imported_metadata) + 1}"
+        # Store file path for later configuration
+        import_session_id = f"import_{secrets.token_urlsafe(8)}"
+        if 'import_files' not in imported_metadata:
+            imported_metadata['import_files'] = {}
+        imported_metadata['import_files'][import_session_id] = {
+            'path': str(temp_path),
+            'filename': import_filename,
+            'file_type': file_ext
+        }
+
+        return jsonify({
+            'success': True,
+            'import_session_id': import_session_id,
+            'filename': import_filename,
+            'columns': columns,
+            'sample_data': sample_data,
+            'message': f'Import file uploaded. Please configure column mapping.'
+        })
+
+    except Exception as e:
+        import logging
+        logging.getLogger(__name__).error(f"Import upload failed: {e}")
+        return jsonify({'error': f'Import upload failed: {str(e)}'}), 500
+
+@app.route('/configure-import-mapping', methods=['POST'])
+@login_required
+def configure_import_mapping():
+    """Configure import column mapping and load metadata."""
+    try:
+        import pandas as pd
+        import json
+
+        data = request.json
+        import_session_id = data.get('import_session_id')
+        column_mapping = data.get('column_mapping', {})
+
+        if not import_session_id or import_session_id not in imported_metadata.get('import_files', {}):
+            return jsonify({'error': 'Invalid session ID'}), 400
+
+        import_info = imported_metadata['import_files'][import_session_id]
+        import_path = import_info['path']
+        file_ext = import_info['file_type']
+
+        # Read the full file
+        if file_ext == '.csv':
+            df = pd.read_csv(import_path, encoding='utf-8')
+        elif file_ext in ['.xlsx', '.xls']:
+            df = pd.read_excel(import_path)
+        elif file_ext == '.json':
+            with open(import_path, 'r', encoding='utf-8') as f:
+                json_data = json.load(f)
+                if isinstance(json_data, list):
+                    df = pd.DataFrame(json_data)
+                else:
+                    df = pd.DataFrame([json_data])
+
+        # Build metadata map using configured columns
+        metadata_map = {}
+        filename_col = column_mapping.get('filename')
+        title_col = column_mapping.get('title')
+        subject_col = column_mapping.get('subject')
+        keywords_col = column_mapping.get('keywords')
+
+        if not filename_col:
+            return jsonify({'error': 'Filename column is required'}), 400
+
+        for _, row in df.iterrows():
+            filename = row.get(filename_col)
+            if pd.notna(filename) and str(filename).strip():
+                filename_stem = Path(str(filename).strip()).stem.lower()
+
+                metadata = {
+                    'title': str(row.get(title_col, '')).strip() if title_col and pd.notna(row.get(title_col)) else '',
+                    'subject': str(row.get(subject_col, '')).strip() if subject_col and pd.notna(row.get(subject_col)) else '',
+                    'keywords': str(row.get(keywords_col, '')).strip() if keywords_col and pd.notna(row.get(keywords_col)) else '',
+                    'original_filename': str(filename).strip()
+                }
+
+                metadata_map[filename_stem] = metadata
+
+        # Store configured metadata map
         imported_metadata[import_session_id] = metadata_map
 
         # Clean up temp file
-        temp_path.unlink()
+        Path(import_path).unlink(missing_ok=True)
+
+        # Get stats
+        stats = {
+            'total_records': len(metadata_map),
+            'with_title': sum(1 for v in metadata_map.values() if v.get('title')),
+            'with_subject': sum(1 for v in metadata_map.values() if v.get('subject')),
+            'with_keywords': sum(1 for v in metadata_map.values() if v.get('keywords'))
+        }
 
         return jsonify({
             'success': True,
             'import_session_id': import_session_id,
             'stats': stats,
-            'message': f'Imported {stats["total_records"]} metadata records from {import_filename}'
+            'message': f'Configured mapping for {stats["total_records"]} records'
         })
 
     except Exception as e:
         import logging
-        logging.getLogger(__name__).error(f"Import failed: {e}")
-        return jsonify({'error': f'Import failed: {str(e)}'}), 500
+        logging.getLogger(__name__).error(f"Import configuration failed: {e}")
+        return jsonify({'error': f'Import configuration failed: {str(e)}'}), 500
 
 @app.route('/preview-import', methods=['POST'])
 @login_required