diff --git a/Modules/ApprovalWorkflow/app/Http/Controllers/ApprovalController.php b/Modules/ApprovalWorkflow/app/Http/Controllers/ApprovalController.php
index 3366d95..7a8838c 100644
--- a/Modules/ApprovalWorkflow/app/Http/Controllers/ApprovalController.php
+++ b/Modules/ApprovalWorkflow/app/Http/Controllers/ApprovalController.php
@@ -122,9 +122,21 @@ class ApprovalController extends Controller
                 $totalCost = $materialsCost + $laborCost + $equipmentCost;
             }
             
+            $chainNotes = $approvalChain->notes 
+                ?? $approvalChain->steps->whereNotNull('notes')->filter(fn ($s) => trim($s->notes) !== '')->last()?->notes
+                ?? $approvalChain->approvable?->notes 
+                ?? $approvalChain->approvable?->description 
+                ?? $approvalChain->approvable?->remarks 
+                ?? $approvalChain->approvable?->reason 
+                ?? $approvalChain->approvable?->justification;
+
+            if (empty($approvalChain->notes) && $chainNotes) {
+                $approvalChain->notes = $chainNotes;
+            }
+
             $breakdownData = [
-                'document_number' => $approvalChain->approvable->document_number 
-                    ?? $approvalChain->approvable->po_number 
+                'document_number' => $approvalChain->approvable?->document_number 
+                    ?? $approvalChain->approvable?->po_number 
                     ?? ($approvalChain->approvable instanceof \Modules\FinancialManagement\Models\FinancialInvoice ? $approvalChain->approvable->invoice_number : null)
                     ?? ($approvalChain->approvable instanceof \Modules\ProjectManagement\Models\Project ? $approvalChain->approvable->code : null),
                 'total_cost' => $approvalChain->approvable instanceof \Modules\FinancialManagement\Models\FinancialInvoice
@@ -133,9 +145,7 @@ class ApprovalController extends Controller
                 'retention_amount' => $approvalChain->approvable instanceof \Modules\FinancialManagement\Models\FinancialInvoice
                     ? $approvalChain->approvable->retention_amount
                     : null,
-                'notes' => $approvalChain->approvable->notes 
-                    ?? ($approvalChain->approvable instanceof \Modules\FinancialManagement\Models\FinancialInvoice ? $approvalChain->approvable->notes : null)
-                    ?? ($approvalChain->approvable instanceof \Modules\ProjectManagement\Models\Project ? $approvalChain->approvable->description : null),
+                'notes' => $chainNotes ?? 'None',
             ];
         }
 
diff --git a/Modules/ApprovalWorkflow/resources/js/Components/ApprovableBreakdown.tsx b/Modules/ApprovalWorkflow/resources/js/Components/ApprovableBreakdown.tsx
index 1cf50ed..4d28e27 100644
--- a/Modules/ApprovalWorkflow/resources/js/Components/ApprovableBreakdown.tsx
+++ b/Modules/ApprovalWorkflow/resources/js/Components/ApprovableBreakdown.tsx
@@ -24,7 +24,7 @@ export default function ApprovableBreakdown({ chain, breakdownData }: Props) {
             details = [
                 { label: 'Document Number', value: breakdownData.document_number || `REQ-${approvable.id}` },
                 { label: 'Total Cost', value: breakdownData.total_cost != null ? `₱${parseFloat(breakdownData.total_cost).toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 })}` : 'N/A' },
-                { label: 'Notes', value: breakdownData.notes || 'None' },
+                { label: 'Notes', value: breakdownData.notes || chain.notes || 'None' },
             ];
             break;
         case 'Modules\\MaterialLogistics\\Models\\PurchaseOrder':
@@ -34,7 +34,7 @@ export default function ApprovableBreakdown({ chain, breakdownData }: Props) {
             details = [
                 { label: 'PO Number', value: breakdownData.document_number || `PO-${approvable.id}` },
                 { label: 'Total Amount', value: breakdownData.total_cost != null ? `₱${parseFloat(breakdownData.total_cost).toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 })}` : 'N/A' },
-                { label: 'Notes', value: breakdownData.notes || 'None' },
+                { label: 'Notes', value: breakdownData.notes || chain.notes || 'None' },
             ];
             break;
         case 'Modules\\ProjectManagement\\Models\\Project':
@@ -44,7 +44,7 @@ export default function ApprovableBreakdown({ chain, breakdownData }: Props) {
             details = [
                 { label: 'Project Code', value: breakdownData.document_number || approvable.code || 'N/A' },
                 { label: 'Total Estimated Cost', value: breakdownData.total_cost != null ? `₱${parseFloat(breakdownData.total_cost).toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 })}` : 'N/A' },
-                { label: 'Description', value: breakdownData.notes || 'None' },
+                { label: 'Notes / Description', value: breakdownData.notes || chain.notes || 'None' },
             ];
             break;
         case 'Modules\\FinancialManagement\\Models\\FinancialInvoice':
@@ -55,7 +55,7 @@ export default function ApprovableBreakdown({ chain, breakdownData }: Props) {
                 { label: 'Invoice Number', value: breakdownData.document_number || approvable.invoice_number || 'N/A' },
                 { label: 'Invoice Total', value: breakdownData.total_cost != null ? `₱${Number(breakdownData.total_cost).toLocaleString(undefined, { minimumFractionDigits: 2 })}` : 'N/A' },
                 { label: 'Retention Held', value: breakdownData.retention_amount != null ? `₱${Number(breakdownData.retention_amount).toLocaleString(undefined, { minimumFractionDigits: 2 })}` : '₱0.00' },
-                { label: 'Notes', value: breakdownData.notes || 'Progress billing invoice' },
+                { label: 'Notes', value: breakdownData.notes || chain.notes || 'Progress billing invoice' },
             ];
             break;
         default:
diff --git a/Modules/ApprovalWorkflow/resources/js/Pages/Approvals/Show.tsx b/Modules/ApprovalWorkflow/resources/js/Pages/Approvals/Show.tsx
index 20b4900..f8ea6a9 100644
--- a/Modules/ApprovalWorkflow/resources/js/Pages/Approvals/Show.tsx
+++ b/Modules/ApprovalWorkflow/resources/js/Pages/Approvals/Show.tsx
@@ -103,12 +103,12 @@ export default function Show({ chain, breakdownData }: Props) {
                                     </div>
                                 )}
                             </div>
-                            {chain.notes && (
-                                <div className="mt-4">
-                                    <p className="text-xs text-gray-500">Notes</p>
-                                    <p className="text-sm mt-1">{chain.notes}</p>
-                                </div>
-                            )}
+                            <div className="mt-4 border-t border-gray-100 pt-3">
+                                <p className="text-xs text-gray-500 font-semibold uppercase tracking-wider">Notes / Justification</p>
+                                <p className="text-sm mt-1 text-gray-700 bg-gray-50/80 p-2.5 rounded border border-gray-200">
+                                    {chain.notes || breakdownData?.notes || 'None'}
+                                </p>
+                            </div>
                         </CardContent>
                     </Card>
 
diff --git a/Modules/DailyReports/app/Http/Controllers/DailyReportsController.php b/Modules/DailyReports/app/Http/Controllers/DailyReportsController.php
index ca6dab0..2f3e2fa 100644
--- a/Modules/DailyReports/app/Http/Controllers/DailyReportsController.php
+++ b/Modules/DailyReports/app/Http/Controllers/DailyReportsController.php
@@ -78,7 +78,20 @@ class DailyReportsController extends Controller
                 $report->equipment()->createMany($request->equipment);
             }
             if ($request->has('activities')) {
-                $report->activities()->createMany($request->activities);
+                foreach ($request->activities as $index => $actData) {
+                    $activity = $report->activities()->create([
+                        'task_name' => $actData['task_name'] ?? '',
+                        'quantity_completed' => $actData['quantity_completed'] ?? 0,
+                        'percentage_completed' => $actData['percentage_completed'] ?? 0,
+                        'zone_area' => $actData['zone_area'] ?? null,
+                    ]);
+
+                    if ($request->hasFile("activities.{$index}.evidence")) {
+                        foreach ($request->file("activities.{$index}.evidence") as $file) {
+                            $activity->addMedia($file)->toMediaCollection('evidence');
+                        }
+                    }
+                }
             }
             if ($request->has('materials')) {
                 $report->materials()->createMany($request->materials);
@@ -108,7 +121,7 @@ class DailyReportsController extends Controller
      */
     public function show(DailyReport $daily_report)
     {
-        $daily_report->load(['project', 'user', 'labors', 'equipment', 'activities', 'materials', 'issues', 'media']);
+        $daily_report->load(['project', 'user', 'labors', 'equipment', 'activities.media', 'materials', 'issues', 'media']);
         
         return Inertia::render('DailyReports::Show', [
             'report' => $daily_report,
@@ -120,7 +133,7 @@ class DailyReportsController extends Controller
      */
     public function edit(DailyReport $daily_report)
     {
-        $daily_report->load(['project', 'labors', 'equipment', 'activities', 'materials', 'issues', 'media']);
+        $daily_report->load(['project', 'labors', 'equipment', 'activities.media', 'materials', 'issues', 'media']);
         
         return Inertia::render('DailyReports::Edit', [
             'report' => $daily_report,
@@ -149,7 +162,20 @@ class DailyReportsController extends Controller
             }
             if ($request->has('activities')) {
                 $daily_report->activities()->delete();
-                $daily_report->activities()->createMany($request->activities);
+                foreach ($request->activities as $index => $actData) {
+                    $activity = $daily_report->activities()->create([
+                        'task_name' => $actData['task_name'] ?? '',
+                        'quantity_completed' => $actData['quantity_completed'] ?? 0,
+                        'percentage_completed' => $actData['percentage_completed'] ?? 0,
+                        'zone_area' => $actData['zone_area'] ?? null,
+                    ]);
+
+                    if ($request->hasFile("activities.{$index}.evidence")) {
+                        foreach ($request->file("activities.{$index}.evidence") as $file) {
+                            $activity->addMedia($file)->toMediaCollection('evidence');
+                        }
+                    }
+                }
             }
             if ($request->has('materials')) {
                 $daily_report->materials()->delete();
diff --git a/Modules/DailyReports/app/Models/DailyReportActivity.php b/Modules/DailyReports/app/Models/DailyReportActivity.php
index 3b8a096..56f8c42 100644
--- a/Modules/DailyReports/app/Models/DailyReportActivity.php
+++ b/Modules/DailyReports/app/Models/DailyReportActivity.php
@@ -4,9 +4,15 @@ namespace Modules\DailyReports\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Spatie\MediaLibrary\HasMedia;
+use Spatie\MediaLibrary\InteractsWithMedia;
 
-class DailyReportActivity extends Model
+class DailyReportActivity extends Model implements HasMedia
 {
+    use InteractsWithMedia;
+
+    protected $appends = ['evidence_urls'];
+
     protected $fillable = [
         'daily_report_id',
         'task_name',
@@ -15,6 +21,20 @@ class DailyReportActivity extends Model
         'zone_area',
     ];
 
+    public function getEvidenceUrlsAttribute(): array
+    {
+        return $this->getMedia('evidence')->map(function ($media) {
+            return [
+                'id' => $media->id,
+                'name' => $media->name,
+                'file_name' => $media->file_name,
+                'original_url' => $media->original_url,
+                'mime_type' => $media->mime_type,
+                'size' => $media->size,
+            ];
+        })->toArray();
+    }
+
     public function dailyReport(): BelongsTo
     {
         return $this->belongsTo(DailyReport::class);
diff --git a/Modules/DailyReports/resources/js/Pages/Partials/ReportForm.tsx b/Modules/DailyReports/resources/js/Pages/Partials/ReportForm.tsx
index 686c34d..3d20f36 100644
--- a/Modules/DailyReports/resources/js/Pages/Partials/ReportForm.tsx
+++ b/Modules/DailyReports/resources/js/Pages/Partials/ReportForm.tsx
@@ -8,6 +8,7 @@ import { Card, CardContent, CardHeader, CardTitle, CardDescription } from '@/Com
 import { Trash2, Plus, Save } from 'lucide-react';
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/Components/ui/tabs";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/Components/ui/select";
+import TaskEvidenceUploader from '@/Components/TaskEvidenceUploader';
 
 export default function ReportForm({ project, report = null, isEdit = false, masterLabors = [], masterEquipments = [], masterMaterials = [] }: any) {
     // Project-scoped lookup lists
@@ -136,55 +137,64 @@ export default function ReportForm({ project, report = null, isEdit = false, mas
                         </CardHeader>
                         <CardContent className="space-y-4">
                             {data.activities.map((row: any, i: number) => (
-                                <div key={i} className="flex gap-4 items-start border p-4 rounded-lg">
-                                    <div className="grid grid-cols-4 gap-4 flex-1">
-                                        <div className="space-y-2">
-                                            <Label>Task / Activity Name</Label>
-                                            <Select
-                                                value={projectTasks.some((t: any) => t.name === row.task_name) ? row.task_name : (row.task_name ? 'custom' : '')}
-                                                onValueChange={(val) => {
-                                                    if (val === 'custom') {
-                                                        updateRow('activities', i, 'task_name', '');
-                                                    } else {
-                                                        updateRow('activities', i, 'task_name', val);
-                                                    }
-                                                }}
-                                            >
-                                                <SelectTrigger>
-                                                    <SelectValue placeholder="Select project task..." />
-                                                </SelectTrigger>
-                                                <SelectContent>
-                                                    {projectTasks.map((t: any) => (
-                                                        <SelectItem key={t.id} value={t.name}>{t.name}</SelectItem>
-                                                    ))}
-                                                    <SelectItem value="custom">— Custom / Other Activity —</SelectItem>
-                                                </SelectContent>
-                                            </Select>
-                                            {(!projectTasks.some((t: any) => t.name === row.task_name) || row.task_name === '') && (
-                                                <Input
-                                                    className="mt-1"
-                                                    placeholder="Type custom task name..."
-                                                    value={row.task_name}
-                                                    onChange={e => updateRow('activities', i, 'task_name', e.target.value)}
-                                                />
-                                            )}
-                                        </div>
-                                        <div className="space-y-2">
-                                            <Label>Quantity</Label>
-                                            <Input value={row.quantity_completed || ''} onChange={e => updateRow('activities', i, 'quantity_completed', e.target.value)} placeholder="e.g. 450 m2" />
-                                        </div>
-                                        <div className="space-y-2">
-                                            <Label>% Complete</Label>
-                                            <Input type="number" min="0" max="100" value={row.percentage_completed || ''} onChange={e => updateRow('activities', i, 'percentage_completed', e.target.value)} />
-                                        </div>
-                                        <div className="space-y-2">
-                                            <Label>Zone / Area</Label>
-                                            <Input value={row.zone_area || ''} onChange={e => updateRow('activities', i, 'zone_area', e.target.value)} />
+                                <div key={i} className="space-y-3 border p-4 rounded-lg bg-slate-50/50">
+                                    <div className="flex gap-4 items-start">
+                                        <div className="grid grid-cols-4 gap-4 flex-1">
+                                            <div className="space-y-2">
+                                                <Label>Task / Activity Name</Label>
+                                                <Select
+                                                    value={projectTasks.some((t: any) => t.name === row.task_name) ? row.task_name : (row.task_name ? 'custom' : '')}
+                                                    onValueChange={(val) => {
+                                                        if (val === 'custom') {
+                                                            updateRow('activities', i, 'task_name', '');
+                                                        } else {
+                                                            updateRow('activities', i, 'task_name', val);
+                                                        }
+                                                    }}
+                                                >
+                                                    <SelectTrigger>
+                                                        <SelectValue placeholder="Select project task..." />
+                                                    </SelectTrigger>
+                                                    <SelectContent>
+                                                        {projectTasks.map((t: any) => (
+                                                            <SelectItem key={t.id} value={t.name}>{t.name}</SelectItem>
+                                                        ))}
+                                                        <SelectItem value="custom">— Custom / Other Activity —</SelectItem>
+                                                    </SelectContent>
+                                                </Select>
+                                                {(!projectTasks.some((t: any) => t.name === row.task_name) || row.task_name === '') && (
+                                                    <Input
+                                                        className="mt-1"
+                                                        placeholder="Type custom task name..."
+                                                        value={row.task_name}
+                                                        onChange={e => updateRow('activities', i, 'task_name', e.target.value)}
+                                                    />
+                                                )}
+                                            </div>
+                                            <div className="space-y-2">
+                                                <Label>Quantity</Label>
+                                                <Input value={row.quantity_completed || ''} onChange={e => updateRow('activities', i, 'quantity_completed', e.target.value)} placeholder="e.g. 450 m2" />
+                                            </div>
+                                            <div className="space-y-2">
+                                                <Label>% Complete</Label>
+                                                <Input type="number" min="0" max="100" value={row.percentage_completed || ''} onChange={e => updateRow('activities', i, 'percentage_completed', e.target.value)} />
+                                            </div>
+                                            <div className="space-y-2">
+                                                <Label>Zone / Area</Label>
+                                                <Input value={row.zone_area || ''} onChange={e => updateRow('activities', i, 'zone_area', e.target.value)} />
+                                            </div>
                                         </div>
+                                        <Button type="button" variant="ghost" className="text-red-500 mt-6" onClick={() => removeRow('activities', i)}>
+                                            <Trash2 className="h-5 w-5" />
+                                        </Button>
+                                    </div>
+                                    <div className="pt-2 border-t border-slate-200">
+                                        <TaskEvidenceUploader
+                                            label="Activity Evidence Photos"
+                                            existingEvidence={row.evidence_urls || []}
+                                            onFilesSelected={(files) => updateRow('activities', i, 'evidence', files)}
+                                        />
                                     </div>
-                                    <Button type="button" variant="ghost" className="text-red-500 mt-6" onClick={() => removeRow('activities', i)}>
-                                        <Trash2 className="h-5 w-5" />
-                                    </Button>
                                 </div>
                             ))}
                             {data.activities.length === 0 && <p className="text-gray-500 text-sm text-center py-4">No activities added yet.</p>}
diff --git a/Modules/DailyReports/resources/js/Pages/Show.tsx b/Modules/DailyReports/resources/js/Pages/Show.tsx
index cfda0f3..298d7b4 100644
--- a/Modules/DailyReports/resources/js/Pages/Show.tsx
+++ b/Modules/DailyReports/resources/js/Pages/Show.tsx
@@ -16,6 +16,7 @@ import {
 } from 'lucide-react';
 import { Badge } from '@/Components/ui/badge';
 import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/Components/ui/table";
+import TaskEvidenceUploader from '@/Components/TaskEvidenceUploader';
 
 export default function Show({ report }: any) {
     const project = report.project;
@@ -271,8 +272,20 @@ export default function Show({ report }: any) {
                                 </TableHeader>
                                 <TableBody>
                                     {report.activities.map((a: any, i: number) => (
-                                        <TableRow key={i}>
-                                            <TableCell className="px-5 py-3.5 font-medium text-sm text-gray-900 dark:text-white">{a.task_name}</TableCell>
+                                        <TableRow key={i} className="align-top">
+                                            <TableCell className="px-5 py-3.5 font-medium text-sm text-gray-900 dark:text-white">
+                                                <div className="font-semibold">{a.task_name}</div>
+                                                {a.evidence_urls && a.evidence_urls.length > 0 && (
+                                                    <div className="mt-2.5">
+                                                        <TaskEvidenceUploader
+                                                            readOnly
+                                                            compact
+                                                            label="Task Evidence Photos"
+                                                            existingEvidence={a.evidence_urls}
+                                                        />
+                                                    </div>
+                                                )}
+                                            </TableCell>
                                             <TableCell className="px-5 py-3.5 text-sm text-gray-600 dark:text-gray-400">{a.zone_area || '-'}</TableCell>
                                             <TableCell className="px-5 py-3.5 text-right text-sm font-medium">{a.quantity_completed || '-'}</TableCell>
                                             <TableCell className="px-5 py-3.5 text-right text-sm font-medium">{a.percentage_completed ? `${a.percentage_completed}%` : '-'}</TableCell>
diff --git a/Modules/DocumentManagement/app/Http/Controllers/DocumentController.php b/Modules/DocumentManagement/app/Http/Controllers/DocumentController.php
index 4776d89..8dc61ae 100644
--- a/Modules/DocumentManagement/app/Http/Controllers/DocumentController.php
+++ b/Modules/DocumentManagement/app/Http/Controllers/DocumentController.php
@@ -14,7 +14,7 @@ class DocumentController extends Controller
 {
     public function index(Request $request)
     {
-        $query = Document::with(['uploader:id,name', 'category', 'project', 'approvals.approver']);
+        $query = Document::with(['uploader:id,name,contractor_id', 'category', 'project', 'approvals.approver']);
 
         if ($search = $request->search) {
             $query->where('title', 'like', "%{$search}%");
@@ -259,6 +259,22 @@ class DocumentController extends Controller
 
     public function destroy(Document $document)
     {
+        $user = auth()->user();
+
+        // Platform / Executive roles can delete any document
+        $isExecutive = is_null($user?->contractor_id) 
+            || in_array($user?->user_type, ['admin', 'super_admin'])
+            || $user?->hasAnyRole(['Super Admin', 'Admin', 'Project Manager', 'Executive']);
+
+        if (!$isExecutive) {
+            // Contractors can delete documents uploaded by anyone in their contractor company
+            $uploaderContractorId = $document->uploader?->contractor_id;
+            $isOwnCompany = ((int)$document->uploaded_by === (int)$user->id)
+                || ($user->contractor_id && $uploaderContractorId !== null && (int)$uploaderContractorId === (int)$user->contractor_id);
+
+            abort_unless($isOwnCompany, 403, 'Contractors can only delete documents uploaded by their company.');
+        }
+
         // Delete all version files
         foreach ($document->versions as $version) {
             $disk = $this->resolveDisk($version->file_path);
diff --git a/Modules/DocumentManagement/app/Models/Document.php b/Modules/DocumentManagement/app/Models/Document.php
index 14024fd..842e70e 100644
--- a/Modules/DocumentManagement/app/Models/Document.php
+++ b/Modules/DocumentManagement/app/Models/Document.php
@@ -27,7 +27,7 @@ class Document extends Model
 
     public function uploader(): BelongsTo
     {
-        return $this->belongsTo(User::class, 'uploaded_by');
+        return $this->belongsTo(User::class, 'uploaded_by')->withoutGlobalScope(\App\Scopes\TenantScope::class);
     }
 
     public function versions(): HasMany
diff --git a/Modules/DocumentManagement/app/Models/DocumentApproval.php b/Modules/DocumentManagement/app/Models/DocumentApproval.php
index 2c746df..e8e39e7 100644
--- a/Modules/DocumentManagement/app/Models/DocumentApproval.php
+++ b/Modules/DocumentManagement/app/Models/DocumentApproval.php
@@ -32,6 +32,6 @@ class DocumentApproval extends Model
 
     public function approver()
     {
-        return $this->belongsTo(\App\Models\User::class, 'approved_by');
+        return $this->belongsTo(\App\Models\User::class, 'approved_by')->withoutGlobalScope(\App\Scopes\TenantScope::class);
     }
 }
diff --git a/Modules/DocumentManagement/app/Models/DocumentVersion.php b/Modules/DocumentManagement/app/Models/DocumentVersion.php
index 12a5a3d..faca108 100644
--- a/Modules/DocumentManagement/app/Models/DocumentVersion.php
+++ b/Modules/DocumentManagement/app/Models/DocumentVersion.php
@@ -23,6 +23,6 @@ class DocumentVersion extends Model
 
     public function uploader(): BelongsTo
     {
-        return $this->belongsTo(User::class, 'uploaded_by');
+        return $this->belongsTo(User::class, 'uploaded_by')->withoutGlobalScope(\App\Scopes\TenantScope::class);
     }
 }
diff --git a/Modules/DocumentManagement/resources/js/Pages/Documents/Index.tsx b/Modules/DocumentManagement/resources/js/Pages/Documents/Index.tsx
index d0c443e..9c6d8be 100644
--- a/Modules/DocumentManagement/resources/js/Pages/Documents/Index.tsx
+++ b/Modules/DocumentManagement/resources/js/Pages/Documents/Index.tsx
@@ -12,6 +12,7 @@ import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogTrigger } from
 import { PaginatedData, PageProps } from '@/types';
 import { FileText, Upload, Download, History, Trash2, Image, File, CheckCircle, XCircle, LayoutGrid, List, Eye } from 'lucide-react';
 import { FormEvent, useState, useEffect, useRef } from 'react';
+import { ConfirmModal } from '@/Components/ConfirmModal';
 
 interface Category {
     id: number;
@@ -25,9 +26,10 @@ interface Project {
 
 interface DocItem {
     id: number; ulid: string; title: string; category_id: number; project_id?: number; description?: string;
+    uploaded_by?: number;
     current_file_name?: string; mime_type?: string; file_size: number;
     version_count: number; created_at: string; status: string;
-    uploader?: { id: number; ulid: string; name: string };
+    uploader?: { id: number; ulid?: string; name: string; contractor_id?: number | null };
     category?: Category;
     project?: Project;
 }
@@ -375,8 +377,39 @@ export default function Index({ documents, categories, projects, filters }: Prop
     const [dialog, setDialog] = useState(false);
     const [viewMode, setViewMode] = useState<'gallery' | 'list'>('gallery');
     const [previewDoc, setPreviewDoc] = useState<PreviewDocument | null>(null);
+    const [deleteTarget, setDeleteTarget] = useState<DocItem | null>(null);
+    const [isDeleting, setIsDeleting] = useState(false);
+
+    const handleDelete = () => {
+        if (!deleteTarget || isDeleting) return;
+        setIsDeleting(true);
+        router.delete(route('documents.destroy', deleteTarget.ulid), {
+            preserveScroll: true,
+            onSuccess: () => {
+                setDeleteTarget(null);
+                setIsDeleting(false);
+            },
+            onError: () => {
+                setIsDeleting(false);
+            },
+            onFinish: () => {
+                setIsDeleting(false);
+            }
+        });
+    };
 
     const isContractorAdmin = auth.roles?.includes('Main Contractor Admin');
+    const isExecutive = (auth.user?.user_type as string) === 'admin' 
+        || (auth.user?.user_type as string) === 'super_admin' 
+        || auth.user?.contractor_id === null 
+        || auth.roles?.some((r: any) => ['Super Admin', 'Admin', 'Project Manager', 'Executive'].includes(typeof r === 'string' ? r : r.name));
+
+    const canDeleteDocument = (doc: DocItem) => {
+        if (isExecutive) return true;
+        if (doc.uploaded_by && Number(doc.uploaded_by) === Number(auth.user?.id)) return true;
+        if (auth.user?.contractor_id && doc.uploader?.contractor_id && Number(doc.uploader.contractor_id) === Number(auth.user?.contractor_id)) return true;
+        return false;
+    };
 
     const form = useForm<{ title: string; category_id: string; project_id: string; description: string; file: File | null }>({
         title: '', category_id: '', project_id: '', description: '', file: null,
@@ -576,7 +609,9 @@ export default function Index({ documents, categories, projects, filters }: Prop
                                                     )}
                                                     <a href={route('documents.download', doc.ulid)}><Button variant="ghost" size="icon-sm" className="text-gray-500 hover:text-gray-900" title="Download"><Download className="h-4 w-4" /></Button></a>
                                                     <Link href={route('documents.versions', doc.ulid)}><Button variant="ghost" size="icon-sm" className="text-gray-500 hover:text-gray-900" title="Versions"><History className="h-4 w-4" /></Button></Link>
-                                                    <Button variant="ghost" size="icon-sm" className="text-red-500 hover:bg-red-50" title="Delete" onClick={() => { if (confirm('Delete document and all versions?')) router.delete(route('documents.destroy', doc.ulid)); }}><Trash2 className="h-4 w-4 text-red-500" /></Button>
+                                                    {canDeleteDocument(doc) && (
+                                                        <Button variant="ghost" size="icon-sm" className="text-red-500 hover:bg-red-50" title="Delete" onClick={() => setDeleteTarget(doc)}><Trash2 className="h-4 w-4 text-red-500" /></Button>
+                                                    )}
                                                 </div>
                                             </TableCell>
                                         </TableRow>
@@ -643,15 +678,17 @@ export default function Index({ documents, categories, projects, filters }: Prop
                                                     </Link>
                                                 </div>
                                                 
-                                                <Button 
-                                                    variant="ghost" 
-                                                    size="icon-sm" 
-                                                    className="h-8 w-8 text-slate-400 hover:text-red-600 hover:bg-red-50 rounded-md transition-colors"
-                                                    title="Delete Document" 
-                                                    onClick={(event) => { event.stopPropagation(); if (confirm('Delete document and all versions?')) router.delete(route('documents.destroy', doc.ulid)); }}
-                                                >
-                                                    <Trash2 className="h-4 w-4" />
-                                                </Button>
+                                                {canDeleteDocument(doc) && (
+                                                    <Button 
+                                                        variant="ghost" 
+                                                        size="icon-sm" 
+                                                        className="h-8 w-8 text-slate-400 hover:text-red-600 hover:bg-red-50 rounded-md transition-colors"
+                                                        title="Delete Document" 
+                                                        onClick={(event) => { event.stopPropagation(); setDeleteTarget(doc); }}
+                                                    >
+                                                        <Trash2 className="h-4 w-4" />
+                                                    </Button>
+                                                )}
                                             </div>
                                         </div>
                                     </div>
@@ -673,6 +710,20 @@ export default function Index({ documents, categories, projects, filters }: Prop
             </div></div>
 
             {previewDoc && <DocumentPreviewModal document={previewDoc} onClose={() => setPreviewDoc(null)} />}
+
+            <ConfirmModal
+                open={!!deleteTarget}
+                onOpenChange={(open) => {
+                    if (!open && !isDeleting) setDeleteTarget(null);
+                }}
+                title="Delete Document"
+                message={`Are you sure you want to delete "${deleteTarget?.title}" and all its uploaded versions? This action cannot be undone.`}
+                confirmText={isDeleting ? 'Deleting...' : 'Delete Document'}
+                cancelText="Keep Document"
+                variant="destructive"
+                loading={isDeleting}
+                onConfirm={handleDelete}
+            />
         </AuthenticatedLayout>
     );
 }
diff --git a/Modules/FinancialManagement/app/Enums/InvoiceStatus.php b/Modules/FinancialManagement/app/Enums/InvoiceStatus.php
index 1e1d4fc..c7e3830 100644
--- a/Modules/FinancialManagement/app/Enums/InvoiceStatus.php
+++ b/Modules/FinancialManagement/app/Enums/InvoiceStatus.php
@@ -9,6 +9,7 @@ enum InvoiceStatus: string
     case Approved = 'approved';
     case Rejected = 'rejected';
     case Sent = 'sent';
+    case PaymentSent = 'payment_sent';
     case PartiallyPaid = 'partially_paid';
     case Paid = 'paid';
     case Overdue = 'overdue';
@@ -21,6 +22,7 @@ enum InvoiceStatus: string
             self::Approved => 'Approved',
             self::Rejected => 'Rejected',
             self::Sent => 'Sent',
+            self::PaymentSent => 'Payment Sent (Pending Confirmation)',
             self::PartiallyPaid => 'Partially Paid',
             self::Paid => 'Paid',
             self::Overdue => 'Overdue',
@@ -32,12 +34,13 @@ enum InvoiceStatus: string
         return match ($this) {
             self::Draft => [self::Submitted],
             self::Submitted => [self::Approved, self::Rejected],
-            self::Approved => [self::Sent],
+            self::Approved => [self::Sent, self::PaymentSent, self::Paid],
             self::Rejected => [self::Draft],
-            self::Sent => [self::PartiallyPaid, self::Paid, self::Overdue],
-            self::PartiallyPaid => [self::Paid, self::Overdue],
+            self::Sent => [self::PaymentSent, self::PartiallyPaid, self::Paid, self::Overdue],
+            self::PaymentSent => [self::Paid, self::PartiallyPaid, self::Overdue],
+            self::PartiallyPaid => [self::PaymentSent, self::Paid, self::Overdue],
             self::Paid => [],
-            self::Overdue => [self::PartiallyPaid, self::Paid],
+            self::Overdue => [self::PaymentSent, self::PartiallyPaid, self::Paid],
         };
     }
 
@@ -49,6 +52,7 @@ enum InvoiceStatus: string
             self::Approved => 'green',
             self::Rejected => 'red',
             self::Sent => 'indigo',
+            self::PaymentSent => 'purple',
             self::PartiallyPaid => 'amber',
             self::Paid => 'emerald',
             self::Overdue => 'red',
diff --git a/Modules/FinancialManagement/app/Http/Controllers/FinanceController.php b/Modules/FinancialManagement/app/Http/Controllers/FinanceController.php
index fb2bd5f..7367b31 100644
--- a/Modules/FinancialManagement/app/Http/Controllers/FinanceController.php
+++ b/Modules/FinancialManagement/app/Http/Controllers/FinanceController.php
@@ -48,13 +48,15 @@ class FinanceController extends Controller
         $allInvoices = FinancialInvoice::whereIn('project_id', $this->availableProjectIdsQuery());
         $summary = [
             'total_billed' => (float) $allInvoices->sum('total_amount'),
-            'total_paid' => (float) $allInvoices->sum('paid_amount'),
-            'outstanding' => (float) $allInvoices->whereNotIn('status', ['paid'])->sum(\DB::raw('total_amount - paid_amount')),
-            'total_retention' => (float) RetentionEntry::where('type', 'debit')
-                ->whereIn('project_id', $this->availableProjectIdsQuery())->sum('amount')
+            'total_paid' => (float) (clone $allInvoices)->where('status', 'paid')->sum('paid_amount'),
+            'outstanding' => (float) (clone $allInvoices)->where('status', '!=', 'paid')->sum('total_amount'),
+            'total_retention' => abs(
+                (float) RetentionEntry::where('type', 'debit')
+                    ->whereIn('project_id', $this->availableProjectIdsQuery())->sum('amount')
                 - (float) RetentionEntry::where('type', 'credit')
-                ->whereIn('status', ['posted', 'paid'])
-                ->whereIn('project_id', $this->availableProjectIdsQuery())->sum('amount'),
+                    ->whereIn('status', ['posted', 'paid'])
+                    ->whereIn('project_id', $this->availableProjectIdsQuery())->sum('amount')
+            ),
         ];
 
         return Inertia::render('FinancialManagement::Invoices/Index', [
@@ -209,12 +211,37 @@ class FinanceController extends Controller
         ]);
 
         try {
-            $this->billingService->recordPayment($invoice, $validated['amount']);
+            $user = $request->user();
+            $isExecutive = is_null($user?->contractor_id) 
+                || in_array($user?->user_type, ['admin', 'super_admin'])
+                || $user?->hasAnyRole(['Super Admin', 'Admin', 'Project Manager', 'Executive']);
+
+            if ($isExecutive) {
+                $this->billingService->recordExecutivePayment($invoice, (float) $validated['amount']);
+                $msg = 'Payment recorded and sent for contractor receipt confirmation.';
+            } else {
+                $this->billingService->confirmContractorPayment($invoice);
+                $msg = 'Payment receipt confirmed.';
+            }
         } catch (\InvalidArgumentException $e) {
             return back()->with('error', $e->getMessage());
         }
 
-        return back()->with('success', 'Payment recorded.');
+        return back()->with('success', $msg);
+    }
+
+    public function confirmPayment(Request $request, FinancialInvoice $invoice)
+    {
+        abort_unless($this->canAccessProject($request->user(), $invoice->project_id), 403);
+        abort_unless($this->isContractorAdmin($request->user()), 403, 'Only Contractor Admin can confirm payment receipts.');
+
+        try {
+            $this->billingService->confirmContractorPayment($invoice);
+        } catch (\InvalidArgumentException $e) {
+            return back()->with('error', $e->getMessage());
+        }
+
+        return back()->with('success', 'Payment receipt confirmed successfully.');
     }
 
     // --- Retention Ledger ---
@@ -239,8 +266,8 @@ class FinanceController extends Controller
 
         $pendingReleases = RetentionEntry::whereIn('project_id', $this->availableProjectIdsQuery())
             ->where('type', 'credit')
-            ->where('status', 'submitted')
-            ->get(['id', 'ulid', 'project_id', 'amount', 'media_path', 'media_original_name'])
+            ->where('status', '!=', 'paid')
+            ->get(['id', 'ulid', 'project_id', 'amount', 'status', 'media_path', 'media_original_name'])
             ->keyBy('project_id');
 
         // Compute per-project totals
@@ -259,6 +286,7 @@ class FinanceController extends Controller
                     'balance' => (float) $debits - (float) $credits,
                     'pending_release_id' => $pending?->id,
                     'pending_release_ulid' => $pending?->ulid,
+                    'pending_release_status' => $pending?->status,
                     'pending_release_amount' => $pending ? (float) $pending->amount : null,
                     'pending_release_media_path' => $pending?->media_path,
                     'pending_release_media_name' => $pending?->media_original_name,
@@ -331,7 +359,41 @@ class FinanceController extends Controller
             return back()->with('error', $e->getMessage());
         }
 
-        return back()->with('success', 'Retention marked as paid with proof attached.');
+        return back()->with('success', 'Retention payment recorded and sent for contractor receipt confirmation.');
+    }
+
+    public function confirmRetentionPayment(Request $request, RetentionEntry $retentionEntry)
+    {
+        abort_unless($this->canAccessProject($request->user(), $retentionEntry->project_id), 403);
+        abort_unless($this->isContractorAdmin($request->user()), 403, 'Only Contractor Admin can confirm payment receipts.');
+
+        try {
+            $this->billingService->confirmRetentionPayment($retentionEntry);
+        } catch (\InvalidArgumentException $e) {
+            return back()->with('error', $e->getMessage());
+        }
+
+        return back()->with('success', 'Retention payment receipt confirmed successfully.');
+    }
+
+    private function isContractorAdmin(?User $user): bool
+    {
+        if (! $user) return false;
+
+        $userType = strtolower($user->user_type ?? '');
+        $roles = strtolower($user->getRoleNames()->implode(','));
+
+        $isExecutive = in_array($userType, ['admin', 'super_admin', 'project_manager'])
+            || $user->hasAnyRole(['Super Admin', 'admin', 'Admin', 'Project Manager', 'Executive']);
+
+        if ($isExecutive) {
+            return false;
+        }
+
+        return !is_null($user->contractor_id)
+            || $userType === 'contractor'
+            || $user->hasAnyRole(['Main Contractor Admin', 'Contractor Admin', 'Contractor', 'Subcontractor Admin'])
+            || \Illuminate\Support\Str::contains($roles, 'contractor');
     }
 
     public function viewRetentionMedia(Request $request, RetentionEntry $retentionEntry)
diff --git a/Modules/FinancialManagement/app/Services/ProgressBillingService.php b/Modules/FinancialManagement/app/Services/ProgressBillingService.php
index a72e756..6c2b0b8 100644
--- a/Modules/FinancialManagement/app/Services/ProgressBillingService.php
+++ b/Modules/FinancialManagement/app/Services/ProgressBillingService.php
@@ -75,6 +75,41 @@ class ProgressBillingService
         ]);
     }
 
+    /**
+     * On invoice payment, update project's last billed percentage.
+     */
+    /**
+     * Executive releases/records payment (transitions invoice to PaymentSent pending contractor confirmation).
+     */
+    public function recordExecutivePayment(FinancialInvoice $invoice, float $amount): void
+    {
+        $newPaid = (float) $invoice->paid_amount + $amount;
+
+        $updates = [
+            'paid_amount' => $newPaid,
+        ];
+
+        $invoice->transitionTo(InvoiceStatus::PaymentSent);
+        $invoice->update($updates);
+    }
+
+    /**
+     * Contractor confirms receipt of payment (transitions invoice to Paid & updates project progress).
+     */
+    public function confirmContractorPayment(FinancialInvoice $invoice): void
+    {
+        $totalAmount = (float) $invoice->total_amount;
+
+        $invoice->status = InvoiceStatus::Paid;
+        $invoice->paid_amount = $totalAmount;
+        $invoice->paid_at = now();
+        $invoice->save();
+
+        if (\Schema::hasColumn('projects', 'completion_percentage')) {
+            $invoice->project()->update(['completion_percentage' => $invoice->billed_percentage]);
+        }
+    }
+
     /**
      * On invoice payment, update project's last billed percentage.
      */
@@ -83,12 +118,14 @@ class ProgressBillingService
         $newPaid = (float) $invoice->paid_amount + $amount;
         $totalAmount = (float) $invoice->total_amount;
 
-        $updates = ['paid_amount' => $newPaid];
+        $updates = ['paid_amount' => $newPaid, 'paid_at' => now()];
 
         if ($newPaid >= $totalAmount) {
             $invoice->transitionTo(InvoiceStatus::Paid);
-            // Update project's last billed percentage
-            $invoice->project()->update(['last_billed_percentage' => $invoice->billed_percentage]);
+            // Update project's completion percentage
+            if (\Schema::hasColumn('projects', 'completion_percentage')) {
+                $invoice->project()->update(['completion_percentage' => $invoice->billed_percentage]);
+            }
         } else {
             $invoice->transitionTo(InvoiceStatus::PartiallyPaid);
         }
@@ -162,7 +199,7 @@ class ProgressBillingService
     public function markRetentionAsPaid(RetentionEntry $entry, ?string $mediaPath = null, ?string $mediaOriginalName = null): void
     {
         $data = [
-            'status' => 'paid',
+            'status' => 'payment_sent',
             'paid_by' => auth()->id(),
             'paid_at' => now(),
         ];
@@ -174,16 +211,43 @@ class ProgressBillingService
 
         if ($entry->type === 'debit') {
             $data['type'] = 'credit';
-            $data['description'] = 'Retention released and paid';
+            $data['description'] = 'Retention released (Payment Sent - Pending Contractor Confirmation)';
             $entry->update($data);
             return;
         }
 
-        if ($entry->type !== 'credit' || !in_array($entry->status, ['submitted', 'posted', 'pending', null], true)) {
+        if ($entry->type !== 'credit' || !in_array($entry->status, ['submitted', 'posted', 'pending', 'payment_sent', null], true)) {
             throw new \InvalidArgumentException('Retention entry cannot be marked as paid.');
         }
 
-        $data['description'] = 'Retention released and paid to contractor';
+        $data['description'] = 'Retention released (Payment Sent - Pending Contractor Confirmation)';
         $entry->update($data);
     }
+
+    public function confirmRetentionPayment(RetentionEntry $entry): void
+    {
+        $entry->status = 'paid';
+        $entry->description = 'Retention released and paid to contractor';
+        $entry->paid_at = now();
+        $entry->save();
+
+        if ($entry->invoice) {
+            $entry->invoice->status = InvoiceStatus::Paid;
+            $entry->invoice->paid_amount = $entry->invoice->total_amount;
+            $entry->invoice->paid_at = now();
+            $entry->invoice->save();
+
+            if (\Schema::hasColumn('projects', 'completion_percentage')) {
+                $entry->invoice->project()->update(['completion_percentage' => $entry->invoice->billed_percentage]);
+            }
+        } elseif ($entry->project_id) {
+            $invoice = FinancialInvoice::where('project_id', $entry->project_id)->latest()->first();
+            if ($invoice && $invoice->status !== InvoiceStatus::Paid) {
+                $invoice->status = InvoiceStatus::Paid;
+                $invoice->paid_amount = $invoice->total_amount;
+                $invoice->paid_at = now();
+                $invoice->save();
+            }
+        }
+    }
 }
diff --git a/Modules/FinancialManagement/resources/js/Pages/Invoices/Index.tsx b/Modules/FinancialManagement/resources/js/Pages/Invoices/Index.tsx
index 53c183c..add8ec9 100644
--- a/Modules/FinancialManagement/resources/js/Pages/Invoices/Index.tsx
+++ b/Modules/FinancialManagement/resources/js/Pages/Invoices/Index.tsx
@@ -32,13 +32,14 @@ const statusConfig: Record<string, { variant: 'default' | 'secondary' | 'destruc
     approved: { variant: 'default', label: 'Approved' },
     rejected: { variant: 'destructive', label: 'Rejected' },
     sent: { variant: 'secondary', label: 'Sent' },
+    payment_sent: { variant: 'secondary', label: 'Payment Sent (Pending Confirmation)' },
     partially_paid: { variant: 'outline', label: 'Partially Paid' },
     paid: { variant: 'default', label: 'Paid' },
     overdue: { variant: 'destructive', label: 'Overdue' },
 };
 
 export default function Index({ invoices, projects, summary, filters }: Props) {
-    const { flash } = usePage<PageProps>().props;
+    const { flash, auth } = usePage<PageProps>().props;
     const [statusFilter, setStatusFilter] = useState(filters.status || 'all');
 
     // Items arrays for Select label lookup
@@ -94,14 +95,27 @@ export default function Index({ invoices, projects, summary, filters }: Props) {
                             <TableHeader><TableRow>
                                 <TableHead>Invoice #</TableHead><TableHead>Project</TableHead><TableHead>Progress</TableHead>
                                 <TableHead className="text-right">Subtotal</TableHead><TableHead className="text-right">Retention</TableHead>
-                                <TableHead className="text-right">Total</TableHead><TableHead>Status</TableHead><TableHead>Due</TableHead>
+                                <TableHead className="text-right">Total</TableHead><TableHead>Status</TableHead><TableHead>Due</TableHead><TableHead className="text-right">Action</TableHead>
                             </TableRow></TableHeader>
                             <TableBody>
                                 {invoices.data.length === 0 ? (
-                                    <TableRow><TableCell colSpan={8} className="text-center text-gray-500 py-8">No invoices.</TableCell></TableRow>
+                                    <TableRow><TableCell colSpan={9} className="text-center text-gray-500 py-8">No invoices.</TableCell></TableRow>
                                 ) : invoices.data.map((inv) => {
                                     const cfg = statusConfig[inv.status] || statusConfig.draft;
                                     const isOverdue = inv.due_date && new Date(inv.due_date) < new Date() && inv.status !== 'paid';
+                                    const roles: string[] = ((auth?.roles || []) as any[]).map(r => (typeof r === 'string' ? r : r.name || '').toLowerCase());
+                                    const userType = (auth?.user?.user_type || '').toLowerCase();
+
+                                    const isExecutive = userType === 'admin' 
+                                        || userType === 'super_admin' 
+                                        || userType === 'project_manager'
+                                        || roles.some(r => ['super admin', 'admin', 'project manager', 'executive'].includes(r));
+
+                                    const isContractorAdmin = !isExecutive && (
+                                        userType === 'contractor' 
+                                        || auth?.user?.contractor_id !== null 
+                                        || roles.some(r => r.includes('contractor'))
+                                    );
                                     return (
                                         <TableRow key={inv.id} className={isOverdue ? 'bg-red-50' : ''}>
                                             <TableCell><Link href={route('finance.show', inv.ulid)} className="font-medium text-blue-600 hover:underline">{inv.invoice_number}</Link></TableCell>
@@ -112,6 +126,21 @@ export default function Index({ invoices, projects, summary, filters }: Props) {
                                             <TableCell className="text-right font-medium">{formatCurrency(inv.total_amount)}</TableCell>
                                             <TableCell><Badge variant={cfg.variant}>{cfg.label}</Badge>{isOverdue && inv.status !== 'overdue' && <AlertTriangle className="inline ml-1 h-4 w-4 text-red-500" />}</TableCell>
                                             <TableCell className="text-gray-500">{inv.due_date ? new Date(inv.due_date).toLocaleDateString() : '-'}</TableCell>
+                                            <TableCell className="text-right">
+                                                {inv.status === 'payment_sent' && isContractorAdmin ? (
+                                                    <Button 
+                                                        size="sm" 
+                                                        className="bg-emerald-600 hover:bg-emerald-700 text-white text-xs h-7 px-2.5 shadow-sm"
+                                                        onClick={() => router.patch(route('finance.confirm-payment', inv.ulid))}
+                                                    >
+                                                        Confirm Receipt
+                                                    </Button>
+                                                ) : (
+                                                    <Link href={route('finance.show', inv.ulid)}>
+                                                        <Button size="sm" variant="ghost" className="text-xs h-7 px-2">View</Button>
+                                                    </Link>
+                                                )}
+                                            </TableCell>
                                         </TableRow>
                                     );
                                 })}
diff --git a/Modules/FinancialManagement/resources/js/Pages/Invoices/Show.tsx b/Modules/FinancialManagement/resources/js/Pages/Invoices/Show.tsx
index 0b96c5e..10570ca 100644
--- a/Modules/FinancialManagement/resources/js/Pages/Invoices/Show.tsx
+++ b/Modules/FinancialManagement/resources/js/Pages/Invoices/Show.tsx
@@ -31,7 +31,9 @@ const formatCurrency = (v: string | number) => new Intl.NumberFormat('en-PH', {
 const statusConfig: Record<string, { variant: 'default' | 'secondary' | 'destructive' | 'outline'; label: string }> = {
     draft: { variant: 'outline', label: 'Draft' }, submitted: { variant: 'secondary', label: 'Submitted' },
     approved: { variant: 'default', label: 'Approved' }, rejected: { variant: 'destructive', label: 'Rejected' },
-    sent: { variant: 'secondary', label: 'Sent' }, partially_paid: { variant: 'outline', label: 'Partially Paid' },
+    sent: { variant: 'secondary', label: 'Sent' },
+    payment_sent: { variant: 'secondary', label: 'Payment Sent (Pending Confirmation)' },
+    partially_paid: { variant: 'outline', label: 'Partially Paid' },
     paid: { variant: 'default', label: 'Paid' }, overdue: { variant: 'destructive', label: 'Overdue' },
 };
 
@@ -42,8 +44,16 @@ export default function Show({ invoice }: Props) {
     const cfg = statusConfig[invoice.status] || statusConfig.draft;
     const balanceDue = Number(invoice.total_amount) - Number(invoice.paid_amount);
 
-    const isHigherUp = auth?.user?.user_type === 'admin' || 
-                       auth?.user?.roles?.some(r => ['Super Admin', 'admin'].includes(r.name));
+    const roles: string[] = ((auth?.roles || []) as any[]).map(r => (typeof r === 'string' ? r : r.name || '').toLowerCase());
+    const userType = (auth?.user?.user_type || '').toLowerCase();
+
+    const isHigherUp = userType === 'admin' || userType === 'super_admin' || userType === 'project_manager' || roles.some(r => ['super admin', 'admin', 'project manager', 'executive'].includes(r));
+
+    const isContractorAdmin = !isHigherUp && (
+        userType === 'contractor' 
+        || auth?.user?.contractor_id !== null 
+        || roles.some(r => r.includes('contractor'))
+    );
 
     const submitPayment = (e: FormEvent) => {
         e.preventDefault();
@@ -128,6 +138,52 @@ export default function Show({ invoice }: Props) {
                     </Card>
                 )}
 
+                {/* Executive Payment Release Banner */}
+                {isHigherUp && (invoice.status === 'approved' || invoice.status === 'sent' || invoice.status === 'partially_paid') && (
+                    <Card className="border-purple-200 bg-purple-50/60 shadow-xs">
+                        <CardContent className="p-4 flex items-center justify-between">
+                            <div className="flex items-center gap-3">
+                                <div className="p-2 bg-purple-100 text-purple-700 rounded-lg shrink-0">
+                                    <DollarSign className="h-5 w-5" />
+                                </div>
+                                <div>
+                                    <h4 className="font-semibold text-purple-900 text-sm">Release Invoice Payment</h4>
+                                    <p className="text-xs text-purple-700">Record payment sent to contractor. Contractor must confirm receipt to finalize payment analytics.</p>
+                                </div>
+                            </div>
+                            <Button 
+                                className="bg-purple-600 hover:bg-purple-700 text-white font-semibold shadow-sm hover:shadow shrink-0 ml-4"
+                                onClick={() => router.post(route('finance.payment', invoice.ulid), { amount: invoice.total_amount })}
+                            >
+                                <DollarSign className="mr-2 h-4 w-4" /> Mark Payment Sent
+                            </Button>
+                        </CardContent>
+                    </Card>
+                )}
+
+                {/* Contractor Payment Confirmation Banner */}
+                {invoice.status === 'payment_sent' && isContractorAdmin && (
+                    <Card className="border-emerald-200 bg-emerald-50/60 shadow-xs">
+                        <CardContent className="p-4 flex items-center justify-between">
+                            <div className="flex items-center gap-3">
+                                <div className="p-2 bg-emerald-100 text-emerald-700 rounded-lg shrink-0">
+                                    <CheckCircle2 className="h-5 w-5" />
+                                </div>
+                                <div>
+                                    <h4 className="font-semibold text-emerald-900 text-sm">Payment Sent by Executive</h4>
+                                    <p className="text-xs text-emerald-700">Please verify receipt of {formatCurrency(invoice.total_amount)} and confirm payment receipt to update dashboard totals.</p>
+                                </div>
+                            </div>
+                            <Button 
+                                className="bg-emerald-600 hover:bg-emerald-700 text-white font-semibold shadow-sm hover:shadow shrink-0 ml-4" 
+                                onClick={() => router.patch(route('finance.confirm-payment', invoice.ulid))}
+                            >
+                                <CheckCircle2 className="mr-2 h-4 w-4" /> Confirm Payment Receipt
+                            </Button>
+                        </CardContent>
+                    </Card>
+                )}
+
                 {/* Summary */}
                 <div className="grid grid-cols-4 gap-4 text-sm">
                     <Card><CardContent className="pt-4"><p className="text-xs text-gray-500">Progress</p><p className="text-lg font-bold">{Number(invoice.billed_percentage).toFixed(1)}%</p></CardContent></Card>
diff --git a/Modules/FinancialManagement/resources/js/Pages/Retention/Index.tsx b/Modules/FinancialManagement/resources/js/Pages/Retention/Index.tsx
index c7817a7..7e6b53c 100644
--- a/Modules/FinancialManagement/resources/js/Pages/Retention/Index.tsx
+++ b/Modules/FinancialManagement/resources/js/Pages/Retention/Index.tsx
@@ -7,7 +7,7 @@ import { DataTableToolbar } from '@/Components/DataTableToolbar';
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/Components/ui/select';
 import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@/Components/ui/table';
 import { PaginatedData, PageProps } from '@/types';
-import { CreditCard, Eye, Upload, Wallet } from 'lucide-react';
+import { CheckCircle2, CreditCard, Eye, Upload, Wallet } from 'lucide-react';
 import { FormEvent, useMemo, useRef, useState } from 'react';
 import { Dialog, DialogContent, DialogHeader, DialogTitle } from '@/Components/ui/dialog';
 import { Input } from '@/Components/ui/input';
@@ -22,7 +22,7 @@ interface RetEntry {
 interface Props extends PageProps {
     entries: PaginatedData<RetEntry>;
     projects: { id: number; ulid: string; name: string; code: string; status?: string }[];
-    projectTotals: Record<string, { held: number; released: number; balance: number; pending_release_ulid?: string; pending_release_amount?: number; pending_release_media_path?: string | null; pending_release_media_name?: string | null }>;
+    projectTotals: Record<string, { held: number; released: number; balance: number; pending_release_ulid?: string; pending_release_status?: string; pending_release_amount?: number; pending_release_media_path?: string | null; pending_release_media_name?: string | null }>;
     filters: { project_id?: string };
 }
 
@@ -39,8 +39,23 @@ export default function Index({ entries, projects, projectTotals, filters }: Pro
     const mediaRef = useRef<HTMLInputElement>(null);
     const markPaidMediaRef = useRef<HTMLInputElement>(null);
 
-    const isApprover = auth?.user?.user_type === 'admin' ||
-        (auth?.user as any)?.roles?.some((r: any) => ['Super Admin', 'admin', 'Admin', 'Project Manager', 'project_manager'].includes(r.name));
+    const roles: string[] = ((auth?.roles || []) as any[]).map(r => (typeof r === 'string' ? r : r.name || '').toLowerCase());
+    const userType = (auth?.user?.user_type || '').toLowerCase();
+
+    const isExecutive = userType === 'admin' 
+        || userType === 'super_admin' 
+        || userType === 'project_manager'
+        || roles.some(r => ['super admin', 'admin', 'project manager', 'executive'].includes(r));
+
+    const isApprover = isExecutive;
+
+    const isContractorAdmin = !isExecutive && (
+        userType === 'contractor' 
+        || auth?.user?.contractor_id !== null 
+        || roles.some(r => r.includes('contractor'))
+    );
+
+    const isContractor = isContractorAdmin;
 
     // Items arrays for Select label lookup
     const projectFilterItems = useMemo(() => [{ value: 'all', label: 'All Projects' }, ...projects.map(p => ({ value: p.ulid, label: p.name }))], [projects]);
@@ -124,11 +139,16 @@ export default function Index({ entries, projects, projectTotals, filters }: Pro
                                                                 <Eye className="mr-1 h-3.5 w-3.5" /> View Proof
                                                             </Button>
                                                         )}
-                                                        {isApprover && (
-                                                            <Button size="sm" onClick={() => router.patch(route('retention.paid', t.pending_release_ulid))}>
+                                                        {isApprover && t.pending_release_status !== 'payment_sent' && (
+                                                            <Button size="sm" onClick={() => setMarkPaidEntry({ id: 0, ulid: t.pending_release_ulid!, type: 'credit', amount: String(t.pending_release_amount || 0), media_path: t.pending_release_media_path, media_original_name: t.pending_release_media_name, created_at: '' })}>
                                                                 <CreditCard className="mr-1 h-3.5 w-3.5" /> Mark as Paid
                                                             </Button>
                                                         )}
+                                                        {isContractorAdmin && t.pending_release_status && t.pending_release_status !== 'paid' && (
+                                                            <Button size="sm" className="bg-emerald-600 hover:bg-emerald-700 text-white font-semibold shadow-xs" onClick={() => router.patch(route('retention.confirm', t.pending_release_ulid))}>
+                                                                <CheckCircle2 className="mr-1 h-3.5 w-3.5" /> Confirm Receipt
+                                                            </Button>
+                                                        )}
                                                     </>
                                                 )}
                                             </div>
@@ -177,15 +197,24 @@ export default function Index({ entries, projects, projectTotals, filters }: Pro
                                         <TableCell className="text-right font-medium tabular-nums">{formatCurrency(e.amount)}</TableCell>
                                         <TableCell className="text-gray-500">{e.description || '-'}</TableCell>
                                         <TableCell className="text-gray-500">{new Date(e.created_at).toLocaleDateString()}</TableCell>
-                                        <TableCell onClick={(e) => e.stopPropagation()}>
-                                            {e.media_path ? (
-                                                <Button size="sm" variant="ghost" onClick={() => setMediaViewerEntry(e)}>
-                                                    <Eye className="mr-1 h-3.5 w-3.5" /> View
-                                                </Button>
-                                            ) : (
-                                                <span className="text-xs text-gray-400">—</span>
-                                            )}
-                                        </TableCell>
+                                         <TableCell onClick={(evt) => evt.stopPropagation()}>
+                                             <div className="flex items-center justify-end gap-1">
+                                                 {e.media_path && (
+                                                     <Button size="sm" variant="ghost" onClick={() => setMediaViewerEntry(e)}>
+                                                         <Eye className="mr-1 h-3.5 w-3.5" /> View
+                                                     </Button>
+                                                 )}
+                                                 {isContractorAdmin && e.type === 'credit' && e.status !== 'paid' && (
+                                                     <Button 
+                                                         size="sm" 
+                                                         className="bg-emerald-600 hover:bg-emerald-700 text-white font-semibold text-xs h-7 px-2.5 shadow-xs"
+                                                         onClick={() => router.patch(route('retention.confirm', e.ulid))}
+                                                     >
+                                                         <CheckCircle2 className="mr-1 h-3.5 w-3.5" /> Confirm Receipt
+                                                     </Button>
+                                                 )}
+                                             </div>
+                                         </TableCell>
                                     </TableRow>
                                 ))}
                             </TableBody>
@@ -245,7 +274,7 @@ export default function Index({ entries, projects, projectTotals, filters }: Pro
                                     )}
                                 </div>
                                 <div className="flex gap-2">
-                                    {isApprover && (selectedEntry.type === 'debit' || (selectedEntry.type === 'credit' && selectedEntry.status === 'submitted')) && (
+                                    {isApprover && (selectedEntry.type === 'debit' || (selectedEntry.type === 'credit' && ['submitted', 'posted'].includes(selectedEntry.status || ''))) && (
                                         <Button 
                                             size="sm" 
                                             className="bg-emerald-600 hover:bg-emerald-700 text-white"
@@ -258,6 +287,19 @@ export default function Index({ entries, projects, projectTotals, filters }: Pro
                                             <CreditCard className="mr-1.5 h-3.5 w-3.5" /> Mark as Paid
                                         </Button>
                                     )}
+                                    {isContractorAdmin && selectedEntry.type === 'credit' && selectedEntry.status !== 'paid' && (
+                                        <Button 
+                                            size="sm" 
+                                            className="bg-emerald-600 hover:bg-emerald-700 text-white font-semibold"
+                                            onClick={() => {
+                                                router.patch(route('retention.confirm', selectedEntry.ulid), {}, {
+                                                    onSuccess: () => setSelectedEntry(null)
+                                                });
+                                            }}
+                                        >
+                                            <CheckCircle2 className="mr-1.5 h-3.5 w-3.5" /> Confirm Payment Receipt
+                                        </Button>
+                                    )}
                                     <Button variant="ghost" size="sm" onClick={() => setSelectedEntry(null)}>
                                         Close
                                     </Button>
diff --git a/Modules/FinancialManagement/routes/web.php b/Modules/FinancialManagement/routes/web.php
index ccd4bc5..0cd7013 100644
--- a/Modules/FinancialManagement/routes/web.php
+++ b/Modules/FinancialManagement/routes/web.php
@@ -16,11 +16,13 @@ Route::middleware(['web', 'auth', 'permission:finance.access'])->group(function
     Route::patch('finance/{invoice}/reject', [FinanceController::class, 'reject'])->name('finance.reject');
     Route::patch('finance/{invoice}/send', [FinanceController::class, 'send'])->name('finance.send');
     Route::post('finance/{invoice}/payment', [FinanceController::class, 'recordPayment'])->name('finance.payment');
+    Route::patch('finance/{invoice}/confirm-payment', [FinanceController::class, 'confirmPayment'])->name('finance.confirm-payment');
 
     // Retention
     Route::get('retention', [FinanceController::class, 'retention'])->name('retention.index');
     Route::post('retention/projects/{project}/submit', [FinanceController::class, 'submitRetentionRelease'])->name('retention.submit');
     Route::patch('retention/{retentionEntry}/paid', [FinanceController::class, 'markRetentionAsPaid'])->name('retention.paid');
+    Route::patch('retention/{retentionEntry}/confirm', [FinanceController::class, 'confirmRetentionPayment'])->name('retention.confirm');
     Route::get('retention/{retentionEntry}/media/view', [FinanceController::class, 'viewRetentionMedia'])->name('retention.media.view');
 });
 
diff --git a/Modules/Labors/resources/js/Pages/Index.tsx b/Modules/Labors/resources/js/Pages/Index.tsx
index 5311740..7f9ab0b 100644
--- a/Modules/Labors/resources/js/Pages/Index.tsx
+++ b/Modules/Labors/resources/js/Pages/Index.tsx
@@ -16,8 +16,8 @@ import {
     Select, SelectContent, SelectItem, SelectTrigger, SelectValue,
 } from '@/Components/ui/select';
 import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/Components/ui/tabs';
-import { Users, Plus, Pencil, Trash2, ShieldAlert, Sparkles, BookOpen, Check, BadgeAlert } from 'lucide-react';
-import { useState } from 'react';
+import { Users, Plus, Pencil, Trash2, ShieldAlert, Sparkles, BookOpen, Check, Layers, HardHat, Wrench, Zap, Hammer } from 'lucide-react';
+import { useState, useEffect } from 'react';
 
 interface Skill {
     id: number;
@@ -36,6 +36,124 @@ interface Labor {
     skills: Skill[];
 }
 
+export interface LaborBundleItem {
+    labor_name: string;
+    category: 'skilled' | 'unskilled';
+    default_hours?: number;
+    estimated_hourly_rate?: number;
+    rate_per_sqm: number;
+}
+
+export interface JobBundle {
+    id: string;
+    name: string;
+    job_type: string;
+    category: string;
+    description: string;
+    badge_color?: string;
+    items: LaborBundleItem[];
+}
+
+const INITIAL_PREDEFINED_BUNDLES: JobBundle[] = [
+    {
+        id: 'excavation-crew',
+        name: 'Excavation & Earthworks Crew Package',
+        job_type: 'Excavation & Earthworks',
+        category: 'Earthworks & Foundation',
+        badge_color: 'bg-amber-100 text-amber-800 border-amber-200',
+        description: 'Complete manpower package for site excavation, trenching, soil hauling, and ground leveling.',
+        items: [
+            { labor_name: 'Excavator Operator', category: 'skilled', rate_per_sqm: 80 },
+            { labor_name: 'Heavy Equipment Hand', category: 'skilled', rate_per_sqm: 40 },
+            { labor_name: 'Earthwork Laborer', category: 'unskilled', rate_per_sqm: 30 },
+            { labor_name: 'Flagman & Site Safety', category: 'unskilled', rate_per_sqm: 15 },
+        ]
+    },
+    {
+        id: 'steelworks-crew',
+        name: 'Steelworks & Rebar Crew Package',
+        job_type: 'Steelworks & Structural Rebar',
+        category: 'Structural & Reinforcement',
+        badge_color: 'bg-slate-100 text-slate-800 border-slate-200',
+        description: 'Specialized crew for rebar cutting, bending, column/beam tying, and structural steel welding.',
+        items: [
+            { labor_name: 'Master Welder', category: 'skilled', rate_per_sqm: 110 },
+            { labor_name: 'Steel Fixer', category: 'skilled', rate_per_sqm: 95 },
+            { labor_name: 'Rebar Craftsman', category: 'skilled', rate_per_sqm: 75 },
+            { labor_name: 'Rigging Helper', category: 'unskilled', rate_per_sqm: 40 },
+        ]
+    },
+    {
+        id: 'electricity-crew',
+        name: 'Electricity & MEP Rough-In Package',
+        job_type: 'Electrical & MEP',
+        category: 'Electrical & Utility Systems',
+        badge_color: 'bg-yellow-100 text-yellow-800 border-yellow-200',
+        description: 'Crew for main feeder line installation, conduit laying, breaker panel wiring, and rough-in.',
+        items: [
+            { labor_name: 'Master Electrician', category: 'skilled', rate_per_sqm: 90 },
+            { labor_name: 'Journeyman Electrician', category: 'skilled', rate_per_sqm: 75 },
+            { labor_name: 'Cable Puller', category: 'unskilled', rate_per_sqm: 45 },
+            { labor_name: 'Conduit Installer', category: 'skilled', rate_per_sqm: 40 },
+        ]
+    },
+    {
+        id: 'masonry-crew',
+        name: 'Masonry & Concrete Pouring Package',
+        job_type: 'Masonry & Civil Works',
+        category: 'Masonry & Concrete',
+        badge_color: 'bg-emerald-100 text-emerald-800 border-emerald-200',
+        description: 'Full manpower setup for CHB block laying, wall plastering, slab pouring, and concrete finishing.',
+        items: [
+            { labor_name: 'Master Mason', category: 'skilled', rate_per_sqm: 110 },
+            { labor_name: 'Concrete Finisher', category: 'skilled', rate_per_sqm: 85 },
+            { labor_name: 'Masonry Helper', category: 'unskilled', rate_per_sqm: 55 },
+            { labor_name: 'Mixer Attendant', category: 'unskilled', rate_per_sqm: 30 },
+        ]
+    },
+    {
+        id: 'plumbing-crew',
+        name: 'Plumbing & Piping Package',
+        job_type: 'Plumbing & Sanitary',
+        category: 'Plumbing & Piping',
+        badge_color: 'bg-blue-100 text-blue-800 border-blue-200',
+        description: 'Specialized crew for potable water supply distribution, DWV sanitary piping, and fixture rough-in.',
+        items: [
+            { labor_name: 'Master Plumber', category: 'skilled', rate_per_sqm: 95 },
+            { labor_name: 'Pipefitter', category: 'skilled', rate_per_sqm: 75 },
+            { labor_name: 'Drainage Installer', category: 'skilled', rate_per_sqm: 50 },
+            { labor_name: 'Plumbing Helper', category: 'unskilled', rate_per_sqm: 30 },
+        ]
+    },
+    {
+        id: 'carpentry-crew',
+        name: 'Carpentry & Formwork Package',
+        job_type: 'Carpentry & Formwork',
+        category: 'Formwork & Framing',
+        badge_color: 'bg-orange-100 text-orange-800 border-orange-200',
+        description: 'Team for column/beam formwork fabrication, scaffolding erection, and temporary shoring.',
+        items: [
+            { labor_name: 'Master Carpenter', category: 'skilled', rate_per_sqm: 100 },
+            { labor_name: 'Formwork Installer', category: 'skilled', rate_per_sqm: 85 },
+            { labor_name: 'Scaffold Erector', category: 'skilled', rate_per_sqm: 55 },
+            { labor_name: 'Carpentry Helper', category: 'unskilled', rate_per_sqm: 35 },
+        ]
+    },
+    {
+        id: 'painting-crew',
+        name: 'Painting & Architectural Finishing Package',
+        job_type: 'Painting & Finishing',
+        category: 'Architectural & Finishing',
+        badge_color: 'bg-purple-100 text-purple-800 border-purple-200',
+        description: 'Crew for surface preparation, skimcoating, primer application, and topcoat architectural painting.',
+        items: [
+            { labor_name: 'Lead Painter', category: 'skilled', rate_per_sqm: 85 },
+            { labor_name: 'Surface Applicator', category: 'skilled', rate_per_sqm: 65 },
+            { labor_name: 'Sanding & Skimcoat Helper', category: 'unskilled', rate_per_sqm: 40 },
+        ]
+    }
+];
+
 interface Props {
     labors: Labor[];
     skills: Skill[];
@@ -43,7 +161,13 @@ interface Props {
 
 export default function Index({ labors = [], skills = [] }: Props) {
     // Tab State
-    const [activeTab, setActiveTab] = useState('labor');
+    const [activeTab, setActiveTab] = useState(() => {
+        if (typeof window !== 'undefined') {
+            const urlParams = new URLSearchParams(window.location.search);
+            return urlParams.get('tab') || 'labor';
+        }
+        return 'labor';
+    });
 
     // Dialog state for Labor
     const [laborModalOpen, setLaborModalOpen] = useState(false);
@@ -53,13 +177,50 @@ export default function Index({ labors = [], skills = [] }: Props) {
     const [skillModalOpen, setSkillModalOpen] = useState(false);
     const [editingSkill, setEditingSkill] = useState<Skill | null>(null);
 
+    // Job Bundles State
+    const [bundles, setBundles] = useState<JobBundle[]>(() => {
+        try {
+            const saved = localStorage.getItem('gsb_custom_labor_bundles');
+            if (saved) return JSON.parse(saved);
+        } catch (e) {
+            console.error(e);
+        }
+        return INITIAL_PREDEFINED_BUNDLES;
+    });
+
+    const [bundleModalOpen, setBundleModalOpen] = useState(false);
+    const [editingBundle, setEditingBundle] = useState<JobBundle | null>(null);
+    const [bundleForm, setBundleForm] = useState<{
+        name: string;
+        job_type: string;
+        category: string;
+        description: string;
+        items: LaborBundleItem[];
+    }>({
+        name: '',
+        job_type: '',
+        category: 'General Construction',
+        description: '',
+        items: [
+            { labor_name: '', category: 'skilled', rate_per_sqm: 80 }
+        ]
+    });
+
+    useEffect(() => {
+        try {
+            localStorage.setItem('gsb_custom_labor_bundles', JSON.stringify(bundles));
+        } catch (e) {
+            console.error(e);
+        }
+    }, [bundles]);
+
     // Inertia forms
     const laborForm = useForm({
         name: '',
         category: 'skilled',
         hourly_rate: '',
         status: 'active',
-        skills: [] as number[], // selected skill IDs
+        skills: [] as number[],
     });
 
     const skillForm = useForm({
@@ -67,7 +228,6 @@ export default function Index({ labors = [], skills = [] }: Props) {
         description: '',
     });
 
-    // Formatting currency
     const formatCurrency = (v: string | number) => {
         return new Intl.NumberFormat('en-PH', { style: 'currency', currency: 'PHP' }).format(Number(v));
     };
@@ -170,7 +330,6 @@ export default function Index({ labors = [], skills = [] }: Props) {
         }
     };
 
-    // Helper to toggle skill in form state
     const toggleSkillSelection = (skillId: number) => {
         const current = [...laborForm.data.skills];
         const index = current.indexOf(skillId);
@@ -182,61 +341,127 @@ export default function Index({ labors = [], skills = [] }: Props) {
         laborForm.setData('skills', current);
     };
 
+    // Job Bundles CRUD Actions
+    const openAddBundle = () => {
+        setEditingBundle(null);
+        setBundleForm({
+            name: '',
+            job_type: '',
+            category: 'Civil & Construction',
+            description: '',
+            items: [
+                { labor_name: 'Lead Craftsman', category: 'skilled', rate_per_sqm: 120 },
+                { labor_name: 'General Assistant', category: 'unskilled', rate_per_sqm: 60 }
+            ]
+        });
+        setBundleModalOpen(true);
+    };
+
+    const openEditBundle = (bundle: JobBundle) => {
+        setEditingBundle(bundle);
+        setBundleForm({
+            name: bundle.name,
+            job_type: bundle.job_type,
+            category: bundle.category,
+            description: bundle.description,
+            items: bundle.items.map(item => ({ ...item }))
+        });
+        setBundleModalOpen(true);
+    };
+
+    const handleBundleSave = (e: React.FormEvent) => {
+        e.preventDefault();
+        if (!bundleForm.name || !bundleForm.job_type) return;
+
+        if (editingBundle) {
+            setBundles(bundles.map(b => b.id === editingBundle.id ? {
+                ...editingBundle,
+                name: bundleForm.name,
+                job_type: bundleForm.job_type,
+                category: bundleForm.category,
+                description: bundleForm.description,
+                items: bundleForm.items
+            } : b));
+        } else {
+            const newBundle: JobBundle = {
+                id: 'bundle-' + Date.now(),
+                name: bundleForm.name,
+                job_type: bundleForm.job_type,
+                category: bundleForm.category,
+                description: bundleForm.description,
+                badge_color: 'bg-indigo-100 text-indigo-800 border-indigo-200',
+                items: bundleForm.items
+            };
+            setBundles([...bundles, newBundle]);
+        }
+        setBundleModalOpen(false);
+    };
+
+    const handleBundleDelete = (id: string) => {
+        if (confirm('Are you sure you want to delete this job bundle from the catalog?')) {
+            setBundles(bundles.filter(b => b.id !== id));
+        }
+    };
+
+    const addBundleItemRow = () => {
+        setBundleForm({
+            ...bundleForm,
+            items: [...bundleForm.items, { labor_name: '', category: 'skilled', rate_per_sqm: 80 }]
+        });
+    };
+
+    const removeBundleItemRow = (idx: number) => {
+        if (bundleForm.items.length <= 1) return;
+        setBundleForm({
+            ...bundleForm,
+            items: bundleForm.items.filter((_, i) => i !== idx)
+        });
+    };
+
+    const updateBundleItemRow = (idx: number, field: string, value: any) => {
+        const updated = bundleForm.items.map((item, i) => i === idx ? { ...item, [field]: value } : item);
+        setBundleForm({ ...bundleForm, items: updated });
+    };
+
     return (
         <AuthenticatedLayout
             header={
                 <div className="flex items-center justify-between">
                     <div>
-                        <h2 className="text-xl font-bold leading-tight text-slate-800 flex items-center gap-2">
-                            <Sparkles className="h-5 w-5 text-emerald-500" /> Labor Capability & Skill Registry
+                        <h2 className="text-xl font-bold leading-tight text-slate-800">
+                            Labor Catalog & Job Crew Bundles
                         </h2>
-                        <p className="text-xs text-slate-500 mt-0.5">Manage labor records, categories, capability skillsets, and hourly rates</p>
+                        <p className="text-xs text-slate-500 mt-0.5">Manage single labor trade profiles, skill dictionary, and predefined activity crew bundles</p>
                     </div>
                 </div>
             }
         >
-            <Head title="Labor Registry" />
+            <Head title="Labor Catalog & Job Bundles" />
 
             <div className="py-6 min-h-[calc(100vh-65px)] bg-slate-50/50">
                 <div className="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8">
                     <Tabs value={activeTab} onValueChange={setActiveTab} className="space-y-6">
-                        <div className="flex items-center justify-between">
-                            <TabsList className="bg-slate-100 p-1 rounded-lg border border-slate-200">
-                                <TabsTrigger value="labor" className="flex items-center gap-2 px-4 py-2 rounded-md data-[state=active]:bg-white data-[state=active]:shadow-sm">
-                                    <Users className="h-4 w-4" /> Labor Profiles
-                                </TabsTrigger>
-                                <TabsTrigger value="skill" className="flex items-center gap-2 px-4 py-2 rounded-md data-[state=active]:bg-white data-[state=active]:shadow-sm">
-                                    <BookOpen className="h-4 w-4" /> Skill Dictionary
-                                </TabsTrigger>
-                            </TabsList>
 
-                            {activeTab === 'labor' && (
-                                <Button onClick={openAddLabor} className="bg-emerald-600 hover:bg-emerald-700 text-white font-medium shadow-sm transition-colors">
-                                    <Plus className="mr-2 h-4 w-4" /> Add Labor Record
-                                </Button>
-                            )}
-
-                            {activeTab === 'skill' && (
-                                <Button onClick={openAddSkill} className="bg-emerald-600 hover:bg-emerald-700 text-white font-medium shadow-sm transition-colors">
-                                    <Plus className="mr-2 h-4 w-4" /> Add Master Skill
-                                </Button>
-                            )}
-                        </div>
 
                         {/* Labor Profiles Tab */}
                         <TabsContent value="labor" className="mt-0">
                             <Card className="border-slate-200 shadow-sm overflow-hidden bg-white">
-                                <CardHeader className="bg-slate-50/50 border-b border-slate-100 py-4 px-6">
-                                    <CardTitle className="text-md font-semibold text-slate-800">Active Labor Profiles</CardTitle>
-                                    <CardDescription className="text-xs text-slate-500">
-                                        Standards for labor grades, category classification, and active capability skillsets.
-                                    </CardDescription>
+                                <CardHeader className="bg-slate-50/50 border-b border-slate-100 py-4 px-6 flex flex-row items-center justify-between">
+                                    <div>
+                                        <CardTitle className="text-md font-semibold text-slate-800">Single Labor Profiles</CardTitle>
+                                        <CardDescription className="text-xs text-slate-500">
+                                            Individual labor records, classification grades, standard hourly rates, and skills.
+                                        </CardDescription>
+                                    </div>
+                                    <Button onClick={openAddLabor} className="bg-emerald-600 hover:bg-emerald-700 text-white font-medium text-xs">
+                                        <Plus className="mr-2 h-4 w-4" /> Add Labor Profile
+                                    </Button>
                                 </CardHeader>
                                 <CardContent className="p-0">
                                     <Table>
                                         <TableHeader className="bg-slate-50/30">
                                             <TableRow>
-                                                <TableHead className="font-semibold text-slate-700">Labor Name</TableHead>
+                                                <TableHead className="font-semibold text-slate-700">Labor Trade Name</TableHead>
                                                 <TableHead className="font-semibold text-slate-700">Category</TableHead>
                                                 <TableHead className="font-semibold text-slate-700">Standard Hourly Rate</TableHead>
                                                 <TableHead className="font-semibold text-slate-700">Grouped Skillsets</TableHead>
@@ -254,7 +479,9 @@ export default function Index({ labors = [], skills = [] }: Props) {
                                             ) : (
                                                 labors.map((labor) => (
                                                     <TableRow key={labor.id} className="hover:bg-slate-50/20 transition-colors">
-                                                        <TableCell className="font-semibold text-slate-900">{labor.name}</TableCell>
+                                                        <TableCell className="font-semibold text-slate-900">
+                                                            {labor.name}
+                                                        </TableCell>
                                                         <TableCell>
                                                             <Badge className={
                                                                 labor.category === 'skilled'
@@ -306,14 +533,105 @@ export default function Index({ labors = [], skills = [] }: Props) {
                             </Card>
                         </TabsContent>
 
+                        {/* JOB BUNDLES & CREW PACKAGES TAB */}
+                        <TabsContent value="bundles" className="mt-0">
+                            <Card className="border-slate-200 shadow-sm overflow-hidden bg-white">
+                                <CardHeader className="bg-slate-50/50 border-b border-slate-100 py-4 px-6 flex flex-row items-center justify-between">
+                                    <div>
+                                        <CardTitle className="text-md font-semibold text-slate-800">Job Bundles & Crew Packages</CardTitle>
+                                        <CardDescription className="text-xs text-slate-500">
+                                            Manage your predefined composite labor crew packages and activity bundles.
+                                        </CardDescription>
+                                    </div>
+                                    <Button onClick={openAddBundle} className="bg-indigo-600 hover:bg-indigo-700 text-white font-medium text-xs">
+                                        <Plus className="mr-2 h-4 w-4" /> Create Bundle
+                                    </Button>
+                                </CardHeader>
+                                <CardContent className="p-0">
+                                    <Table>
+                                        <TableHeader className="bg-slate-50/30">
+                                            <TableRow>
+                                                <TableHead className="font-semibold text-slate-700">Bundle Name</TableHead>
+                                                <TableHead className="font-semibold text-slate-700">Job Activity Type</TableHead>
+                                                <TableHead className="font-semibold text-slate-700">Category</TableHead>
+                                                <TableHead className="font-semibold text-slate-700 text-right">Est. Crew Rate (₱/m²)</TableHead>
+                                                <TableHead className="font-semibold text-slate-700">BOM / Trade Components</TableHead>
+                                                <TableHead className="font-semibold text-slate-700 text-right">Actions</TableHead>
+                                            </TableRow>
+                                        </TableHeader>
+                                        <TableBody>
+                                            {bundles.length === 0 ? (
+                                                <TableRow>
+                                                    <TableCell colSpan={6} className="h-24 text-center text-slate-400 italic">
+                                                        No job bundles defined yet.
+                                                    </TableCell>
+                                                </TableRow>
+                                            ) : (
+                                                bundles.map((bundle) => {
+                                                    const estRatePerSqm = bundle.items.reduce((sum, item) => sum + (item.rate_per_sqm || (item.default_hours ? item.default_hours * (item.estimated_hourly_rate || 0) : 0)), 0);
+
+                                                    return (
+                                                        <TableRow key={bundle.id} className="hover:bg-slate-50/20 transition-colors">
+                                                            <TableCell className="font-semibold text-slate-900">
+                                                                <div>
+                                                                    <div className="font-bold text-slate-900">{bundle.name}</div>
+                                                                    {bundle.description && (
+                                                                        <p className="text-[11px] text-slate-500 font-normal mt-0.5 max-w-xs truncate">{bundle.description}</p>
+                                                                    )}
+                                                                </div>
+                                                            </TableCell>
+                                                            <TableCell>
+                                                                <Badge variant="outline" className={`font-medium text-xs ${bundle.badge_color || 'bg-indigo-50 text-indigo-700 border-indigo-100'}`}>
+                                                                    {bundle.job_type}
+                                                                </Badge>
+                                                            </TableCell>
+                                                            <TableCell className="text-slate-600 text-xs font-medium">{bundle.category}</TableCell>
+                                                            <TableCell className="text-right font-mono font-bold text-slate-900 tabular-nums">
+                                                                {formatCurrency(estRatePerSqm)} / m²
+                                                            </TableCell>
+                                                            <TableCell>
+                                                                <div className="flex flex-col gap-1 max-w-[320px]">
+                                                                    {bundle.items.map((item, idx) => (
+                                                                        <span key={idx} className="text-[11px] text-slate-700 bg-slate-100/80 px-2 py-0.5 rounded border border-slate-200/60 inline-flex items-center justify-between gap-2">
+                                                                            <span className="font-medium">{item.labor_name}</span>
+                                                                            <span className="font-mono text-slate-600 text-[10px]">₱{item.rate_per_sqm || item.estimated_hourly_rate || 0} / m²</span>
+                                                                        </span>
+                                                                    ))}
+                                                                </div>
+                                                            </TableCell>
+                                                            <TableCell className="text-right">
+                                                                <div className="flex justify-end gap-1">
+                                                                    <Button variant="ghost" size="icon" onClick={() => openEditBundle(bundle)} className="h-8 w-8 text-slate-500 hover:text-slate-900 hover:bg-slate-100">
+                                                                        <Pencil className="h-4 w-4" />
+                                                                    </Button>
+                                                                    <Button variant="ghost" size="icon" onClick={() => handleBundleDelete(bundle.id)} className="h-8 w-8 text-rose-500 hover:text-rose-700 hover:bg-rose-50">
+                                                                        <Trash2 className="h-4 w-4" />
+                                                                    </Button>
+                                                                </div>
+                                                            </TableCell>
+                                                        </TableRow>
+                                                    );
+                                                })
+                                            )}
+                                        </TableBody>
+                                    </Table>
+                                </CardContent>
+                            </Card>
+                        </TabsContent>
+
                         {/* Skill Dictionary Tab */}
                         <TabsContent value="skill" className="mt-0">
                             <Card className="border-slate-200 shadow-sm overflow-hidden bg-white">
-                                <CardHeader className="bg-slate-50/50 border-b border-slate-100 py-4 px-6">
-                                    <CardTitle className="text-md font-semibold text-slate-800">Master Skill Dictionary</CardTitle>
-                                    <CardDescription className="text-xs text-slate-500">
-                                        Dictionary of construction trades, certifications, and specialized capabilities.
-                                    </CardDescription>
+                                <CardHeader className="bg-slate-50/50 border-b border-slate-100 py-4 px-6 flex flex-row items-center justify-between">
+                                    <div>
+                                        <CardTitle className="text-md font-semibold text-slate-800">Master Skill Dictionary</CardTitle>
+                                        <CardDescription className="text-xs text-slate-500">
+                                            Dictionary of construction trades, certifications, and specialized capabilities.
+                                        </CardDescription>
+                                    </div>
+                                    <Button onClick={openAddSkill} className="bg-emerald-600 hover:bg-emerald-700 text-white font-medium text-xs">
+                                        <Plus className="mr-2 h-4 w-4" /> Add Master Skill
+                                    </Button>
                                 </CardHeader>
                                 <CardContent className="p-0">
                                     <Table>
@@ -437,7 +755,6 @@ export default function Index({ labors = [], skills = [] }: Props) {
                             </Select>
                         </div>
 
-                        {/* Skillset Selector */}
                         <div className="space-y-1.5">
                             <Label className="text-slate-700 font-medium text-xs flex justify-between">
                                 <span>Grouped Skillsets</span>
@@ -483,6 +800,137 @@ export default function Index({ labors = [], skills = [] }: Props) {
                 </DialogContent>
             </Dialog>
 
+            {/* Job Bundle Modal */}
+            <Dialog open={bundleModalOpen} onOpenChange={setBundleModalOpen}>
+                <DialogContent className="sm:max-w-[640px] max-h-[90vh] flex flex-col p-0 gap-0">
+                    <DialogHeader className="px-6 py-4 border-b border-slate-100">
+                        <DialogTitle className="flex items-center gap-2 text-lg font-bold text-slate-800">
+                            <Layers className="h-5 w-5 text-indigo-600" />
+                            {editingBundle ? 'Edit Job Crew Bundle' : 'Create Job Crew Bundle'}
+                        </DialogTitle>
+                        <DialogDescription className="text-xs text-slate-500">
+                            Configure a predefined manpower crew package for specific job activities (excavation, steelworks, electricity, masonry, etc.).
+                        </DialogDescription>
+                    </DialogHeader>
+
+                    <form onSubmit={handleBundleSave} className="flex-1 overflow-y-auto p-6 space-y-4">
+                        <div className="grid grid-cols-2 gap-4">
+                            <div className="space-y-1">
+                                <Label htmlFor="bundle_name" className="text-slate-700 font-semibold text-xs">Package Name</Label>
+                                <Input
+                                    id="bundle_name"
+                                    value={bundleForm.name}
+                                    onChange={e => setBundleForm({ ...bundleForm, name: e.target.value })}
+                                    placeholder="e.g. Trench Excavation Crew Package"
+                                    required
+                                    className="border-slate-200 text-xs"
+                                />
+                            </div>
+
+                            <div className="space-y-1">
+                                <Label htmlFor="job_type" className="text-slate-700 font-semibold text-xs">Job Activity Type</Label>
+                                <Input
+                                    id="job_type"
+                                    value={bundleForm.job_type}
+                                    onChange={e => setBundleForm({ ...bundleForm, job_type: e.target.value })}
+                                    placeholder="e.g. Excavation, Steelworks, Electrical"
+                                    required
+                                    className="border-slate-200 text-xs"
+                                />
+                            </div>
+                        </div>
+
+                        <div className="space-y-1">
+                            <Label htmlFor="bundle_desc" className="text-slate-700 font-semibold text-xs">Description</Label>
+                            <Textarea
+                                id="bundle_desc"
+                                value={bundleForm.description}
+                                onChange={e => setBundleForm({ ...bundleForm, description: e.target.value })}
+                                placeholder="Summary of crew responsibilities and target job activities..."
+                                className="border-slate-200 text-xs"
+                                rows={2}
+                            />
+                        </div>
+
+                        <div className="space-y-2 pt-2 border-t border-slate-100">
+                            <div className="flex items-center justify-between">
+                                <Label className="text-slate-800 font-bold text-xs">Crew Trade Composition Items</Label>
+                                <Button type="button" size="sm" variant="outline" onClick={addBundleItemRow} className="text-xs h-7 text-indigo-600 border-indigo-200 hover:bg-indigo-50">
+                                    <Plus className="mr-1 h-3.5 w-3.5" /> Add Trade Row
+                                </Button>
+                            </div>
+
+                            <div className="space-y-2 max-h-[220px] overflow-y-auto pr-1">
+                                {bundleForm.items.map((item, idx) => (
+                                    <div key={idx} className="p-3 bg-slate-50 border border-slate-200 rounded-lg space-y-2 text-xs">
+                                        <div className="grid grid-cols-12 gap-2 items-center">
+                                            <div className="col-span-4">
+                                                <Label className="text-[10px] text-slate-500">Trade / Position</Label>
+                                                <Input
+                                                    value={item.labor_name}
+                                                    onChange={e => updateBundleItemRow(idx, 'labor_name', e.target.value)}
+                                                    placeholder="e.g. Steel Fixer"
+                                                    required
+                                                    className="h-8 text-xs bg-white"
+                                                />
+                                            </div>
+
+                                            <div className="col-span-3">
+                                                <Label className="text-[10px] text-slate-500">Category</Label>
+                                                <Select
+                                                    value={item.category}
+                                                    onValueChange={v => updateBundleItemRow(idx, 'category', v)}
+                                                >
+                                                    <SelectTrigger className="h-8 text-xs bg-white">
+                                                        <SelectValue />
+                                                    </SelectTrigger>
+                                                    <SelectContent>
+                                                        <SelectItem value="skilled">Skilled</SelectItem>
+                                                        <SelectItem value="unskilled">Unskilled</SelectItem>
+                                                    </SelectContent>
+                                                </Select>
+                                            </div>
+                                            <div className="col-span-4">
+                                                <Label className="text-[10px] text-slate-500">Est. Rate per m² (PHP)</Label>
+                                                <Input
+                                                    type="number"
+                                                    min="0"
+                                                    value={item.rate_per_sqm ?? item.estimated_hourly_rate ?? 0}
+                                                    onChange={e => updateBundleItemRow(idx, 'rate_per_sqm', parseFloat(e.target.value) || 0)}
+                                                    className="h-8 text-xs bg-white text-right font-mono"
+                                                />
+                                            </div>
+
+                                            <div className="col-span-1 text-right pt-3">
+                                                <Button
+                                                    type="button"
+                                                    variant="ghost"
+                                                    size="icon"
+                                                    onClick={() => removeBundleItemRow(idx)}
+                                                    disabled={bundleForm.items.length <= 1}
+                                                    className="h-7 w-7 text-rose-500 hover:bg-rose-100"
+                                                >
+                                                    <Trash2 className="h-3.5 w-3.5" />
+                                                </Button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                ))}
+                            </div>
+                        </div>
+
+                        <DialogFooter className="pt-4 border-t border-slate-100">
+                            <Button type="button" variant="outline" onClick={() => setBundleModalOpen(false)} className="text-xs">
+                                Cancel
+                            </Button>
+                            <Button type="submit" className="bg-indigo-600 hover:bg-indigo-700 text-white text-xs font-bold px-4">
+                                Save Job Bundle
+                            </Button>
+                        </DialogFooter>
+                    </form>
+                </DialogContent>
+            </Dialog>
+
             {/* Skill Modal */}
             <Dialog open={skillModalOpen} onOpenChange={setSkillModalOpen}>
                 <DialogContent className="sm:max-w-[425px]">
diff --git a/Modules/ProjectDocuments/app/Http/Controllers/ProjectDocumentsController.php b/Modules/ProjectDocuments/app/Http/Controllers/ProjectDocumentsController.php
index ca91b3a..0690604 100644
--- a/Modules/ProjectDocuments/app/Http/Controllers/ProjectDocumentsController.php
+++ b/Modules/ProjectDocuments/app/Http/Controllers/ProjectDocumentsController.php
@@ -15,7 +15,7 @@ class ProjectDocumentsController extends Controller
         $projectUlid = $request->query('project');
         $project = $projectUlid ? \Modules\ProjectManagement\Models\Project::where('ulid', $projectUlid)->firstOrFail() : null;
         
-        $query = \Modules\DocumentManagement\Models\Document::with(['uploader:id,name', 'category', 'project', 'approvals.approver']);
+        $query = \Modules\DocumentManagement\Models\Document::with(['uploader:id,name,contractor_id', 'category', 'project', 'approvals.approver']);
         if ($project) {
             $query->where('project_id', $project->id);
         }
diff --git a/Modules/ProjectManagement/app/Http/Controllers/ProjectController.php b/Modules/ProjectManagement/app/Http/Controllers/ProjectController.php
index 814af3a..0fec5ce 100644
--- a/Modules/ProjectManagement/app/Http/Controllers/ProjectController.php
+++ b/Modules/ProjectManagement/app/Http/Controllers/ProjectController.php
@@ -589,9 +589,13 @@ class ProjectController extends Controller
                     $milestoneId = null;
                     if (!empty($t['milestone_ulid'])) {
                         $milestoneId = \Modules\ProjectManagement\Models\ProjectMilestone::resolveUlidToId($t['milestone_ulid']);
-                        if ($milestoneId === null && ctype_digit((string) $t['milestone_ulid'])) {
-                            $milestoneId = $milestoneIdsByIndex[(int) $t['milestone_ulid']] ?? null;
-                        }
+                    } elseif (!empty($t['milestone_id'])) {
+                        $milestoneId = \Modules\ProjectManagement\Models\ProjectMilestone::resolveUlidToId($t['milestone_id'])
+                            ?? (ctype_digit((string) $t['milestone_id']) ? (int) $t['milestone_id'] : null);
+                    }
+
+                    if ($milestoneId === null && isset($milestoneIdsByIndex[$index])) {
+                        $milestoneId = $milestoneIdsByIndex[$index];
                     }
 
                     $task = null;
diff --git a/Modules/ProjectManagement/app/Imports/TaskImport.php b/Modules/ProjectManagement/app/Imports/TaskImport.php
index dc282d3..c0cdfbc 100644
--- a/Modules/ProjectManagement/app/Imports/TaskImport.php
+++ b/Modules/ProjectManagement/app/Imports/TaskImport.php
@@ -49,6 +49,26 @@ class TaskImport implements ToArray, WithHeadingRow
                 try { $data['end_date'] = Carbon::parse($endDate)->format('Y-m-d'); } catch (\Exception) {}
             }
 
+            $milestoneName = $row['milestone'] ?? $row['milestone_name'] ?? null;
+            if ($milestoneName) {
+                $milestone = \Modules\ProjectManagement\Models\ProjectMilestone::where('project_id', $this->project->id)
+                    ->where('name', 'like', "%{$milestoneName}%")
+                    ->first();
+                if ($milestone) {
+                    $data['milestone_id'] = $milestone->id;
+                }
+            }
+
+            if (empty($data['milestone_id'])) {
+                $sortIndex = $data['sort_order'] ?? 0;
+                $projectMilestones = \Modules\ProjectManagement\Models\ProjectMilestone::where('project_id', $this->project->id)
+                    ->orderBy('sort_order')
+                    ->get();
+                if ($projectMilestones->isNotEmpty()) {
+                    $data['milestone_id'] = ($projectMilestones->get($sortIndex) ?? $projectMilestones->first())->id;
+                }
+            }
+
             Task::create($data);
             $this->imported++;
         }
diff --git a/Modules/ProjectManagement/app/Models/Task.php b/Modules/ProjectManagement/app/Models/Task.php
index e23ee65..f03a147 100644
--- a/Modules/ProjectManagement/app/Models/Task.php
+++ b/Modules/ProjectManagement/app/Models/Task.php
@@ -13,10 +13,28 @@ use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Modules\ProjectManagement\Enums\DelayReason;
 use Modules\ProjectManagement\Enums\TaskStatus;
+use Spatie\MediaLibrary\HasMedia;
+use Spatie\MediaLibrary\InteractsWithMedia;
 
-class Task extends Model
+class Task extends Model implements HasMedia
 {
-    use HasFactory, HasPublicIdentifier;
+    use HasFactory, HasPublicIdentifier, InteractsWithMedia;
+
+    protected $appends = ['evidence_urls'];
+
+    public function getEvidenceUrlsAttribute(): array
+    {
+        return $this->getMedia('evidence')->map(function ($media) {
+            return [
+                'id' => $media->id,
+                'name' => $media->name,
+                'file_name' => $media->file_name,
+                'original_url' => $media->original_url,
+                'mime_type' => $media->mime_type,
+                'size' => $media->size,
+            ];
+        })->toArray();
+    }
 
     protected static function newFactory()
     {
diff --git a/Modules/ProjectManagement/resources/js/Components/LaborLookupModal.tsx b/Modules/ProjectManagement/resources/js/Components/LaborLookupModal.tsx
index af7e96d..5a6c814 100644
--- a/Modules/ProjectManagement/resources/js/Components/LaborLookupModal.tsx
+++ b/Modules/ProjectManagement/resources/js/Components/LaborLookupModal.tsx
@@ -1,17 +1,18 @@
 import { useState, useMemo } from 'react';
 import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogDescription } from '@/Components/ui/dialog';
+import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/Components/ui/tabs';
 import { Input } from '@/Components/ui/input';
 import { Button } from '@/Components/ui/button';
 import { Badge } from '@/Components/ui/badge';
-import { Search, Users, Check } from 'lucide-react';
+import { Search, Users, Check, Layers, Plus, HardHat, Wrench, Zap, Hammer, Paintbrush, Pipette } from 'lucide-react';
 
-interface Skill {
+export interface Skill {
     id: number;
     ulid: string;
     name: string;
 }
 
-interface Labor {
+export interface Labor {
     id: number;
     ulid: string;
     name: string;
@@ -20,11 +21,128 @@ interface Labor {
     skills: Skill[];
 }
 
+export interface LaborBundleOption {
+    id: string;
+    name: string;
+    job_type: string;
+    description: string;
+    category: string;
+    badge_color?: string;
+    items: {
+        labor_name: string;
+        category: 'skilled' | 'unskilled';
+        default_hours?: number;
+        estimated_hourly_rate?: number;
+        rate_per_sqm: number;
+    }[];
+}
+
+export const PREDEFINED_LABOR_BUNDLES: LaborBundleOption[] = [
+    {
+        id: 'excavation-crew',
+        name: 'Excavation & Earthworks Crew Package',
+        job_type: 'Excavation & Earthworks',
+        category: 'Earthworks & Foundation',
+        badge_color: 'bg-amber-100 text-amber-800 border-amber-200',
+        description: 'Complete manpower package for site excavation, trenching, soil hauling, and ground leveling.',
+        items: [
+            { labor_name: 'Excavator Operator', category: 'skilled', rate_per_sqm: 80 },
+            { labor_name: 'Heavy Equipment Hand', category: 'skilled', rate_per_sqm: 40 },
+            { labor_name: 'Earthwork Laborer', category: 'unskilled', rate_per_sqm: 30 },
+            { labor_name: 'Flagman & Site Safety', category: 'unskilled', rate_per_sqm: 15 },
+        ]
+    },
+    {
+        id: 'steelworks-crew',
+        name: 'Steelworks & Rebar Crew Package',
+        job_type: 'Steelworks & Structural Rebar',
+        category: 'Structural & Reinforcement',
+        badge_color: 'bg-slate-100 text-slate-800 border-slate-200',
+        description: 'Specialized crew for rebar cutting, bending, column/beam tying, and structural steel welding.',
+        items: [
+            { labor_name: 'Master Welder', category: 'skilled', rate_per_sqm: 110 },
+            { labor_name: 'Steel Fixer', category: 'skilled', rate_per_sqm: 95 },
+            { labor_name: 'Rebar Craftsman', category: 'skilled', rate_per_sqm: 75 },
+            { labor_name: 'Rigging Helper', category: 'unskilled', rate_per_sqm: 40 },
+        ]
+    },
+    {
+        id: 'electricity-crew',
+        name: 'Electricity & MEP Rough-In Package',
+        job_type: 'Electrical & MEP',
+        category: 'Electrical & Utility Systems',
+        badge_color: 'bg-yellow-100 text-yellow-800 border-yellow-200',
+        description: 'Crew for main feeder line installation, conduit laying, breaker panel wiring, and rough-in.',
+        items: [
+            { labor_name: 'Master Electrician', category: 'skilled', rate_per_sqm: 90 },
+            { labor_name: 'Journeyman Electrician', category: 'skilled', rate_per_sqm: 75 },
+            { labor_name: 'Cable Puller', category: 'unskilled', rate_per_sqm: 45 },
+            { labor_name: 'Conduit Installer', category: 'skilled', rate_per_sqm: 40 },
+        ]
+    },
+    {
+        id: 'masonry-crew',
+        name: 'Masonry & Concrete Pouring Package',
+        job_type: 'Masonry & Civil Works',
+        category: 'Masonry & Concrete',
+        badge_color: 'bg-emerald-100 text-emerald-800 border-emerald-200',
+        description: 'Full manpower setup for CHB block laying, wall plastering, slab pouring, and concrete finishing.',
+        items: [
+            { labor_name: 'Master Mason', category: 'skilled', rate_per_sqm: 110 },
+            { labor_name: 'Concrete Finisher', category: 'skilled', rate_per_sqm: 85 },
+            { labor_name: 'Masonry Helper', category: 'unskilled', rate_per_sqm: 55 },
+            { labor_name: 'Mixer Attendant', category: 'unskilled', rate_per_sqm: 30 },
+        ]
+    },
+    {
+        id: 'plumbing-crew',
+        name: 'Plumbing & Piping Package',
+        job_type: 'Plumbing & Sanitary',
+        category: 'Plumbing & Piping',
+        badge_color: 'bg-blue-100 text-blue-800 border-blue-200',
+        description: 'Specialized crew for potable water supply distribution, DWV sanitary piping, and fixture rough-in.',
+        items: [
+            { labor_name: 'Master Plumber', category: 'skilled', rate_per_sqm: 95 },
+            { labor_name: 'Pipefitter', category: 'skilled', rate_per_sqm: 75 },
+            { labor_name: 'Drainage Installer', category: 'skilled', rate_per_sqm: 50 },
+            { labor_name: 'Plumbing Helper', category: 'unskilled', rate_per_sqm: 30 },
+        ]
+    },
+    {
+        id: 'carpentry-crew',
+        name: 'Carpentry & Formwork Package',
+        job_type: 'Carpentry & Formwork',
+        category: 'Formwork & Framing',
+        badge_color: 'bg-orange-100 text-orange-800 border-orange-200',
+        description: 'Team for column/beam formwork fabrication, scaffolding erection, and temporary shoring.',
+        items: [
+            { labor_name: 'Master Carpenter', category: 'skilled', rate_per_sqm: 100 },
+            { labor_name: 'Formwork Installer', category: 'skilled', rate_per_sqm: 85 },
+            { labor_name: 'Scaffold Erector', category: 'skilled', rate_per_sqm: 55 },
+            { labor_name: 'Carpentry Helper', category: 'unskilled', rate_per_sqm: 35 },
+        ]
+    },
+    {
+        id: 'painting-crew',
+        name: 'Painting & Architectural Finishing Package',
+        job_type: 'Painting & Finishing',
+        category: 'Architectural & Finishing',
+        badge_color: 'bg-purple-100 text-purple-800 border-purple-200',
+        description: 'Crew for surface preparation, skimcoating, primer application, and topcoat architectural painting.',
+        items: [
+            { labor_name: 'Lead Painter', category: 'skilled', rate_per_sqm: 85 },
+            { labor_name: 'Surface Applicator', category: 'skilled', rate_per_sqm: 65 },
+            { labor_name: 'Sanding & Skimcoat Helper', category: 'unskilled', rate_per_sqm: 40 },
+        ]
+    }
+];
+
 interface Props {
     open: boolean;
     onOpenChange: (open: boolean) => void;
     labors: Labor[];
     onSelectLabor: (labor: Labor) => void;
+    onAddLaborBundle?: (bundle: LaborBundleOption, crewMultiplier: number) => void;
     selectedLaborUlid?: string;
 }
 
@@ -33,23 +151,30 @@ export default function LaborLookupModal({
     onOpenChange,
     labors,
     onSelectLabor,
+    onAddLaborBundle,
     selectedLaborUlid
 }: Props) {
     const [search, setSearch] = useState('');
     const [categoryFilter, setCategoryFilter] = useState<'all' | 'skilled' | 'unskilled'>('all');
+    const [crewMultiplier, setCrewMultiplier] = useState<Record<string, number>>({});
 
     const formatCurrency = (v: string | number) => {
         return new Intl.NumberFormat('en-PH', { style: 'currency', currency: 'PHP' }).format(Number(v));
     };
 
+    const handleOpenChange = (isOpen: boolean) => {
+        if (!isOpen) {
+            setSearch('');
+            setCategoryFilter('all');
+        }
+        onOpenChange(isOpen);
+    };
+
     const filteredLabors = useMemo(() => {
         return labors.filter(labor => {
-            // Category filter
             if (categoryFilter !== 'all' && labor.category !== categoryFilter) {
                 return false;
             }
-
-            // Search filter
             if (!search) return true;
             const query = search.toLowerCase();
             const matchesName = labor.name.toLowerCase().includes(query);
@@ -62,149 +187,286 @@ export default function LaborLookupModal({
         });
     }, [labors, search, categoryFilter]);
 
+    const filteredBundles = useMemo(() => {
+        if (!search) return PREDEFINED_LABOR_BUNDLES;
+        const query = search.toLowerCase();
+        return PREDEFINED_LABOR_BUNDLES.filter(b => 
+            b.name.toLowerCase().includes(query) ||
+            b.job_type.toLowerCase().includes(query) ||
+            b.description.toLowerCase().includes(query) ||
+            b.items.some(item => item.labor_name.toLowerCase().includes(query))
+        );
+    }, [search]);
+
+    const handleAddBundleClick = (bundle: LaborBundleOption) => {
+        const mult = crewMultiplier[bundle.id] || 1;
+        if (onAddLaborBundle) {
+            onAddLaborBundle(bundle, mult);
+        } else {
+            // Fallback: select first trade in bundle
+            const matched = labors.find(l => l.name.toLowerCase().includes(bundle.items[0]?.labor_name.toLowerCase() || ''));
+            if (matched) {
+                onSelectLabor(matched);
+            }
+        }
+    };
+
     return (
-        <Dialog open={open} onOpenChange={onOpenChange}>
-            <DialogContent className="sm:max-w-[70vw] max-w-[95vw] max-h-[85vh] flex flex-col p-0 gap-0 border-slate-200">
-                <DialogHeader className="px-6 py-4 border-b border-slate-100">
-                    <DialogTitle className="flex items-center gap-2 text-lg font-bold text-slate-800">
+        <Dialog open={open} onOpenChange={handleOpenChange}>
+            <DialogContent className="sm:max-w-[80vw] max-w-[95vw] max-h-[90vh] flex flex-col p-0 gap-0 border-slate-200">
+                <DialogHeader className="px-6 py-4 border-b border-slate-100 bg-slate-50/50">
+                    <DialogTitle className="flex items-center gap-2 text-xl font-bold text-slate-800">
                         <Users className="h-5 w-5 text-emerald-600" />
-                        Select Labor Record
+                        Labor Manpower Catalog
                     </DialogTitle>
                     <DialogDescription className="text-xs text-slate-500">
-                        Search and select a labor trade category to allocate to the project task.
+                        Browse single laborer trades or select predefined job bundles (excavation, steelworks, electricity, masonry, plumbing, etc.) for quick crew allocation.
                     </DialogDescription>
                 </DialogHeader>
 
-                <div className="px-6 py-3 border-b border-slate-100 bg-slate-50/50 flex flex-col sm:flex-row gap-3 justify-between items-center">
-                    {/* Category Tabs */}
-                    <div className="flex bg-slate-100 p-0.5 rounded-lg border border-slate-200/40 w-full sm:w-auto">
-                        <button
-                            type="button"
-                            onClick={() => setCategoryFilter('all')}
-                            className={`flex-1 sm:flex-initial px-3 py-1 text-xs font-semibold rounded-md transition-all ${
-                                categoryFilter === 'all'
-                                    ? 'bg-white text-slate-800 shadow-sm'
-                                    : 'text-slate-500 hover:text-slate-800'
-                            }`}
-                        >
-                            All Categories
-                        </button>
-                        <button
-                            type="button"
-                            onClick={() => setCategoryFilter('skilled')}
-                            className={`flex-1 sm:flex-initial px-3 py-1 text-xs font-semibold rounded-md transition-all ${
-                                categoryFilter === 'skilled'
-                                    ? 'bg-white text-slate-800 shadow-sm'
-                                    : 'text-slate-500 hover:text-slate-800'
-                            }`}
-                        >
-                            Skilled
-                        </button>
-                        <button
-                            type="button"
-                            onClick={() => setCategoryFilter('unskilled')}
-                            className={`flex-1 sm:flex-initial px-3 py-1 text-xs font-semibold rounded-md transition-all ${
-                                categoryFilter === 'unskilled'
-                                    ? 'bg-white text-slate-800 shadow-sm'
-                                    : 'text-slate-500 hover:text-slate-800'
-                            }`}
-                        >
-                            Unskilled
-                        </button>
-                    </div>
+                <Tabs defaultValue="items" className="flex-1 flex flex-col min-h-0">
+                    <div className="px-6 py-3 border-b border-slate-100 flex flex-col sm:flex-row gap-3 justify-between items-center bg-white">
+                        <TabsList className="bg-slate-100 p-1">
+                            <TabsTrigger value="items" className="flex items-center gap-1.5 text-xs font-semibold">
+                                <Users className="h-3.5 w-3.5 text-slate-600" />
+                                Single Laborers & Trades ({filteredLabors.length})
+                            </TabsTrigger>
+                            <TabsTrigger value="bundles" className="flex items-center gap-1.5 text-xs font-semibold">
+                                <Layers className="h-3.5 w-3.5 text-indigo-600" />
+                                Job Bundles & Crew Packages ({filteredBundles.length})
+                            </TabsTrigger>
+                        </TabsList>
 
-                    {/* Search Input */}
-                    <div className="relative w-full sm:w-72">
-                        <Search className="absolute left-3 top-2.5 h-4 w-4 text-slate-400" />
-                        <Input
-                            type="search"
-                            placeholder="Search by name, skills..."
-                            className="h-9 pl-9 bg-white text-xs border-slate-200 focus-visible:ring-emerald-500 focus-visible:border-emerald-500"
-                            value={search}
-                            onChange={(e) => setSearch(e.target.value)}
-                        />
-                    </div>
-                </div>
-
-                <div className="flex-1 overflow-y-auto p-6 min-h-0">
-                    {filteredLabors.length === 0 ? (
-                        <div className="text-center py-12 text-slate-400 text-xs">
-                            No labor records found matching "{search}".
+                        <div className="relative w-full sm:w-72">
+                            <Search className="absolute left-3 top-2.5 h-4 w-4 text-slate-400" />
+                            <Input
+                                type="search"
+                                placeholder="Search trades, bundles, skills..."
+                                className="h-9 pl-9 bg-white text-xs border-slate-200 focus-visible:ring-emerald-500 focus-visible:border-emerald-500"
+                                value={search}
+                                onChange={(e) => setSearch(e.target.value)}
+                            />
                         </div>
-                    ) : (
-                        <div className="border border-slate-200/80 rounded-xl overflow-hidden shadow-sm">
-                            <table className="w-full text-xs text-left border-collapse">
-                                <thead className="bg-slate-55 border-b border-slate-100 text-slate-600 font-semibold">
-                                    <tr>
-                                        <th className="px-4 py-3 font-semibold">Labor Record</th>
-                                        <th className="px-4 py-3 font-semibold w-28">Category</th>
-                                        <th className="px-4 py-3 font-semibold">Skills</th>
-                                        <th className="px-4 py-3 font-semibold text-right w-32">Hourly Rate</th>
-                                    </tr>
-                                </thead>
-                                <tbody className="divide-y divide-slate-100 bg-white">
-                                    {filteredLabors.map(labor => {
-                                        const isSelected = selectedLaborUlid === labor.ulid;
-                                        return (
-                                            <tr
-                                                key={labor.id}
-                                                className={`transition-all hover:bg-slate-50/50 cursor-pointer group ${
-                                                    isSelected ? 'bg-emerald-50/40 hover:bg-emerald-50/60' : ''
-                                                }`}
-                                                onClick={() => onSelectLabor(labor)}
-                                            >
-                                                <td className="px-4 py-3">
-                                                    <div className="flex items-center gap-2">
-                                                        <span className="font-semibold text-slate-800 group-hover:text-emerald-700 transition-colors">
-                                                            {labor.name}
-                                                        </span>
-                                                        {isSelected && (
-                                                            <Badge className="bg-emerald-100 text-emerald-800 border-none text-[10px] font-medium flex items-center gap-0.5">
-                                                                <Check className="h-2.5 w-2.5" /> Selected
-                                                            </Badge>
-                                                        )}
-                                                    </div>
-                                                </td>
-                                                <td className="px-4 py-3">
-                                                    <Badge
-                                                        variant="outline"
-                                                        className={`capitalize font-normal text-[10px] ${
-                                                            labor.category === 'skilled'
-                                                                ? 'bg-blue-50 text-blue-700 border-blue-100'
-                                                                : 'bg-amber-50 text-amber-700 border-amber-100'
-                                                        }`}
-                                                    >
-                                                        {labor.category}
-                                                    </Badge>
-                                                </td>
-                                                <td className="px-4 py-3">
-                                                    <div className="flex flex-wrap gap-1">
-                                                        {labor.skills && labor.skills.length > 0 ? (
-                                                            labor.skills.map(skill => (
-                                                                <Badge
-                                                                    key={skill.id}
-                                                                    variant="secondary"
-                                                                    className="bg-slate-100 text-slate-650 hover:bg-slate-200 text-[10px] font-normal"
-                                                                >
-                                                                    {skill.name}
+                    </div>
+
+                    {/* TAB 1: SINGLE LABORERS */}
+                    <TabsContent value="items" className="flex-1 overflow-y-auto p-6 min-h-0 m-0">
+                        {/* Category Filters */}
+                        <div className="mb-4 flex items-center gap-2">
+                            <span className="text-xs font-semibold text-slate-500">Filter Category:</span>
+                            <div className="flex bg-slate-100 p-0.5 rounded-lg border border-slate-200/40">
+                                <button
+                                    type="button"
+                                    onClick={() => setCategoryFilter('all')}
+                                    className={`px-3 py-1 text-xs font-semibold rounded-md transition-all ${
+                                        categoryFilter === 'all'
+                                            ? 'bg-white text-slate-800 shadow-sm'
+                                            : 'text-slate-500 hover:text-slate-800'
+                                    }`}
+                                >
+                                    All ({labors.length})
+                                </button>
+                                <button
+                                    type="button"
+                                    onClick={() => setCategoryFilter('skilled')}
+                                    className={`px-3 py-1 text-xs font-semibold rounded-md transition-all ${
+                                        categoryFilter === 'skilled'
+                                            ? 'bg-white text-slate-800 shadow-sm'
+                                            : 'text-slate-500 hover:text-slate-800'
+                                    }`}
+                                >
+                                    Skilled
+                                </button>
+                                <button
+                                    type="button"
+                                    onClick={() => setCategoryFilter('unskilled')}
+                                    className={`px-3 py-1 text-xs font-semibold rounded-md transition-all ${
+                                        categoryFilter === 'unskilled'
+                                            ? 'bg-white text-slate-800 shadow-sm'
+                                            : 'text-slate-500 hover:text-slate-800'
+                                    }`}
+                                >
+                                    Unskilled
+                                </button>
+                            </div>
+                        </div>
+
+                        {filteredLabors.length === 0 ? (
+                            <div className="text-center py-12 text-slate-400 text-xs">
+                                No labor records found matching "{search}".
+                            </div>
+                        ) : (
+                            <div className="border border-slate-200/80 rounded-xl overflow-hidden shadow-sm">
+                                <table className="w-full text-xs text-left border-collapse">
+                                    <thead className="bg-slate-50 border-b border-slate-100 text-slate-600 font-semibold">
+                                        <tr>
+                                            <th className="px-4 py-3 font-semibold">Labor Trade Record</th>
+                                            <th className="px-4 py-3 font-semibold w-28">Category</th>
+                                            <th className="px-4 py-3 font-semibold">Skills / Specialties</th>
+                                            <th className="px-4 py-3 font-semibold text-right w-32">Hourly Rate</th>
+                                            <th className="px-4 py-3 font-semibold text-right w-28">Action</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody className="divide-y divide-slate-100 bg-white">
+                                        {filteredLabors.map(labor => {
+                                            const isSelected = selectedLaborUlid === labor.ulid;
+                                            return (
+                                                <tr
+                                                    key={labor.id}
+                                                    className={`transition-all hover:bg-slate-50/50 ${
+                                                        isSelected ? 'bg-emerald-50/40 hover:bg-emerald-50/60' : ''
+                                                    }`}
+                                                >
+                                                    <td className="px-4 py-3 font-semibold text-slate-800">
+                                                        <div className="flex items-center gap-2">
+                                                            <HardHat className="h-4 w-4 text-emerald-600 shrink-0" />
+                                                            <span>{labor.name}</span>
+                                                            {isSelected && (
+                                                                <Badge className="bg-emerald-100 text-emerald-800 border-none text-[10px] font-medium flex items-center gap-0.5">
+                                                                    <Check className="h-2.5 w-2.5" /> Selected
                                                                 </Badge>
-                                                            ))
-                                                        ) : (
-                                                            <span className="text-slate-400 italic">No skills listed</span>
-                                                        )}
-                                                    </div>
-                                                </td>
-                                                <td className="px-4 py-3 text-right font-mono font-medium text-slate-700">
-                                                    {formatCurrency(labor.hourly_rate)}/hr
-                                                </td>
-                                            </tr>
-                                        );
-                                    })}
-                                </tbody>
-                            </table>
+                                                            )}
+                                                        </div>
+                                                    </td>
+                                                    <td className="px-4 py-3">
+                                                        <Badge
+                                                            variant="outline"
+                                                            className={`capitalize font-normal text-[10px] ${
+                                                                labor.category === 'skilled'
+                                                                    ? 'bg-blue-50 text-blue-700 border-blue-100'
+                                                                    : 'bg-amber-50 text-amber-700 border-amber-100'
+                                                            }`}
+                                                        >
+                                                            {labor.category}
+                                                        </Badge>
+                                                    </td>
+                                                    <td className="px-4 py-3">
+                                                        <div className="flex flex-wrap gap-1">
+                                                            {labor.skills && labor.skills.length > 0 ? (
+                                                                labor.skills.map(skill => (
+                                                                    <Badge
+                                                                        key={skill.id}
+                                                                        variant="secondary"
+                                                                        className="bg-slate-100 text-slate-650 hover:bg-slate-200 text-[10px] font-normal"
+                                                                    >
+                                                                        {skill.name}
+                                                                    </Badge>
+                                                                ))
+                                                            ) : (
+                                                                <span className="text-slate-400 italic">Standard Construction Trade</span>
+                                                            )}
+                                                        </div>
+                                                    </td>
+                                                    <td className="px-4 py-3 text-right font-mono font-bold text-slate-800">
+                                                        {formatCurrency(labor.hourly_rate)}/hr
+                                                    </td>
+                                                    <td className="px-4 py-3 text-right">
+                                                        <Button
+                                                            size="sm"
+                                                            className="bg-emerald-600 hover:bg-emerald-700 text-white font-medium text-xs h-7 px-3"
+                                                            onClick={() => onSelectLabor(labor)}
+                                                        >
+                                                            Select Trade
+                                                        </Button>
+                                                    </td>
+                                                </tr>
+                                            );
+                                        })}
+                                    </tbody>
+                                </table>
+                            </div>
+                        )}
+                    </TabsContent>
+
+                    {/* TAB 2: JOB BUNDLES & CREW PACKAGES */}
+                    <TabsContent value="bundles" className="flex-1 overflow-y-auto p-6 min-h-0 m-0 space-y-4">
+                        <div className="bg-gradient-to-r from-indigo-900 to-slate-900 text-white p-4 rounded-xl shadow-sm border border-indigo-700/50 flex flex-col sm:flex-row items-start sm:items-center justify-between gap-3">
+                            <div>
+                                <h4 className="font-bold text-sm text-indigo-100 flex items-center gap-2">
+                                    <Layers className="h-4 w-4 text-indigo-400" /> Predefined Job Manpower Assemblies & Crews
+                                </h4>
+                                <p className="text-xs text-indigo-200/80 mt-0.5">
+                                    Instantly allocate complete specialized teams for specific construction activities (excavation, steelworks, electricity, masonry, plumbing, etc.).
+                                </p>
+                            </div>
                         </div>
-                    )}
-                </div>
+
+                        <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+                            {filteredBundles.map(bundle => {
+                                const sqmArea = crewMultiplier[bundle.id] || 10;
+                                const ratePerSqm = bundle.items.reduce((sum, item) => sum + (item.rate_per_sqm || item.estimated_hourly_rate || 0), 0);
+                                const totalEstCost = ratePerSqm * sqmArea;
+
+                                return (
+                                    <div 
+                                        key={bundle.id} 
+                                        className="bg-white border border-slate-200 rounded-xl p-4 shadow-xs hover:border-indigo-300 hover:shadow-md transition-all flex flex-col justify-between space-y-3"
+                                    >
+                                        <div>
+                                            <div className="flex items-center justify-between gap-2 mb-2">
+                                                <Badge variant="outline" className={`text-[10px] font-semibold ${bundle.badge_color || 'bg-indigo-50 text-indigo-700 border-indigo-100'}`}>
+                                                    {bundle.job_type}
+                                                </Badge>
+                                                <span className="text-xs font-mono font-bold text-slate-800">
+                                                    Est. {formatCurrency(ratePerSqm)} / m²
+                                                </span>
+                                            </div>
+
+                                            <h4 className="font-bold text-sm text-slate-800">{bundle.name}</h4>
+                                            <p className="text-xs text-slate-500 mt-1 leading-relaxed">{bundle.description}</p>
+
+                                            <div className="mt-3 bg-slate-50 p-3 rounded-lg border border-slate-100 space-y-1.5">
+                                                <p className="text-[11px] font-bold text-slate-600 uppercase tracking-wider mb-1 flex justify-between">
+                                                    <span>Crew Breakdown ({bundle.items.length} Trades):</span>
+                                                    <span className="text-indigo-600 font-mono">Total: {formatCurrency(totalEstCost)} ({sqmArea} m²)</span>
+                                                </p>
+                                                {bundle.items.map((item, idx) => (
+                                                    <div key={idx} className="flex justify-between items-center text-xs">
+                                                        <span className="text-slate-700 font-medium flex items-center gap-1.5">
+                                                            <span className="w-1.5 h-1.5 rounded-full bg-indigo-500 shrink-0"></span>
+                                                            {item.labor_name}
+                                                        </span>
+                                                        <span className="font-mono text-slate-600 text-[11px]">
+                                                            {formatCurrency(item.rate_per_sqm || item.estimated_hourly_rate || 0)} / m²
+                                                        </span>
+                                                    </div>
+                                                ))}
+                                            </div>
+                                        </div>
+
+                                        <div className="pt-3 border-t border-slate-100 flex items-center justify-between gap-3">
+                                            <div className="flex items-center gap-2">
+                                                <span className="text-xs font-semibold text-slate-600">Target Area:</span>
+                                                <div className="flex items-center">
+                                                    <Input
+                                                        type="number"
+                                                        min="1"
+                                                        step="5"
+                                                        value={sqmArea}
+                                                        onChange={(e) => setCrewMultiplier({
+                                                            ...crewMultiplier,
+                                                            [bundle.id]: Math.max(1, parseInt(e.target.value) || 1)
+                                                        })}
+                                                        className="w-20 h-8 text-center text-xs font-mono font-bold"
+                                                    />
+                                                    <span className="text-xs font-medium text-slate-500 ml-1">m²</span>
+                                                </div>
+                                            </div>
+
+                                            <Button
+                                                size="sm"
+                                                className="bg-indigo-600 hover:bg-indigo-700 text-white font-semibold text-xs h-8 px-3.5 shadow-sm"
+                                                onClick={() => handleAddBundleClick(bundle)}
+                                            >
+                                                <Plus className="mr-1.5 h-3.5 w-3.5" /> Add Bundle ({sqmArea} m²)
+                                            </Button>
+                                        </div>
+                                    </div>
+                                );
+                            })}
+                        </div>
+                    </TabsContent>
+                </Tabs>
             </DialogContent>
         </Dialog>
     );
diff --git a/Modules/ProjectManagement/resources/js/Pages/Projects/Edit.tsx b/Modules/ProjectManagement/resources/js/Pages/Projects/Edit.tsx
index d74a38a..4695c27 100644
--- a/Modules/ProjectManagement/resources/js/Pages/Projects/Edit.tsx
+++ b/Modules/ProjectManagement/resources/js/Pages/Projects/Edit.tsx
@@ -198,6 +198,35 @@ export default function Edit({ project, employees, projects, labors, equipments,
         setActiveLaborRowIdx(null);
     };
 
+    const handleAddLaborBundle = (bundle: any, crewMultiplier: number) => {
+        const newAllocations: any[] = [];
+        bundle.items.forEach((item: any) => {
+            const matched = labors.find(l => 
+                l.name.toLowerCase().includes(item.labor_name.toLowerCase()) || 
+                item.labor_name.toLowerCase().includes(l.name.toLowerCase())
+            );
+            if (matched) {
+                newAllocations.push({
+                    task_ulid: '',
+                    labor_ulid: matched.ulid,
+                    estimated_hours: String(item.default_hours * crewMultiplier)
+                });
+            } else if (labors.length > 0) {
+                newAllocations.push({
+                    task_ulid: '',
+                    labor_ulid: labors[0].ulid,
+                    estimated_hours: String(item.default_hours * crewMultiplier)
+                });
+            }
+        });
+
+        if (newAllocations.length > 0) {
+            setLocalLabor(prev => [...prev, ...newAllocations]);
+        }
+        setLaborModalOpen(false);
+        setActiveLaborRowIdx(null);
+    };
+
     const handleSelectEquipment = (equipment: Equipment) => {
         if (activeEquipmentRowIdx !== null) {
             setLocalEquipment(localEquipment.map((item, i) => i === activeEquipmentRowIdx ? { ...item, equipment_ulid: equipment.ulid } : item));
@@ -1013,6 +1042,7 @@ export default function Edit({ project, employees, projects, labors, equipments,
                         onOpenChange={setLaborModalOpen}
                         labors={labors}
                         onSelectLabor={handleSelectLabor}
+                        onAddLaborBundle={handleAddLaborBundle}
                     />
 
                     <EquipmentLookupModal
diff --git a/Modules/ProjectManagement/resources/js/Pages/Projects/Modules/Documents.tsx b/Modules/ProjectManagement/resources/js/Pages/Projects/Modules/Documents.tsx
index f6c08b6..3959e4a 100644
--- a/Modules/ProjectManagement/resources/js/Pages/Projects/Modules/Documents.tsx
+++ b/Modules/ProjectManagement/resources/js/Pages/Projects/Modules/Documents.tsx
@@ -12,14 +12,16 @@ import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogTrigger } from
 import { PaginatedData, PageProps } from '@/types';
 import { FileText, Upload, Download, History, Trash2, Image, File, CheckCircle, XCircle, LayoutGrid, List, Eye } from 'lucide-react';
 import { FormEvent, useState, useEffect, useRef } from 'react';
+import { ConfirmModal } from '@/Components/ConfirmModal';
 
 interface Category { id: number; name: string; }
 interface Project { id: number; name: string; }
 interface DocItem {
     id: number; ulid: string; title: string; category_id: number; project_id?: number; description?: string;
+    uploaded_by?: number;
     current_file_name?: string; mime_type?: string; file_size: number;
     version_count: number; created_at: string; status: string;
-    uploader?: { id: number; ulid: string; name: string };
+    uploader?: { id: number; ulid?: string; name: string; contractor_id?: number | null };
     category?: Category | string;
     project?: Project;
 }
@@ -349,8 +351,39 @@ export default function Documents({ project, currentTab, documents, categories,
     const [dialog, setDialog] = useState(false);
     const [viewMode, setViewMode] = useState<'gallery' | 'list'>('gallery');
     const [previewDoc, setPreviewDoc] = useState<{ url: string; title: string } | null>(null);
+    const [deleteTarget, setDeleteTarget] = useState<DocItem | null>(null);
+    const [isDeleting, setIsDeleting] = useState(false);
+
+    const handleDelete = () => {
+        if (!deleteTarget || isDeleting) return;
+        setIsDeleting(true);
+        router.delete(route('documents.destroy', deleteTarget.ulid), {
+            preserveScroll: true,
+            onSuccess: () => {
+                setDeleteTarget(null);
+                setIsDeleting(false);
+            },
+            onError: () => {
+                setIsDeleting(false);
+            },
+            onFinish: () => {
+                setIsDeleting(false);
+            }
+        });
+    };
 
     const isContractorAdmin = auth.roles?.includes('Main Contractor Admin');
+    const isExecutive = (auth.user?.user_type as string) === 'admin' 
+        || (auth.user?.user_type as string) === 'super_admin' 
+        || auth.user?.contractor_id === null 
+        || auth.roles?.some((r: any) => ['Super Admin', 'Admin', 'Project Manager', 'Executive'].includes(typeof r === 'string' ? r : r.name));
+
+    const canDeleteDocument = (doc: DocItem) => {
+        if (isExecutive) return true;
+        if (doc.uploaded_by && Number(doc.uploaded_by) === Number(auth.user?.id)) return true;
+        if (auth.user?.contractor_id && doc.uploader?.contractor_id && Number(doc.uploader.contractor_id) === Number(auth.user?.contractor_id)) return true;
+        return false;
+    };
 
     const form = useForm<{ title: string; category_id: string; project_id: string; description: string; file: File | null }>({
         title: '', category_id: '', project_id: project.id.toString(), description: '', file: null,
@@ -522,7 +555,9 @@ export default function Documents({ project, currentTab, documents, categories,
                                                     )}
                                                     <a href={route('documents.download', doc.ulid)}><Button variant="ghost" size="icon-sm" className="text-gray-500 hover:text-gray-900" title="Download"><Download className="h-4 w-4" /></Button></a>
                                                     <Link href={route('documents.versions', doc.ulid)}><Button variant="ghost" size="icon-sm" className="text-gray-500 hover:text-gray-900" title="Versions"><History className="h-4 w-4" /></Button></Link>
-                                                    <Button variant="ghost" size="icon-sm" className="text-red-500 hover:bg-red-50" title="Delete" onClick={() => { if (confirm('Delete document and all versions?')) router.delete(route('documents.destroy', doc.ulid)); }}><Trash2 className="h-4 w-4 text-red-500" /></Button>
+                                                    {canDeleteDocument(doc) && (
+                                                        <Button variant="ghost" size="icon-sm" className="text-red-500 hover:bg-red-50" title="Delete" onClick={() => setDeleteTarget(doc)}><Trash2 className="h-4 w-4 text-red-500" /></Button>
+                                                    )}
                                                 </div>
                                             </TableCell>
                                         </TableRow>
@@ -621,15 +656,17 @@ export default function Documents({ project, currentTab, documents, categories,
                                                     </Link>
                                                 </div>
                                                 
-                                                <Button 
-                                                    variant="ghost" 
-                                                    size="icon-sm" 
-                                                    className="text-red-500 hover:bg-red-50 hover:text-red-600"
-                                                    title="Delete" 
-                                                    onClick={() => { if (confirm('Delete document and all versions?')) router.delete(route('documents.destroy', doc.ulid)); }}
-                                                >
-                                                    <Trash2 className="h-4 w-4" />
-                                                </Button>
+                                                {canDeleteDocument(doc) && (
+                                                    <Button 
+                                                        variant="ghost" 
+                                                        size="icon-sm" 
+                                                        className="text-red-500 hover:bg-red-50 hover:text-red-600"
+                                                        title="Delete" 
+                                                        onClick={() => setDeleteTarget(doc)}
+                                                    >
+                                                        <Trash2 className="h-4 w-4" />
+                                                    </Button>
+                                                )}
                                             </div>
                                         </div>
                                     </div>
@@ -658,6 +695,20 @@ export default function Documents({ project, currentTab, documents, categories,
                     onClose={() => setPreviewDoc(null)}
                 />
             )}
+
+            <ConfirmModal
+                open={!!deleteTarget}
+                onOpenChange={(open) => {
+                    if (!open && !isDeleting) setDeleteTarget(null);
+                }}
+                title="Delete Document"
+                message={`Are you sure you want to delete "${deleteTarget?.title}" and all its uploaded versions? This action cannot be undone.`}
+                confirmText={isDeleting ? 'Deleting...' : 'Delete Document'}
+                cancelText="Keep Document"
+                variant="destructive"
+                loading={isDeleting}
+                onConfirm={handleDelete}
+            />
         </ProjectLayout>
     );
 }
diff --git a/Modules/ProjectManagement/resources/js/Pages/Projects/Wizard.tsx b/Modules/ProjectManagement/resources/js/Pages/Projects/Wizard.tsx
index ed121cb..80e9a04 100644
--- a/Modules/ProjectManagement/resources/js/Pages/Projects/Wizard.tsx
+++ b/Modules/ProjectManagement/resources/js/Pages/Projects/Wizard.tsx
@@ -114,6 +114,35 @@ export default function Wizard({ project, step: currentStep, employees, projects
         setActiveLaborRowIdx(null);
     };
 
+    const handleAddLaborBundle = (bundle: any, crewMultiplier: number) => {
+        const newAllocations: any[] = [];
+        bundle.items.forEach((item: any) => {
+            const matched = labors.find(l => 
+                l.name.toLowerCase().includes(item.labor_name.toLowerCase()) || 
+                item.labor_name.toLowerCase().includes(l.name.toLowerCase())
+            );
+            if (matched) {
+                newAllocations.push({
+                    task_ulid: '',
+                    labor_ulid: matched.ulid,
+                    estimated_hours: String(item.default_hours * crewMultiplier)
+                });
+            } else if (labors.length > 0) {
+                newAllocations.push({
+                    task_ulid: '',
+                    labor_ulid: labors[0].ulid,
+                    estimated_hours: String(item.default_hours * crewMultiplier)
+                });
+            }
+        });
+
+        if (newAllocations.length > 0) {
+            setLocalLabor(prev => [...prev, ...newAllocations]);
+        }
+        setLaborModalOpen(false);
+        setActiveLaborRowIdx(null);
+    };
+
     const handleSelectEquipment = (equipment: Equipment) => {
         if (activeEquipmentRowIdx !== null) {
             updateEquipmentAllocation(activeEquipmentRowIdx, 'equipment_ulid', equipment.ulid);
@@ -1362,6 +1391,7 @@ export default function Wizard({ project, step: currentStep, employees, projects
                 onOpenChange={setLaborModalOpen}
                 labors={labors}
                 onSelectLabor={handleSelectLabor}
+                onAddLaborBundle={handleAddLaborBundle}
                 selectedLaborUlid={activeLaborRowIdx !== null ? localLabor[activeLaborRowIdx]?.labor_ulid : undefined}
             />
 
diff --git a/Modules/TaskManagement/app/Http/Controllers/TaskController.php b/Modules/TaskManagement/app/Http/Controllers/TaskController.php
index fc2b42b..9a3efe2 100644
--- a/Modules/TaskManagement/app/Http/Controllers/TaskController.php
+++ b/Modules/TaskManagement/app/Http/Controllers/TaskController.php
@@ -136,6 +136,12 @@ class TaskController extends Controller
         $task = Task::create($validated);
         $task->users()->sync($userIds);
 
+        if ($request->hasFile('evidence')) {
+            foreach ($request->file('evidence') as $file) {
+                $task->addMedia($file)->toMediaCollection('evidence');
+            }
+        }
+
         if (!empty($userIds)) {
             $task->activities()->create([
                 'user_id' => auth()->id(),
@@ -211,6 +217,12 @@ class TaskController extends Controller
         $this->updateProjectCompletion($project);
         $task->users()->sync($userIds);
 
+        if ($request->hasFile('evidence')) {
+            foreach ($request->file('evidence') as $file) {
+                $task->addMedia($file)->toMediaCollection('evidence');
+            }
+        }
+
         $addedUsers = array_diff($userIds, $oldUserIds);
         $removedUsers = array_diff($oldUserIds, $userIds);
 
@@ -232,6 +244,28 @@ class TaskController extends Controller
         return back()->with('success', 'Task updated.');
     }
 
+    public function uploadEvidence(Request $request, Task $task)
+    {
+        $request->validate([
+            'evidence' => 'required|array',
+            'evidence.*' => 'image|max:10240',
+        ]);
+
+        foreach ($request->file('evidence') as $file) {
+            $task->addMedia($file)->toMediaCollection('evidence');
+        }
+
+        return back()->with('success', 'Evidence uploaded successfully.');
+    }
+
+    public function deleteEvidence(Task $task, $mediaId)
+    {
+        $media = $task->media()->findOrFail($mediaId);
+        $media->delete();
+
+        return back()->with('success', 'Evidence photo deleted.');
+    }
+
     public function destroy(Task $task)
     {
         $project = $task->project;
diff --git a/Modules/TaskManagement/resources/js/Components/KanbanBoard.tsx b/Modules/TaskManagement/resources/js/Components/KanbanBoard.tsx
index 9575346..1441750 100644
--- a/Modules/TaskManagement/resources/js/Components/KanbanBoard.tsx
+++ b/Modules/TaskManagement/resources/js/Components/KanbanBoard.tsx
@@ -3,7 +3,7 @@ import { DragDropContext, Droppable, Draggable, DropResult } from '@hello-pangea
 import { Card, CardContent } from '@/Components/ui/card';
 import { Badge } from '@/Components/ui/badge';
 import { Avatar, AvatarFallback, AvatarImage } from '@/Components/ui/avatar';
-import { Clock, Users, Lock, GripVertical } from 'lucide-react';
+import { Clock, Users, Lock, GripVertical, Camera } from 'lucide-react';
 
 interface KanbanBoardProps {
     tasks: any[];
@@ -156,9 +156,17 @@ export default function KanbanBoard({ tasks, onReorder, onTaskClick, readOnly =
                                                                 <div className="flex items-center gap-1.5" title="Total Cost">
                                                                     <span>{formatCurrency(task.total_cost || 0)}</span>
                                                                 </div>
-                                                                <div className="flex items-center gap-1.5" title="Estimated Hours">
-                                                                    <Clock className="w-3.5 h-3.5" />
-                                                                    <span>{task.estimated_hours || 0}h</span>
+                                                                <div className="flex items-center gap-2">
+                                                                    {task.evidence_urls && task.evidence_urls.length > 0 && (
+                                                                        <div className="flex items-center gap-1 text-[10px] text-indigo-600 font-semibold bg-indigo-50 px-1.5 py-0.5 rounded border border-indigo-100/80" title={`${task.evidence_urls.length} evidence photo(s)`}>
+                                                                            <Camera className="w-3 h-3 text-indigo-500" />
+                                                                            <span>{task.evidence_urls.length}</span>
+                                                                        </div>
+                                                                    )}
+                                                                    <div className="flex items-center gap-1.5" title="Estimated Hours">
+                                                                        <Clock className="w-3.5 h-3.5" />
+                                                                        <span>{task.estimated_hours || 0}h</span>
+                                                                    </div>
                                                                 </div>
                                                             </div>
 
diff --git a/Modules/TaskManagement/resources/js/Pages/Tasks/Index.tsx b/Modules/TaskManagement/resources/js/Pages/Tasks/Index.tsx
index 7569de8..5c635b3 100644
--- a/Modules/TaskManagement/resources/js/Pages/Tasks/Index.tsx
+++ b/Modules/TaskManagement/resources/js/Pages/Tasks/Index.tsx
@@ -15,6 +15,7 @@ import MaterialPickerModal from '@/Components/MaterialPickerModal';
 import KanbanBoard from '../../Components/KanbanBoard';
 import { LayoutList, Kanban, Activity as ActivityIcon } from 'lucide-react';
 import { Textarea } from '@/Components/ui/textarea';
+import TaskEvidenceUploader from '@/Components/TaskEvidenceUploader';
 
 export default function Tasks({ project, employees, availableMaterials, delayReasons, weatherConditions }: any) {
     const { can, hasRole } = usePermission();
@@ -38,11 +39,13 @@ export default function Tasks({ project, employees, availableMaterials, delayRea
         project_id: project?.id || '',
         name: '', description: '', assigned_users: [] as string[], labor_cost: '', equipment_cost: '', estimated_hours: '', start_date: '', end_date: '',
         milestone_id: '',
+        evidence: [] as File[],
     });
 
     const editForm = useForm({
         name: '', description: '', assigned_users: [] as string[], labor_cost: '', equipment_cost: '', estimated_hours: '', start_date: '', end_date: '',
         milestone_id: '',
+        evidence: [] as File[],
     });
 
     const [editingTask, setEditingTask] = useState<any | null>(null);
@@ -235,6 +238,11 @@ export default function Tasks({ project, employees, availableMaterials, delayRea
                                                         ))}
                                                     </select>
                                                 </FormField>
+                                                <div className="pt-2 border-t border-slate-100 mt-3">
+                                                    <TaskEvidenceUploader
+                                                        onFilesSelected={(files) => taskForm.setData('evidence', files)}
+                                                    />
+                                                </div>
                                                 <div className="flex justify-end mt-4">
                                                     <Button type="submit" disabled={taskForm.processing}><Plus className="mr-2 h-4 w-4" /> Add</Button>
                                                 </div>
@@ -529,6 +537,25 @@ export default function Tasks({ project, employees, availableMaterials, delayRea
                                  </div>
                              </div>
 
+                             <div className="border-t pt-4 space-y-3">
+                                 <TaskEvidenceUploader
+                                     existingEvidence={detailsTask.evidence_urls || []}
+                                     readOnly={!canManageTaskStatus}
+                                     onUploadNewFiles={(files) => {
+                                         router.post(route('projects.tasks.evidence.store', detailsTask.ulid), {
+                                             evidence: files,
+                                         }, {
+                                             preserveScroll: true,
+                                         });
+                                     }}
+                                     onDeleteExistingMedia={(mediaId) => {
+                                         router.delete(route('projects.tasks.evidence.destroy', [detailsTask.ulid, mediaId]), {
+                                             preserveScroll: true,
+                                         });
+                                     }}
+                                 />
+                             </div>
+
                             <div className="border-t pt-4 space-y-3">
                                 <div className="flex items-center justify-between">
                                     <h4 className="text-sm font-medium flex items-center gap-2">
@@ -679,6 +706,15 @@ export default function Tasks({ project, employees, availableMaterials, delayRea
                                     ))}
                                 </select>
                             </FormField>
+                            <div className="pt-2 border-t border-slate-100 mt-3">
+                                <TaskEvidenceUploader
+                                    existingEvidence={editingTask.evidence_urls || []}
+                                    onFilesSelected={(files) => editForm.setData('evidence', files)}
+                                    onDeleteExistingMedia={(mediaId) => {
+                                        router.delete(route('projects.tasks.evidence.destroy', [editingTask.ulid, mediaId]));
+                                    }}
+                                />
+                            </div>
                             <div className="flex justify-end mt-4">
                                 <Button type="submit" disabled={editForm.processing}>Save Changes</Button>
                             </div>
diff --git a/Modules/TaskManagement/routes/web.php b/Modules/TaskManagement/routes/web.php
index e7dcf60..add506d 100644
--- a/Modules/TaskManagement/routes/web.php
+++ b/Modules/TaskManagement/routes/web.php
@@ -15,6 +15,8 @@ Route::middleware(['web', 'auth', 'permission:projects.access'])->group(function
     Route::delete('tasks/{task}', [TaskController::class, 'destroy'])->name('projects.tasks.destroy');
     Route::patch('tasks/{task}/transition', [TaskController::class, 'transition'])->name('projects.tasks.transition');
     Route::post('tasks/reorder', [TaskController::class, 'reorder'])->name('projects.tasks.reorder');
+    Route::post('tasks/{task}/evidence', [TaskController::class, 'uploadEvidence'])->name('projects.tasks.evidence.store');
+    Route::delete('tasks/{task}/evidence/{media}', [TaskController::class, 'deleteEvidence'])->name('projects.tasks.evidence.destroy');
 
     // Task Import
     Route::get('projects/{project}/tasks/template', [TaskImportController::class, 'template'])->name('projects.tasks.template');
diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php
index aaa81ba..e70241f 100644
--- a/app/Http/Controllers/DashboardController.php
+++ b/app/Http/Controllers/DashboardController.php
@@ -407,15 +407,38 @@ class DashboardController extends Controller
             ->count();
 
         // 2. PM Milestone & Progress Analytics
-        $milestonesQuery = \Modules\TimelineScheduling\Models\Milestone::query();
+        $milestonesQuery = \Modules\ProjectManagement\Models\ProjectMilestone::with('tasks');
         if ($project) {
             $milestonesQuery->where('project_id', $project->id);
         } else {
             $milestonesQuery->whereIn('project_id', $visibleProjectIds);
         }
-        $totalMilestones = $milestonesQuery->count();
-        $completedMilestones = (clone $milestonesQuery)->where('status', 'completed')->count();
-        $inProgressMilestones = (clone $milestonesQuery)->where('status', 'in_progress')->count();
+        $allMilestones = $milestonesQuery->get();
+        $totalMilestones = $allMilestones->count();
+        $completedMilestones = 0;
+        $inProgressMilestones = 0;
+
+        foreach ($allMilestones as $m) {
+            $taskCount = $m->tasks->count();
+            $completedTaskCount = $m->tasks->filter(function ($t) {
+                $st = is_object($t->status) ? $t->status->value : $t->status;
+                return in_array(strtolower($st ?? ''), ['completed', 'closed', 'done']);
+            })->count();
+
+            $isCompleted = ($m->actual_date !== null) || ($taskCount > 0 && $completedTaskCount === $taskCount);
+
+            if ($isCompleted) {
+                $completedMilestones++;
+            } else {
+                $hasActivity = $m->planned_date !== null || $m->tasks->contains(function ($t) {
+                    $st = is_object($t->status) ? $t->status->value : $t->status;
+                    return in_array(strtolower($st ?? ''), ['in_progress', 'completed', 'closed', 'done']);
+                });
+                if ($hasActivity) {
+                    $inProgressMilestones++;
+                }
+            }
+        }
 
         // 3. Subcontractor / Bidding Analytics
         $bidsQuery = \Modules\BiddingManagement\Models\BidPackage::query();
@@ -425,11 +448,33 @@ class DashboardController extends Controller
             $bidsQuery->whereIn('project_id', $visibleProjectIds);
         }
         $activeBids = $bidsQuery->count();
-        $openInvitations = \Modules\BiddingManagement\Models\BidInvitation::where('status', 'sent')
-            ->whereHas('package', function ($query) use ($visibleProjectIds, $project) {
-                $query->whereIn('project_id', $project ? [$project->id] : $visibleProjectIds);
-            })
-            ->count();
+
+        $openInvitationsQuery = \Modules\BiddingManagement\Models\BidInvitation::query()
+            ->whereIn('status', ['invited', 'accepted'])
+            ->whereDoesntHave('submission');
+
+        if ($user?->contractor_id) {
+            $openInvitationsQuery->where('contractor_id', $user->contractor_id);
+            $openInvitations = $openInvitationsQuery
+                ->whereHas('package', function ($query) use ($project) {
+                    $query->where('status', 'open');
+                    if ($project) {
+                        $query->where('project_id', $project->id);
+                    }
+                })
+                ->count();
+        } else {
+            $openInvitations = $openInvitationsQuery
+                ->whereHas('package', function ($query) use ($visibleProjectIds, $project) {
+                    $query->where('status', 'open');
+                    if ($project) {
+                        $query->where('project_id', $project->id);
+                    } elseif (!empty($visibleProjectIds)) {
+                        $query->whereIn('project_id', $visibleProjectIds);
+                    }
+                })
+                ->count();
+        }
 
         // 4. Warehouse & Technical Inventory
         $totalItems = \Modules\MasterData\Models\Material::count();
@@ -437,6 +482,41 @@ class DashboardController extends Controller
         $totalDocuments = \Modules\DocumentManagement\Models\Document::whereIn('project_id', $project ? [$project->id] : $visibleProjectIds)->count();
         $pendingCashAdvances = \Modules\FinancialManagement\Models\CashAdvance::where('status', 'pending')->count();
 
+        // 5. Unconfirmed Payments
+        $pendingInvoicesList = \Modules\FinancialManagement\Models\FinancialInvoice::with('project:id,name,code')
+            ->whereIn('project_id', $visibleProjectIds)
+            ->where('status', 'payment_sent')
+            ->get(['id', 'ulid', 'invoice_number', 'project_id', 'total_amount', 'status'])
+            ->map(fn ($inv) => [
+                'id' => 'inv_' . $inv->id,
+                'ulid' => $inv->ulid,
+                'number' => $inv->invoice_number,
+                'project_name' => $inv->project?->name ?? 'Project',
+                'amount' => (float) $inv->total_amount,
+                'type' => 'invoice',
+                'confirm_url' => route('finance.confirm-payment', $inv->ulid),
+                'view_url' => route('finance.show', $inv->ulid),
+            ]);
+
+        $pendingRetentionsList = \Modules\FinancialManagement\Models\RetentionEntry::with('project:id,name,code')
+            ->whereIn('project_id', $visibleProjectIds)
+            ->where('type', 'credit')
+            ->whereIn('status', ['payment_sent', 'submitted'])
+            ->get(['id', 'ulid', 'project_id', 'amount', 'status', 'description'])
+            ->map(fn ($ret) => [
+                'id' => 'ret_' . $ret->id,
+                'ulid' => $ret->ulid,
+                'number' => 'Retention Release',
+                'project_name' => $ret->project?->name ?? 'Project',
+                'amount' => (float) $ret->amount,
+                'type' => 'retention',
+                'status' => $ret->status,
+                'confirm_url' => route('retention.confirm', $ret->ulid),
+                'view_url' => route('retention.index'),
+            ]);
+
+        $mergedPayments = $pendingInvoicesList->concat($pendingRetentionsList);
+
         return [
             'role' => $roleName,
             'roles' => $user?->getRoleNames()->values()->all() ?? [],
@@ -470,6 +550,11 @@ class DashboardController extends Controller
                 'documents' => $totalDocuments,
                 'pending_cash_advances' => $pendingCashAdvances,
             ],
+            'unconfirmed_payments' => [
+                'count' => $mergedPayments->count(),
+                'total_amount' => (float) $mergedPayments->sum('amount'),
+                'items' => $mergedPayments->values()->all(),
+            ],
         ];
     }
 }
diff --git a/app/Http/Middleware/HandleInertiaRequests.php b/app/Http/Middleware/HandleInertiaRequests.php
index e5924d5..2919458 100644
--- a/app/Http/Middleware/HandleInertiaRequests.php
+++ b/app/Http/Middleware/HandleInertiaRequests.php
@@ -85,6 +85,47 @@ class HandleInertiaRequests extends Middleware
                     ->with('parentProject:id,ulid,name,code')
                     ->get(['id', 'ulid', 'name', 'code', 'project_type', 'parent_project_id', 'status'])
                 : [],
+            'unconfirmed_payments' => fn () => $request->user() ? (function () use ($request) {
+                $visibleProjectIds = Project::query()->pluck('projects.id')->all();
+                $pendingInvoices = \Modules\FinancialManagement\Models\FinancialInvoice::with('project:id,name,code')
+                    ->whereIn('project_id', $visibleProjectIds)
+                    ->where('status', 'payment_sent')
+                    ->get(['id', 'ulid', 'invoice_number', 'project_id', 'total_amount', 'status'])
+                    ->map(fn ($inv) => [
+                        'id' => 'inv_' . $inv->id,
+                        'ulid' => $inv->ulid,
+                        'number' => $inv->invoice_number,
+                        'project_name' => $inv->project?->name ?? 'Project',
+                        'amount' => (float) $inv->total_amount,
+                        'type' => 'invoice',
+                        'confirm_url' => route('finance.confirm-payment', $inv->ulid),
+                        'view_url' => route('finance.show', $inv->ulid),
+                    ]);
+
+                $pendingRetentions = \Modules\FinancialManagement\Models\RetentionEntry::with('project:id,name,code')
+                    ->whereIn('project_id', $visibleProjectIds)
+                    ->where('type', 'credit')
+                    ->whereIn('status', ['payment_sent', 'submitted'])
+                    ->get(['id', 'ulid', 'project_id', 'amount', 'status', 'description'])
+                    ->map(fn ($ret) => [
+                        'id' => 'ret_' . $ret->id,
+                        'ulid' => $ret->ulid,
+                        'number' => 'Retention Release',
+                        'project_name' => $ret->project?->name ?? 'Project',
+                        'amount' => (float) $ret->amount,
+                        'type' => 'retention',
+                        'status' => $ret->status,
+                        'confirm_url' => route('retention.confirm', $ret->ulid),
+                        'view_url' => route('retention.index'),
+                    ]);
+
+                $merged = $pendingInvoices->concat($pendingRetentions);
+                return [
+                    'count' => $merged->count(),
+                    'total_amount' => (float) $merged->sum('amount'),
+                    'items' => $merged->values()->all(),
+                ];
+            })() : ['count' => 0, 'total_amount' => 0, 'items' => []],
         ];
     }
 }
diff --git a/resources/js/Components/ConfirmModal.tsx b/resources/js/Components/ConfirmModal.tsx
index 70c1977..126ddf0 100644
--- a/resources/js/Components/ConfirmModal.tsx
+++ b/resources/js/Components/ConfirmModal.tsx
@@ -8,7 +8,7 @@ import {
     DialogFooter,
 } from '@/Components/ui/dialog';
 import { Button } from '@/Components/ui/button';
-import { AlertTriangle, Info, CheckCircle2, Send, HelpCircle } from 'lucide-react';
+import { AlertTriangle, Info, CheckCircle2, Send, HelpCircle, Loader2 } from 'lucide-react';
 
 interface ConfirmModalProps {
     open: boolean;
@@ -18,6 +18,7 @@ interface ConfirmModalProps {
     confirmText?: string;
     cancelText?: string;
     variant?: 'default' | 'destructive' | 'warning' | 'info';
+    loading?: boolean;
     onConfirm: () => void;
     onCancel?: () => void;
 }
@@ -30,6 +31,7 @@ export function ConfirmModal({
     confirmText = 'Confirm',
     cancelText = 'Cancel',
     variant = 'info',
+    loading = false,
     onConfirm,
     onCancel,
 }: ConfirmModalProps) {
@@ -60,9 +62,9 @@ export function ConfirmModal({
     };
 
     return (
-        <Dialog open={open} onOpenChange={onOpenChange}>
+        <Dialog open={open} onOpenChange={(val) => { if (!loading) onOpenChange(val); }}>
             <DialogContent
-                showCloseButton={false}
+                showCloseButton={!loading}
                 className="sm:max-w-md bg-white border border-slate-200/80 shadow-2xl rounded-2xl p-0 overflow-hidden"
             >
                 <div className="p-6 flex items-start gap-3.5">
@@ -89,6 +91,7 @@ export function ConfirmModal({
                         type="button"
                         variant="outline"
                         size="sm"
+                        disabled={loading}
                         className="border-slate-200 bg-white text-slate-700 hover:bg-slate-100 hover:text-slate-900 font-medium px-4 text-xs h-8.5 rounded-lg shadow-2xs"
                         onClick={() => {
                             if (onCancel) onCancel();
@@ -100,12 +103,13 @@ export function ConfirmModal({
                     <Button
                         type="button"
                         size="sm"
-                        className={`px-4 text-xs h-8.5 rounded-lg transition-all ${confirmButtonClass()}`}
+                        disabled={loading}
+                        className={`px-4 text-xs h-8.5 rounded-lg transition-all flex items-center justify-center gap-1.5 ${confirmButtonClass()}`}
                         onClick={() => {
                             onConfirm();
-                            onOpenChange(false);
                         }}
                     >
+                        {loading && <Loader2 className="h-3.5 w-3.5 animate-spin" />}
                         {confirmText}
                     </Button>
                 </DialogFooter>
diff --git a/resources/js/Components/Dashboard/RoleAnalyticsBanner.tsx b/resources/js/Components/Dashboard/RoleAnalyticsBanner.tsx
index e3bde32..f35d12f 100644
--- a/resources/js/Components/Dashboard/RoleAnalyticsBanner.tsx
+++ b/resources/js/Components/Dashboard/RoleAnalyticsBanner.tsx
@@ -47,15 +47,22 @@ interface RoleAnalyticsProps {
             documents: number;
             pending_cash_advances: number;
         };
+        unconfirmed_payments?: {
+            count: number;
+            total_amount: number;
+            items: any[];
+        };
     };
 }
 
 export default function RoleAnalyticsBanner({ analytics }: RoleAnalyticsProps) {
     const role = (analytics?.role || '').toLowerCase();
-    const isExecutive = role.includes('admin') || role.includes('super');
-    const isPM = role.includes('project manager');
-    const isContractor = role.includes('contractor');
+    const userType = (analytics?.user_type || '').toLowerCase();
+    const isExecutive = role.includes('admin') || role.includes('super') || role.includes('project manager') || userType === 'admin' || userType === 'super_admin' || userType === 'project_manager';
+    const isPM = role.includes('project manager') || role.includes('pm') || userType === 'project_manager';
+    const isContractor = role.includes('contractor') || userType === 'contractor';
     const isSupervisor = role.includes('supervisor');
+    const isContractorAdmin = !isExecutive && isContractor;
 
     return (
         <div className="mb-8">
@@ -288,6 +295,84 @@ export default function RoleAnalyticsBanner({ analytics }: RoleAnalyticsProps) {
                     </Card>
                 </div>
             )}
+            {/* 5. Pending Payment Confirmations Action Center (Executive & Contractor) */}
+            {Boolean(analytics?.unconfirmed_payments?.items?.length) && (
+                <div className="mt-6">
+                    <Card className="bg-gradient-to-r from-slate-900 via-emerald-950 to-slate-900 border-emerald-500/40 text-white shadow-xl">
+                        <CardContent className="p-6">
+                            <div className="flex flex-col sm:flex-row sm:items-center justify-between gap-4 pb-4 border-b border-emerald-500/20">
+                                <div>
+                                    <div className="flex items-center gap-2">
+                                        <span className="inline-flex items-center rounded-md bg-emerald-500/20 px-2.5 py-1 text-xs font-bold text-emerald-300 ring-1 ring-inset ring-emerald-500/40 animate-pulse">
+                                            ACTION REQUIRED
+                                        </span>
+                                        <h3 className="text-lg font-bold text-white">Pending Payment Confirmations</h3>
+                                    </div>
+                                    <p className="text-xs text-slate-300 mt-1">
+                                        {isContractor 
+                                            ? 'Executive has released payment. Please verify receipt and click Confirm below.' 
+                                            : 'Payment marked as released by Executive. Awaiting receipt confirmation from contractor.'}
+                                    </p>
+                                </div>
+                                <div className="text-left sm:text-right">
+                                    <span className="text-xs uppercase text-slate-400 font-semibold block">Total Pending Confirmation</span>
+                                    <span className="text-xl font-black text-emerald-400">
+                                        {formatCurrency(analytics?.unconfirmed_payments?.total_amount || 0)}
+                                    </span>
+                                </div>
+                            </div>
+
+                            <div className="mt-4 space-y-3">
+                                {analytics?.unconfirmed_payments?.items?.map((item: any) => (
+                                    <div 
+                                        key={item.id} 
+                                        className="flex flex-col sm:flex-row sm:items-center justify-between gap-3 bg-slate-800/80 p-3.5 rounded-xl border border-slate-700/80 hover:border-emerald-500/40 transition-colors"
+                                    >
+                                        <div className="flex items-start gap-3">
+                                            <div className="p-2.5 bg-emerald-500/10 rounded-lg text-emerald-400 border border-emerald-500/20 shrink-0 mt-0.5 sm:mt-0">
+                                                <DollarSign className="w-5 h-5" />
+                                            </div>
+                                            <div>
+                                                <div className="flex items-center gap-2">
+                                                    <span className="font-bold text-sm text-white">{item.number}</span>
+                                                    <span className="text-xs font-semibold px-2 py-0.5 rounded bg-slate-700 text-slate-300 uppercase">
+                                                        {item.type}
+                                                    </span>
+                                                </div>
+                                                <p className="text-xs text-slate-400 mt-0.5">
+                                                    Project: <span className="text-slate-200 font-medium">{item.project_name}</span>
+                                                </p>
+                                            </div>
+                                        </div>
+
+                                        <div className="flex items-center justify-between sm:justify-end gap-4 w-full sm:w-auto pt-2 sm:pt-0 border-t sm:border-t-0 border-slate-700/60">
+                                            <span className="text-sm font-bold text-emerald-400">
+                                                {formatCurrency(item.amount)}
+                                            </span>
+
+                                            {isContractorAdmin ? (
+                                                <Link 
+                                                    href={item.confirm_url}
+                                                    method="post"
+                                                    as="button"
+                                                    className="bg-emerald-500 hover:bg-emerald-400 text-slate-950 font-bold px-3.5 py-1.5 rounded-lg text-xs transition-colors flex items-center gap-1.5 shadow-md shrink-0"
+                                                >
+                                                    <CheckCircle2 className="w-4 h-4" />
+                                                    Confirm Payment Receipt
+                                                </Link>
+                                            ) : (
+                                                <span className="text-xs font-semibold px-2.5 py-1 rounded bg-amber-500/20 text-amber-300 border border-amber-500/30">
+                                                    Awaiting Contractor Admin Confirmation
+                                                </span>
+                                            )}
+                                        </div>
+                                    </div>
+                                ))}
+                            </div>
+                        </CardContent>
+                    </Card>
+                </div>
+            )}
         </div>
     );
 }
diff --git a/resources/js/Components/TaskEvidenceUploader.tsx b/resources/js/Components/TaskEvidenceUploader.tsx
new file mode 100644
index 0000000..6828b62
--- /dev/null
+++ b/resources/js/Components/TaskEvidenceUploader.tsx
@@ -0,0 +1,222 @@
+import React, { useState } from 'react';
+import { Button } from '@/Components/ui/button';
+import { Badge } from '@/Components/ui/badge';
+import { Camera, Image as ImageIcon, Trash2, X, Maximize2, UploadCloud } from 'lucide-react';
+import {
+    Dialog,
+    DialogContent,
+    DialogHeader,
+    DialogTitle,
+} from '@/Components/ui/dialog';
+
+export interface EvidenceMedia {
+    id: number;
+    name: string;
+    file_name: string;
+    original_url: string;
+    mime_type: string;
+    size: number;
+}
+
+interface Props {
+    existingEvidence?: EvidenceMedia[];
+    onFilesSelected?: (files: File[]) => void;
+    onUploadNewFiles?: (files: File[]) => void;
+    onDeleteExistingMedia?: (mediaId: number) => void;
+    readOnly?: boolean;
+    compact?: boolean;
+    label?: string;
+    uploading?: boolean;
+}
+
+export default function TaskEvidenceUploader({
+    existingEvidence = [],
+    onFilesSelected,
+    onUploadNewFiles,
+    onDeleteExistingMedia,
+    readOnly = false,
+    compact = false,
+    label = 'Evidence Photos',
+    uploading = false,
+}: Props) {
+    const [selectedFiles, setSelectedFiles] = useState<File[]>([]);
+    const [previews, setPreviews] = useState<string[]>([]);
+    const [lightboxUrl, setLightboxUrl] = useState<string | null>(null);
+
+    const handleFileChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+        if (!e.target.files) return;
+        const newFiles = Array.from(e.target.files);
+        const updatedFiles = [...selectedFiles, ...newFiles];
+        setSelectedFiles(updatedFiles);
+
+        // Generate preview URLs
+        const newPreviews = newFiles.map(file => URL.createObjectURL(file));
+        setPreviews(prev => [...prev, ...newPreviews]);
+
+        if (onFilesSelected) {
+            onFilesSelected(updatedFiles);
+        }
+    };
+
+    const removeNewFile = (index: number) => {
+        const updatedFiles = selectedFiles.filter((_, i) => i !== index);
+        const updatedPreviews = previews.filter((_, i) => i !== index);
+        
+        // Revoke Object URL
+        URL.revokeObjectURL(previews[index]);
+        
+        setSelectedFiles(updatedFiles);
+        setPreviews(updatedPreviews);
+
+        if (onFilesSelected) {
+            onFilesSelected(updatedFiles);
+        }
+    };
+
+    return (
+        <div className="space-y-3">
+            <div className="flex items-center justify-between">
+                <label className="text-xs font-semibold text-slate-700 flex items-center gap-1.5">
+                    <Camera className="h-4 w-4 text-indigo-600" />
+                    {label}
+                    {(existingEvidence.length > 0 || selectedFiles.length > 0) && (
+                        <Badge variant="secondary" className="text-[10px] px-1.5 py-0 font-mono">
+                            {existingEvidence.length + selectedFiles.length} photos
+                        </Badge>
+                    )}
+                </label>
+
+                {!readOnly && (
+                    <label className="cursor-pointer inline-flex items-center gap-1.5 text-xs font-semibold text-indigo-600 hover:text-indigo-800 bg-indigo-50 hover:bg-indigo-100 px-3 py-1.5 rounded-lg border border-indigo-200/60 transition-colors">
+                        <UploadCloud className="h-4 w-4" />
+                        <span>Add Photos</span>
+                        <input
+                            type="file"
+                            multiple
+                            accept="image/*"
+                            onChange={handleFileChange}
+                            className="hidden"
+                        />
+                    </label>
+                )}
+            </div>
+
+            {/* Photos Grid */}
+            <div className="grid grid-cols-3 sm:grid-cols-4 md:grid-cols-6 gap-2.5">
+                {/* Existing Saved Evidence Media */}
+                {existingEvidence.map((media) => (
+                    <div key={media.id} className="group relative rounded-xl border border-slate-200 bg-slate-100 overflow-hidden aspect-square shadow-xs hover:shadow-md transition-all">
+                        <img
+                            src={media.original_url}
+                            alt={media.name}
+                            className="w-full h-full object-cover cursor-pointer hover:scale-105 transition-transform"
+                            onClick={() => setLightboxUrl(media.original_url)}
+                        />
+                        <div className="absolute inset-0 bg-black/40 opacity-0 group-hover:opacity-100 transition-opacity flex items-center justify-center gap-1">
+                            <Button
+                                type="button"
+                                variant="ghost"
+                                size="icon"
+                                onClick={() => setLightboxUrl(media.original_url)}
+                                className="h-7 w-7 text-white hover:bg-white/20 rounded-full"
+                            >
+                                <Maximize2 className="h-3.5 w-3.5" />
+                            </Button>
+                            {!readOnly && onDeleteExistingMedia && (
+                                <Button
+                                    type="button"
+                                    variant="ghost"
+                                    size="icon"
+                                    onClick={() => onDeleteExistingMedia(media.id)}
+                                    className="h-7 w-7 text-rose-400 hover:text-rose-200 hover:bg-rose-900/40 rounded-full"
+                                >
+                                    <Trash2 className="h-3.5 w-3.5" />
+                                </Button>
+                            )}
+                        </div>
+                    </div>
+                ))}
+
+                {/* Newly Selected Preview Images */}
+                {previews.map((src, idx) => (
+                    <div key={idx} className="group relative rounded-xl border-2 border-dashed border-indigo-400 bg-indigo-50/50 overflow-hidden aspect-square shadow-xs">
+                        <img
+                            src={src}
+                            alt={`Preview ${idx + 1}`}
+                            className="w-full h-full object-cover cursor-pointer"
+                            onClick={() => setLightboxUrl(src)}
+                        />
+                        <Badge className="absolute top-1 left-1 text-[9px] px-1 py-0 bg-indigo-600 text-white font-bold">
+                            NEW
+                        </Badge>
+                        <Button
+                            type="button"
+                            variant="ghost"
+                            size="icon"
+                            onClick={() => removeNewFile(idx)}
+                            className="absolute top-1 right-1 h-6 w-6 bg-slate-900/70 text-white hover:bg-rose-600 rounded-full p-1"
+                        >
+                            <X className="h-3 w-3" />
+                        </Button>
+                    </div>
+                ))}
+
+                {/* Empty Dropzone Placeholder */}
+                {!readOnly && existingEvidence.length === 0 && selectedFiles.length === 0 && (
+                    <label className="col-span-full border-2 border-dashed border-slate-200 rounded-xl p-4 flex flex-col items-center justify-center text-center cursor-pointer hover:border-indigo-300 hover:bg-indigo-50/20 transition-all">
+                        <ImageIcon className="h-8 w-8 text-slate-300 mb-1" />
+                        <span className="text-xs font-medium text-slate-600">No evidence photos attached yet</span>
+                        <span className="text-[10px] text-slate-400 mt-0.5">Click or drag images here to upload task evidence (.jpg, .png, .webp)</span>
+                        <input
+                            type="file"
+                            multiple
+                            accept="image/*"
+                            onChange={handleFileChange}
+                            className="hidden"
+                        />
+                    </label>
+                )}
+            </div>
+
+            {/* Action button to save/upload newly selected evidence photos */}
+            {selectedFiles.length > 0 && onUploadNewFiles && (
+                <div className="flex justify-end pt-1">
+                    <Button
+                        type="button"
+                        size="sm"
+                        disabled={uploading}
+                        onClick={() => {
+                            onUploadNewFiles(selectedFiles);
+                            setSelectedFiles([]);
+                            setPreviews([]);
+                        }}
+                        className="bg-indigo-600 hover:bg-indigo-700 text-white font-semibold shadow-xs flex items-center gap-1.5"
+                    >
+                        <UploadCloud className="h-4 w-4" />
+                        <span>Upload {selectedFiles.length} Evidence {selectedFiles.length === 1 ? 'Photo' : 'Photos'}</span>
+                    </Button>
+                </div>
+            )}
+
+            {/* Image Preview Lightbox Dialog */}
+            <Dialog open={!!lightboxUrl} onOpenChange={() => setLightboxUrl(null)}>
+                <DialogContent className="max-w-4xl bg-slate-950/95 border-slate-800 text-white p-4">
+                    <DialogHeader className="flex flex-row items-center justify-between pb-2 border-b border-slate-800">
+                        <DialogTitle className="text-sm font-semibold flex items-center gap-2 text-slate-200">
+                            <Camera className="h-4 w-4 text-indigo-400" /> Evidence Photo Preview
+                        </DialogTitle>
+                    </DialogHeader>
+                    {lightboxUrl && (
+                        <div className="flex items-center justify-center py-4 max-h-[80vh]">
+                            <img
+                                src={lightboxUrl}
+                                alt="Evidence full view"
+                                className="max-h-[75vh] max-w-full object-contain rounded-lg shadow-2xl border border-slate-800"
+                            />
+                        </div>
+                    )}
+                </DialogContent>
+            </Dialog>
+        </div>
+    );
+}
diff --git a/resources/js/Layouts/AuthenticatedLayout.tsx b/resources/js/Layouts/AuthenticatedLayout.tsx
index bb1047e..6ba4b42 100644
--- a/resources/js/Layouts/AuthenticatedLayout.tsx
+++ b/resources/js/Layouts/AuthenticatedLayout.tsx
@@ -1,21 +1,37 @@
 import { SidebarInset, SidebarProvider, SidebarTrigger } from '@/Components/ui/sidebar';
 import { Separator } from '@/Components/ui/separator';
 import AppSidebar from '@/Components/AppSidebar';
-import { usePage, router } from '@inertiajs/react';
+import { usePage, router, Link } from '@inertiajs/react';
 import { PropsWithChildren, ReactNode, useEffect, useState } from 'react';
 import { PageProps } from '@/types';
-import { ShieldAlert, Check, AlertCircle, X } from 'lucide-react';
+import { ShieldAlert, Check, AlertCircle, X, Bell, DollarSign, ArrowRight } from 'lucide-react';
 import Modal from '@/Components/Modal';
 import { Button } from '@/Components/ui/button';
+import { formatCurrency } from '@/lib/utils';
 
 export default function Authenticated({
     header,
     children,
 }: PropsWithChildren<{ header?: ReactNode }>) {
-    const { flash } = usePage<PageProps>().props;
+    const { flash, auth } = usePage<PageProps & { unconfirmed_payments?: { count: number; total_amount: number; items: any[] } }>().props;
     const [showErrorModal, setShowErrorModal] = useState(false);
     const [errorMessage, setErrorMessage] = useState('');
     const [localFlash, setLocalFlash] = useState<{ success?: string; error?: string } | null>(null);
+    const [dismissPill, setDismissPill] = useState(false);
+
+    const unconfirmedPayments = (usePage().props as any).unconfirmed_payments;
+    const pendingCount = unconfirmedPayments?.count || 0;
+    const pendingTotal = unconfirmedPayments?.total_amount || 0;
+
+    const userRoles = ((auth?.roles || []) as string[]).map(r => (typeof r === 'string' ? r : (r as any).name || '').toLowerCase());
+    const userType = (auth?.user?.user_type || '').toLowerCase();
+    const isExecutive = userType === 'admin' || userType === 'super_admin' || userType === 'project_manager' || userRoles.some(r => ['super admin', 'admin', 'project manager', 'executive'].includes(r));
+    const isSiteOperations = userType === 'site_technical' || userType === 'supervisor' || userType === 'operator' || userRoles.some(r => r.includes('site') || r.includes('supervisor') || r.includes('operator') || r.includes('technical'));
+    const isContractorAdmin = !isExecutive && !isSiteOperations && (
+        userType === 'contractor'
+        || auth?.user?.contractor_id !== null
+        || userRoles.some(r => r.includes('contractor'))
+    );
 
     useEffect(() => {
         if (flash?.error) {
@@ -90,7 +106,7 @@ export default function Authenticated({
                     )}
                 </header>
 
-                <div className="flex-1">
+                <div className="flex-1 relative">
                     {localFlash && (localFlash.success || localFlash.error) && (
                         <div className="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8 pt-4">
                             <div className={`flex items-center justify-between p-4 rounded-xl border shadow-sm transition-all duration-300 ${
@@ -110,6 +126,47 @@ export default function Authenticated({
                     )}
                     {children}
                 </div>
+
+                {/* Sticky Notification Pill for Unconfirmed Payments */}
+                {isContractorAdmin && pendingCount > 0 && !dismissPill && (
+                    <div className="fixed bottom-5 right-5 z-50 animate-bounce-short">
+                        <div className="flex items-center gap-3 bg-gradient-to-r from-emerald-900 via-slate-900 to-indigo-950 text-white p-4 rounded-2xl shadow-2xl border border-emerald-500/40 backdrop-blur-md max-w-md">
+                            <div className="flex h-10 w-10 shrink-0 items-center justify-center rounded-xl bg-emerald-500/20 text-emerald-400 border border-emerald-500/30">
+                                <DollarSign className="h-5 w-5 animate-pulse" />
+                            </div>
+                            <div className="flex-1 min-w-0">
+                                <div className="flex items-center gap-2">
+                                    <span className="inline-flex items-center rounded-full bg-emerald-400/20 px-2 py-0.5 text-xs font-bold text-emerald-300 ring-1 ring-inset ring-emerald-400/30">
+                                        {pendingCount} Pending Release{pendingCount > 1 ? 's' : ''}
+                                    </span>
+                                    <span className="text-xs font-semibold text-emerald-200">{formatCurrency(pendingTotal)}</span>
+                                </div>
+                                <p className="text-xs text-slate-300 mt-1 truncate">
+                                    Executive released funds. Awaiting confirmation.
+                                </p>
+                            </div>
+                            <div className="flex items-center gap-2">
+                                <Link href={route('retention.index')}>
+                                    <Button 
+                                        size="icon-sm"
+                                        aria-label="View Retention Details"
+                                        title="View Retention Details"
+                                        className="bg-emerald-500 hover:bg-emerald-400 text-slate-950 font-bold shadow-md h-8 w-8 rounded-xl shrink-0 flex items-center justify-center transition-transform hover:scale-105"
+                                    >
+                                        <ArrowRight className="h-4 w-4" />
+                                    </Button>
+                                </Link>
+                                <button
+                                    type="button"
+                                    onClick={() => setDismissPill(true)}
+                                    className="p-1 rounded-lg text-slate-400 hover:text-white hover:bg-slate-800/60 transition-colors"
+                                >
+                                    <X className="h-4 w-4" />
+                                </button>
+                            </div>
+                        </div>
+                    </div>
+                )}
             </SidebarInset>
 
             <Modal show={showErrorModal} onClose={handleCloseError} maxWidth="md">
diff --git a/resources/js/lib/nav-config.ts b/resources/js/lib/nav-config.ts
index 20708bd..221f4bd 100644
--- a/resources/js/lib/nav-config.ts
+++ b/resources/js/lib/nav-config.ts
@@ -97,11 +97,15 @@ export const navigationConfig: NavGroup[] = [
                 ],
             },
             {
-                title: 'Labors',
+                title: 'Labor Catalog',
                 icon: Hammer,
                 href: 'labors.index',
                 routeMatch: 'labors.*',
                 permissions: ['labors.access'],
+                children: [
+                    { title: 'Single Laborers', href: 'labors.index', params: { tab: 'labor' }, routeMatch: 'labors.*' },
+                    { title: 'Job Bundles & Crew Packages', href: 'labors.index', params: { tab: 'bundles' }, routeMatch: 'labors.*' },
+                ],
             },
             {
                 title: 'Equipment & Tools',
diff --git a/tests/Feature/RoleBasedActionTest.php b/tests/Feature/RoleBasedActionTest.php
index 2b27a0d..c1086c3 100644
--- a/tests/Feature/RoleBasedActionTest.php
+++ b/tests/Feature/RoleBasedActionTest.php
@@ -532,4 +532,129 @@ class RoleBasedActionTest extends TestCase
                 ->where('resources.equipment.maintenance', 1)
             );
     }
+
+    public function test_two_step_executive_payment_release_and_contractor_receipt_confirmation(): void
+    {
+        $perm = \Spatie\Permission\Models\Permission::firstOrCreate(['name' => 'finance.access']);
+        $this->superAdmin->givePermissionTo($perm);
+        $this->contractorAdmin->givePermissionTo($perm);
+
+        $invoice = \Modules\FinancialManagement\Models\FinancialInvoice::create([
+            'project_id' => $this->project->id,
+            'invoice_number' => 'INV-TEST-001',
+            'status' => 'approved',
+            'billed_percentage' => 50,
+            'subtotal' => 100000,
+            'retention_amount' => 10000,
+            'total_amount' => 90000,
+            'paid_amount' => 0,
+            'invoice_date' => now()->toDateString(),
+        ]);
+
+        // 1. Super Admin releases payment
+        $response = $this->actingAs($this->superAdmin)
+            ->post(route('finance.payment', $invoice->ulid), ['amount' => 90000]);
+
+        $response->assertRedirect();
+        $invoice->refresh();
+
+        $this->assertEquals('payment_sent', $invoice->status->value);
+        $this->assertEquals(90000, (float) $invoice->paid_amount);
+
+        // Verify summary outstanding remains because contractor has not confirmed
+        $summaryResp = $this->actingAs($this->superAdmin)->get(route('finance.index'));
+        $summaryResp->assertStatus(200)
+            ->assertInertia(fn ($page) => $page
+                ->where('summary.total_paid', 0)
+                ->where('summary.outstanding', 90000)
+            );
+
+        // 2. Contractor confirms payment receipt
+        $confirmResp = $this->actingAs($this->contractorAdmin)
+            ->patch(route('finance.confirm-payment', $invoice->ulid));
+
+        $confirmResp->assertRedirect();
+        $invoice->refresh();
+
+        $this->assertEquals('paid', $invoice->status->value);
+        $this->assertNotNull($invoice->paid_at);
+
+        // Verify summary total_paid updates to 90,000 once confirmed
+        $updatedSummaryResp = $this->actingAs($this->superAdmin)->get(route('finance.index'));
+        $updatedSummaryResp->assertStatus(200)
+            ->assertInertia(fn ($page) => $page
+                ->where('summary.total_paid', 90000)
+                ->where('summary.outstanding', 0)
+            );
+    }
+
+    public function test_two_step_retention_payment_release_and_contractor_confirmation(): void
+    {
+        $perm = \Spatie\Permission\Models\Permission::firstOrCreate(['name' => 'finance.access']);
+        $this->superAdmin->givePermissionTo($perm);
+        $this->contractorAdmin->givePermissionTo($perm);
+
+        $retentionEntry = \Modules\FinancialManagement\Models\RetentionEntry::create([
+            'project_id' => $this->project->id,
+            'type' => 'credit',
+            'status' => 'submitted',
+            'amount' => 50000,
+            'description' => 'Retention release request',
+        ]);
+
+        // 1. Super Admin marks retention as paid (transitions to payment_sent)
+        $resp = $this->actingAs($this->superAdmin)
+            ->patch(route('retention.paid', $retentionEntry->ulid));
+
+        $resp->assertRedirect();
+        $retentionEntry->refresh();
+
+        $this->assertEquals('payment_sent', $retentionEntry->status);
+
+        // 2. Contractor confirms receipt of retention payment
+        $confirmResp = $this->actingAs($this->contractorAdmin)
+            ->patch(route('retention.confirm', $retentionEntry->ulid));
+
+        $confirmResp->assertRedirect();
+        $retentionEntry->refresh();
+
+        $this->assertEquals('paid', $retentionEntry->status);
+    }
+
+    public function test_executive_roles_forbidden_from_confirming_payment_receipt(): void
+    {
+        $perm = \Spatie\Permission\Models\Permission::firstOrCreate(['name' => 'finance.access']);
+        $this->superAdmin->givePermissionTo($perm);
+        $this->admin->givePermissionTo($perm);
+
+        $retentionEntry = \Modules\FinancialManagement\Models\RetentionEntry::create([
+            'project_id' => $this->project->id,
+            'type' => 'credit',
+            'status' => 'payment_sent',
+            'amount' => 25000,
+            'description' => 'Retention pending confirmation',
+        ]);
+
+        $invoice = \Modules\FinancialManagement\Models\FinancialInvoice::create([
+            'project_id' => $this->project->id,
+            'invoice_number' => 'INV-EXEC-DENY',
+            'status' => 'payment_sent',
+            'billed_percentage' => 100,
+            'subtotal' => 50000,
+            'retention_amount' => 5000,
+            'total_amount' => 45000,
+            'paid_amount' => 45000,
+            'invoice_date' => now()->toDateString(),
+        ]);
+
+        // Super Admin attempts to confirm retention receipt -> 403 Forbidden
+        $superAdminRetResp = $this->actingAs($this->superAdmin)
+            ->patch(route('retention.confirm', $retentionEntry->ulid));
+        $superAdminRetResp->assertStatus(403);
+
+        // Admin attempts to confirm invoice receipt -> 403 Forbidden
+        $adminInvResp = $this->actingAs($this->admin)
+            ->patch(route('finance.confirm-payment', $invoice->ulid));
+        $adminInvResp->assertStatus(403);
+    }
 }