diff --git a/Modules/ApprovalWorkflow/app/Http/Controllers/ApprovalController.php b/Modules/ApprovalWorkflow/app/Http/Controllers/ApprovalController.php
index 59b2050..1f8217b 100644
--- a/Modules/ApprovalWorkflow/app/Http/Controllers/ApprovalController.php
+++ b/Modules/ApprovalWorkflow/app/Http/Controllers/ApprovalController.php
@@ -23,16 +23,27 @@ class ApprovalController extends Controller
         $user = $request->user();
         $tab = $request->get('tab', 'pending');
 
+        $isAdmin = $user->user_type === 'admin' || $user->hasRole(['Super Admin', 'admin', 'Main Contractor Admin']);
+        $isApprovingRole = $isAdmin || $user->hasRole(['Project Manager', 'Contractor Admin']);
+
         $query = ApprovalChain::query();
 
         if ($tab === 'history') {
-            $query->whereHas('steps', function ($q) use ($user) {
-                $q->where('approver_id', $user->id)->where('status', '!=', 'pending');
-            });
+            if ($isApprovingRole) {
+                $query->whereIn('status', ['approved', 'rejected']);
+            } else {
+                $query->whereHas('steps', function ($q) use ($user) {
+                    $q->where('approver_id', $user->id)->where('status', '!=', 'pending');
+                });
+            }
         } else {
-            $query->whereHas('steps', function ($q) use ($user) {
-                $q->where('approver_id', $user->id)->where('status', 'pending');
-            })->whereIn('status', ['pending', 'in_review']);
+            if ($isApprovingRole) {
+                $query->whereIn('status', ['pending', 'in_review']);
+            } else {
+                $query->whereHas('steps', function ($q) use ($user) {
+                    $q->where('approver_id', $user->id)->where('status', 'pending');
+                })->whereIn('status', ['pending', 'in_review']);
+            }
         }
 
         $chains = $query->with(['steps.approver:id,name', 'initiator:id,name'])
diff --git a/Modules/ApprovalWorkflow/app/Services/ApprovalService.php b/Modules/ApprovalWorkflow/app/Services/ApprovalService.php
index d3e81a0..37d1aa6 100644
--- a/Modules/ApprovalWorkflow/app/Services/ApprovalService.php
+++ b/Modules/ApprovalWorkflow/app/Services/ApprovalService.php
@@ -63,6 +63,7 @@ class ApprovalService
         $step = $this->getCurrentStepForApprover($chain, $approver);
 
         $step->update([
+            'approver_id' => $approver->id,
             'status' => ApprovalStepStatus::Approved,
             'notes' => $notes,
             'acted_at' => now(),
@@ -70,17 +71,12 @@ class ApprovalService
 
         StepApproved::dispatch($chain, $step);
 
-        // Check if all steps are approved
-        if ($chain->isFullyApproved()) {
-            $chain->transitionTo(ApprovalChainStatus::Approved);
-            ApprovalCompleted::dispatch($chain);
-        } else {
-            // Notify next approver
-            $nextStep = $chain->currentStep();
-            if ($nextStep) {
-                ApprovalRequired::dispatch($chain, $nextStep);
-            }
-        }
+        // One admin/manager approval completes the chain for estimations, requisitions, and single-step requests
+        $chain->steps()->where('status', ApprovalStepStatus::Pending)->update([
+            'status' => ApprovalStepStatus::Skipped,
+        ]);
+        $chain->transitionTo(ApprovalChainStatus::Approved);
+        ApprovalCompleted::dispatch($chain);
 
         return $chain->fresh('steps.approver');
     }
@@ -126,7 +122,9 @@ class ApprovalService
             throw new \InvalidArgumentException('No pending step found in this approval chain.');
         }
 
-        if ($step->approver_id !== $approver->id) {
+        $isAdmin = $approver->user_type === 'admin' || $approver->hasRole(['Super Admin', 'admin', 'Main Contractor Admin']);
+
+        if ($step->approver_id !== $approver->id && !$isAdmin) {
             throw new \InvalidArgumentException('You are not the current approver for this step.');
         }
 
diff --git a/Modules/ApprovalWorkflow/resources/js/Components/ApprovalTimeline.tsx b/Modules/ApprovalWorkflow/resources/js/Components/ApprovalTimeline.tsx
index 15ef6e7..e454078 100644
--- a/Modules/ApprovalWorkflow/resources/js/Components/ApprovalTimeline.tsx
+++ b/Modules/ApprovalWorkflow/resources/js/Components/ApprovalTimeline.tsx
@@ -22,12 +22,14 @@ const statusConfig: Record<string, { icon: React.ComponentType<{ className?: str
 };
 
 export default function ApprovalTimeline({ steps }: Props) {
+    const visibleSteps = steps.filter(s => s.status !== 'skipped');
+
     return (
         <div className="space-y-0">
-            {steps.map((step, idx) => {
+            {visibleSteps.map((step, idx) => {
                 const config = statusConfig[step.status] || statusConfig.pending;
                 const Icon = config.icon;
-                const isLast = idx === steps.length - 1;
+                const isLast = idx === visibleSteps.length - 1;
 
                 return (
                     <div key={step.id} className="flex gap-3">
diff --git a/Modules/ApprovalWorkflow/resources/js/Pages/Approvals/Index.tsx b/Modules/ApprovalWorkflow/resources/js/Pages/Approvals/Index.tsx
index 1af8ebf..2e6c386 100644
--- a/Modules/ApprovalWorkflow/resources/js/Pages/Approvals/Index.tsx
+++ b/Modules/ApprovalWorkflow/resources/js/Pages/Approvals/Index.tsx
@@ -78,7 +78,6 @@ export default function Index({ approvals, tab }: Props) {
                                         <TableHead>Type</TableHead>
                                         <TableHead>Initiated By</TableHead>
                                         <TableHead>Status</TableHead>
-                                        <TableHead>Steps</TableHead>
                                         <TableHead>Submitted</TableHead>
                                         <TableHead className="text-right">Actions</TableHead>
                                     </TableRow>
@@ -86,7 +85,7 @@ export default function Index({ approvals, tab }: Props) {
                                 <TableBody>
                                     {approvals.data.length === 0 ? (
                                         <TableRow>
-                                            <TableCell colSpan={6} className="text-center text-gray-500 py-8">
+                                            <TableCell colSpan={5} className="text-center text-gray-500 py-8">
                                                 {isHistory ? 'No past approvals found.' : "No pending approvals. You're all caught up! 🎉"}
                                             </TableCell>
                                         </TableRow>
@@ -100,9 +99,6 @@ export default function Index({ approvals, tab }: Props) {
                                                         {typeLabel(chain.status)}
                                                     </Badge>
                                                 </TableCell>
-                                                <TableCell>
-                                                    {chain.steps.filter(s => s.status === 'approved').length}/{chain.steps.length}
-                                                </TableCell>
                                                 <TableCell className="text-gray-500">
                                                     {new Date(chain.created_at).toLocaleDateString()}
                                                 </TableCell>
diff --git a/Modules/ApprovalWorkflow/resources/js/Pages/Approvals/Show.tsx b/Modules/ApprovalWorkflow/resources/js/Pages/Approvals/Show.tsx
index 3b1f2c6..d098cae 100644
--- a/Modules/ApprovalWorkflow/resources/js/Pages/Approvals/Show.tsx
+++ b/Modules/ApprovalWorkflow/resources/js/Pages/Approvals/Show.tsx
@@ -40,7 +40,8 @@ export default function Show({ chain, breakdownData }: Props) {
     const [rejectNotes, setRejectNotes] = useState('');
 
     const currentStep = chain.steps.find(s => s.status === 'pending');
-    const isCurrentApprover = currentStep && currentStep.approver.id === auth.user.id;
+    const isAdmin = auth.user.user_type === 'admin' || auth.user.roles?.some((r: any) => ['Super Admin', 'admin', 'Main Contractor Admin'].includes(r.name));
+    const isCurrentApprover = currentStep && (currentStep.approver.id === auth.user.id || isAdmin);
 
     const handleApprove = () => {
         router.patch(route('approvals.approve', chain.ulid), { notes: approveNotes || undefined });
@@ -113,14 +114,6 @@ export default function Show({ chain, breakdownData }: Props) {
                     {/* Approvable Breakdown */}
                     <ApprovableBreakdown chain={chain} breakdownData={breakdownData} />
 
-                    {/* Timeline */}
-                    <Card className="mb-6">
-                        <CardHeader><CardTitle>Approval Progress</CardTitle></CardHeader>
-                        <CardContent>
-                            <ApprovalTimeline steps={chain.steps} />
-                        </CardContent>
-                    </Card>
-
                     {/* Action Buttons */}
                     {isCurrentApprover && chain.status === 'in_review' && (
                         <Card>
diff --git a/Modules/ContractorManagement/app/Http/Controllers/ContractorController.php b/Modules/ContractorManagement/app/Http/Controllers/ContractorController.php
index fefdc75..97a816f 100644
--- a/Modules/ContractorManagement/app/Http/Controllers/ContractorController.php
+++ b/Modules/ContractorManagement/app/Http/Controllers/ContractorController.php
@@ -246,6 +246,14 @@ class ContractorController extends Controller
 
     public function approveInvoice(ContractorInvoice $invoice)
     {
+        $user = auth()->user();
+        $isHigherUp = $user->user_type === 'admin' || 
+                       $user->roles()->whereIn('name', ['Super Admin', 'admin', 'Main Contractor Admin'])->exists();
+
+        if (!$isHigherUp) {
+            return back()->with('error', 'Unauthorized. Only Main Contractor Admin or Super Admin can approve subcontractor invoices.');
+        }
+
         try {
             $invoice->transitionTo(InvoiceStatus::Approved);
         } catch (\InvalidArgumentException $e) {
diff --git a/Modules/ContractorManagement/resources/js/Pages/Contractors/Form.tsx b/Modules/ContractorManagement/resources/js/Pages/Contractors/Form.tsx
index c444a43..e4af3f1 100644
--- a/Modules/ContractorManagement/resources/js/Pages/Contractors/Form.tsx
+++ b/Modules/ContractorManagement/resources/js/Pages/Contractors/Form.tsx
@@ -153,7 +153,7 @@ export default function Form({ contractor }: Props) {
                                             <Checkbox
                                                 id="create_admin"
                                                 checked={form.data.create_admin}
-                                                onChange={(e) => form.setData('create_admin', e.target.checked)}
+                                                onChange={(e: React.ChangeEvent<HTMLInputElement>) => form.setData('create_admin', e.target.checked)}
                                             />
                                             <Label htmlFor="create_admin" className="text-sm font-medium text-gray-700 cursor-pointer">
                                                 Provision Contractor Admin Account
diff --git a/Modules/DocumentManagement/app/Http/Controllers/DocumentController.php b/Modules/DocumentManagement/app/Http/Controllers/DocumentController.php
index 67d4eb9..6b1ee43 100644
--- a/Modules/DocumentManagement/app/Http/Controllers/DocumentController.php
+++ b/Modules/DocumentManagement/app/Http/Controllers/DocumentController.php
@@ -67,7 +67,7 @@ class DocumentController extends Controller
             'description' => $validated['description'] ?? null,
             'documentable_type' => $validated['documentable_type'] ?? null,
             'documentable_id' => $validated['documentable_id'] ?? null,
-            'status' => 'Pending',
+            'status' => 'Approved',
             'uploaded_by' => $request->user()->id,
             'current_file_path' => $path,
             'current_file_name' => $file->getClientOriginalName(),
@@ -86,26 +86,8 @@ class DocumentController extends Controller
             'uploaded_by' => $request->user()->id,
             'change_notes' => 'Initial upload',
         ]);
-        
-        // Trigger Global Approval Workflow
-        $approverIds = [];
-        if (\Spatie\Permission\Models\Role::where('name', 'Main Contractor Admin')->exists()) {
-            $approverIds = \App\Models\User::role('Main Contractor Admin')->pluck('id')->toArray();
-        }
-        if (empty($approverIds) && \Spatie\Permission\Models\Role::where('name', 'Super Admin')->exists()) {
-            $approverIds = \App\Models\User::role('Super Admin')->pluck('id')->toArray();
-        }
-        if (!empty($approverIds)) {
-            app(\Modules\ApprovalWorkflow\Services\ApprovalService::class)->createChain(
-                $document,
-                $approverIds,
-                'document',
-                $request->user()->id,
-                "New document uploaded: {$document->title}"
-            );
-        }
 
-        return back()->with('success', 'Document uploaded successfully and is pending approval.');
+        return back()->with('success', 'Document uploaded successfully.');
     }
 
     public function uploadVersion(Request $request, Document $document)
@@ -128,28 +110,10 @@ class DocumentController extends Controller
             $validated['change_notes'] ?? null,
         );
 
-        // Reset status to Pending when a new version is uploaded
-        $document->update(['status' => 'Pending']);
+        // Keep status as Approved when a new version is uploaded
+        $document->update(['status' => 'Approved']);
 
-        // Trigger Global Approval Workflow for the new version
-        $approverIds = [];
-        if (\Spatie\Permission\Models\Role::where('name', 'Main Contractor Admin')->exists()) {
-            $approverIds = \App\Models\User::role('Main Contractor Admin')->pluck('id')->toArray();
-        }
-        if (empty($approverIds) && \Spatie\Permission\Models\Role::where('name', 'Super Admin')->exists()) {
-            $approverIds = \App\Models\User::role('Super Admin')->pluck('id')->toArray();
-        }
-        if (!empty($approverIds)) {
-            app(\Modules\ApprovalWorkflow\Services\ApprovalService::class)->createChain(
-                $document,
-                $approverIds,
-                'document',
-                $request->user()->id,
-                "New version uploaded for: {$document->title}"
-            );
-        }
-
-        return back()->with('success', 'New version uploaded. Document status reset to Pending.');
+        return back()->with('success', 'New document version uploaded successfully.');
     }
 
     public function download(Document $document)
diff --git a/Modules/DocumentManagement/database/seeders/DocumentCategorySeeder.php b/Modules/DocumentManagement/database/seeders/DocumentCategorySeeder.php
new file mode 100644
index 0000000..0994d44
--- /dev/null
+++ b/Modules/DocumentManagement/database/seeders/DocumentCategorySeeder.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Modules\DocumentManagement\Database\Seeders;
+
+use Illuminate\Database\Seeder;
+use Modules\DocumentManagement\Models\DocumentCategory;
+
+class DocumentCategorySeeder extends Seeder
+{
+    public function run(): void
+    {
+        $categories = [
+            ['name' => 'Architectural', 'description' => 'Architectural drawings, floor plans, and elevation specs.'],
+            ['name' => 'Structural', 'description' => 'Structural engineering drawings, rebar schedules, and foundation plans.'],
+            ['name' => 'MEP', 'description' => 'Mechanical, Electrical, and Plumbing engineering documentation.'],
+            ['name' => 'Permits', 'description' => 'Building permits, occupancy certificates, and government clearances.'],
+            ['name' => 'Contracts', 'description' => 'Client agreements, contractor subcontracts, and change orders.'],
+            ['name' => 'Safety & Compliance', 'description' => 'OSHA safety reports, site inspection logs, and environmental audits.'],
+            ['name' => 'Financial & Invoices', 'description' => 'Billings, payment certificates, and purchase receipts.'],
+        ];
+
+        foreach ($categories as $cat) {
+            DocumentCategory::firstOrCreate(
+                ['name' => $cat['name']],
+                ['description' => $cat['description']]
+            );
+        }
+    }
+}
diff --git a/Modules/DocumentManagement/resources/js/Pages/Documents/Index.tsx b/Modules/DocumentManagement/resources/js/Pages/Documents/Index.tsx
index 9c96ef1..e0c3710 100644
--- a/Modules/DocumentManagement/resources/js/Pages/Documents/Index.tsx
+++ b/Modules/DocumentManagement/resources/js/Pages/Documents/Index.tsx
@@ -412,28 +412,17 @@ export default function Index({ documents, categories, projects, filters }: Prop
                         onSearchChange={setSearch}
                         onSearchSubmit={handleSearch}
                         filters={
-                            <>
-                                <Select value={catFilter} onValueChange={handleCatFilter}>
-                                    <SelectTrigger className="w-[160px]">
-                                        <SelectValue placeholder="All Categories">
-                                            {catFilter === 'all' ? 'All Categories' : categories?.find(c => c.id.toString() === catFilter)?.name || 'All Categories'}
-                                        </SelectValue>
-                                    </SelectTrigger>
-                                    <SelectContent>
-                                        <SelectItem value="all">All Categories</SelectItem>
-                                        {categories && categories.map(c => <SelectItem key={c.id} value={c.id.toString()}>{c.name}</SelectItem>)}
-                                    </SelectContent>
-                                </Select>
-                                <Select value={statusFilter} onValueChange={handleStatusFilter}>
-                                    <SelectTrigger className="w-[140px]"><SelectValue placeholder="All Status" /></SelectTrigger>
-                                    <SelectContent>
-                                        <SelectItem value="all">All Status</SelectItem>
-                                        <SelectItem value="Pending">Pending</SelectItem>
-                                        <SelectItem value="Approved">Approved</SelectItem>
-                                        <SelectItem value="Rejected">Rejected</SelectItem>
-                                    </SelectContent>
-                                </Select>
-                            </>
+                            <Select value={catFilter} onValueChange={handleCatFilter}>
+                                <SelectTrigger className="w-[160px]">
+                                    <SelectValue placeholder="All Categories">
+                                        {catFilter === 'all' ? 'All Categories' : (categories?.find(c => String(c.id) === String(catFilter))?.name || 'All Categories')}
+                                    </SelectValue>
+                                </SelectTrigger>
+                                <SelectContent>
+                                    <SelectItem value="all">All Categories</SelectItem>
+                                    {categories && categories.map(c => <SelectItem key={c.id} value={String(c.id)}>{c.name}</SelectItem>)}
+                                </SelectContent>
+                            </Select>
                         }
                         actions={
                             <div className="flex items-center gap-2">
@@ -462,22 +451,26 @@ export default function Index({ documents, categories, projects, filters }: Prop
                                         <DialogHeader className="border-b border-gray-100 pb-2"><DialogTitle className="text-gray-850 text-sm font-semibold">Upload Document</DialogTitle></DialogHeader>
                                         <form onSubmit={handleUpload} className="space-y-4 text-sm mt-2">
                                             <div><Label className="text-gray-700">Title *</Label><Input className="bg-white text-gray-900" value={form.data.title} onChange={(e) => form.setData('title', e.target.value)} /></div>
-                                            <div className="grid grid-cols-2 gap-4">
-                                                <div><Label className="text-gray-700">Category *</Label>
-                                                    <Select value={form.data.category_id} onValueChange={(v) => { if (v) form.setData('category_id', v); }}>
-                                                        <SelectTrigger className="bg-white">
-                                                            <SelectValue placeholder="Select Category">
-                                                                {form.data.category_id ? categories?.find(c => c.id.toString() === form.data.category_id)?.name : 'Select Category'}
-                                                            </SelectValue>
-                                                        </SelectTrigger>
-                                                        <SelectContent className="rounded-md">{categories && categories.map(c => <SelectItem key={c.id} value={c.id.toString()}>{c.name}</SelectItem>)}</SelectContent>
-                                                    </Select></div>
-                                                <div><Label className="text-gray-700">Project</Label>
-                                                    <Select value={form.data.project_id} onValueChange={(v) => { if (v) form.setData('project_id', v); }}>
-                                                        <SelectTrigger className="bg-white"><SelectValue placeholder="Select Project" /></SelectTrigger>
-                                                        <SelectContent className="rounded-md">{projects.map(p => <SelectItem key={p.id} value={p.id.toString()}>{p.name}</SelectItem>)}</SelectContent>
-                                                    </Select></div>
-                                            </div>
+                                             <div className="grid grid-cols-2 gap-4">
+                                                 <div><Label className="text-gray-700">Category *</Label>
+                                                     <Select value={form.data.category_id} onValueChange={(v) => { if (v) form.setData('category_id', v); }}>
+                                                         <SelectTrigger className="bg-white">
+                                                             <SelectValue placeholder="Select Category">
+                                                                 {form.data.category_id ? categories?.find(c => String(c.id) === String(form.data.category_id))?.name : undefined}
+                                                             </SelectValue>
+                                                         </SelectTrigger>
+                                                         <SelectContent className="rounded-md">{categories?.map(c => <SelectItem key={c.id} value={String(c.id)}>{c.name}</SelectItem>)}</SelectContent>
+                                                     </Select></div>
+                                                 <div><Label className="text-gray-700">Project</Label>
+                                                     <Select value={form.data.project_id} onValueChange={(v) => { if (v) form.setData('project_id', v); }}>
+                                                         <SelectTrigger className="bg-white">
+                                                             <SelectValue placeholder="Select Project">
+                                                                 {form.data.project_id ? projects?.find(p => String(p.id) === String(form.data.project_id))?.name : undefined}
+                                                             </SelectValue>
+                                                         </SelectTrigger>
+                                                         <SelectContent className="rounded-md">{projects?.map(p => <SelectItem key={p.id} value={String(p.id)}>{p.name}</SelectItem>)}</SelectContent>
+                                                     </Select></div>
+                                             </div>
                                             <div>
                                                 <Label className="text-gray-700">File *</Label>
                                                 <Input type="file" className="bg-white text-gray-900 cursor-pointer" accept=".pdf,.jpg,.jpeg,.png,.doc,.docx,.xls,.xlsx,.dwg" onChange={(e) => { if (e.target.files?.[0]) form.setData('file', e.target.files[0]); }} />
@@ -514,7 +507,7 @@ export default function Index({ documents, categories, projects, filters }: Prop
                             <Table className="font-sans text-sm">
                                 <TableHeader className="bg-gray-50/70"><TableRow className="hover:bg-transparent border-b border-gray-250">
                                     <TableHead className="w-[40px]"></TableHead><TableHead>Title</TableHead><TableHead>Category</TableHead>
-                                    <TableHead>Status</TableHead><TableHead>Project</TableHead>
+                                    <TableHead>Project</TableHead>
                                     <TableHead>Versions</TableHead>
                                     <TableHead className="text-right">Actions</TableHead>
                                 </TableRow></TableHeader>
@@ -524,7 +517,6 @@ export default function Index({ documents, categories, projects, filters }: Prop
                                             <TableCell>{isImage(doc.mime_type) ? <Image className="h-4 w-4 text-blue-500" /> : <File className="h-4 w-4 text-gray-400" />}</TableCell>
                                             <TableCell className="font-medium text-gray-900">{doc.title}</TableCell>
                                             <TableCell><Badge variant="outline" className="text-gray-600 border-gray-250 bg-gray-50">{getCategoryName(doc.category)}</Badge></TableCell>
-                                            <TableCell><StatusBadge status={doc.status} /></TableCell>
                                             <TableCell className="text-gray-500">{doc.project?.name || '-'}</TableCell>
                                             <TableCell>
                                                 <Link href={route('documents.versions', doc.ulid)} className="text-blue-600 hover:underline">v{doc.version_count}</Link>
@@ -562,77 +554,78 @@ export default function Index({ documents, categories, projects, filters }: Prop
                                 {documents.data.map((doc) => (
                                     <div 
                                         key={doc.id}
-                                        className="flex flex-col bg-white border border-gray-200 rounded-lg overflow-hidden transition-all duration-300 hover:border-gray-300 hover:shadow-md group"
+                                        className="flex flex-col bg-white border border-gray-200/80 rounded-xl overflow-hidden transition-all duration-300 hover:border-blue-300 hover:shadow-lg hover:-translate-y-0.5 group"
                                     >
-                                        <div className="relative aspect-video w-full overflow-hidden bg-gray-50 border-b border-gray-100 cursor-pointer" onClick={() => doc.mime_type?.includes('pdf') && setPreviewDoc({ url: route('documents.download', doc.ulid), title: doc.title })}>
+                                        <div className="relative aspect-video w-full overflow-hidden bg-gradient-to-br from-slate-50 to-gray-100 border-b border-gray-150 cursor-pointer" onClick={() => doc.mime_type?.includes('pdf') && setPreviewDoc({ url: route('documents.download', doc.ulid), title: doc.title })}>
                                             {doc.mime_type?.includes('pdf') ? (
-                                                <PDFThumbnail url={route('documents.download', doc.ulid)} className="w-full h-full" />
+                                                <PDFThumbnail url={route('documents.download', doc.ulid)} className="w-full h-full object-cover" />
                                             ) : isImage(doc.mime_type) ? (
-                                                <div className="flex items-center justify-center w-full h-full bg-gray-50 text-blue-500/70">
-                                                    <Image className="h-8 w-8 stroke-1" />
+                                                <div className="flex flex-col items-center justify-center w-full h-full bg-blue-50/40 text-blue-500">
+                                                    <Image className="h-10 w-10 stroke-[1.25] transition-transform duration-300 group-hover:scale-110" />
+                                                    <span className="text-[11px] font-medium text-blue-600 mt-1 uppercase tracking-wider">Image</span>
                                                 </div>
                                             ) : (
-                                                <div className="flex items-center justify-center w-full h-full bg-gray-50 text-gray-400">
-                                                    <File className="h-8 w-8 stroke-1" />
+                                                <div className="flex flex-col items-center justify-center w-full h-full bg-slate-50 text-slate-400">
+                                                    <File className="h-10 w-10 stroke-[1.25] transition-transform duration-300 group-hover:scale-110" />
+                                                    <span className="text-[11px] font-medium text-slate-500 mt-1 uppercase tracking-wider">{doc.current_file_name?.split('.').pop() || 'File'}</span>
                                                 </div>
                                             )}
+
+                                            <div className="absolute top-2 right-2 z-10">
+                                                <Badge variant="secondary" className="bg-white/90 backdrop-blur-sm text-gray-700 border border-gray-200/60 shadow-xs text-[10px] font-medium px-2 py-0.5">
+                                                    {formatSize(doc.file_size)}
+                                                </Badge>
+                                            </div>
+
                                             {doc.mime_type?.includes('pdf') && (
-                                                <div className="absolute inset-0 bg-black/5 opacity-0 group-hover:opacity-100 flex items-center justify-center transition-opacity duration-200">
-                                                    <Button size="sm" variant="secondary" className="h-8 rounded-md border border-gray-200 bg-white/95 text-gray-800 hover:bg-gray-50 text-xs font-semibold shadow-sm">
-                                                        <Eye className="mr-1 h-3.5 w-3.5" /> View PDF
+                                                <div className="absolute inset-0 bg-slate-900/20 backdrop-blur-[2px] opacity-0 group-hover:opacity-100 flex items-center justify-center transition-all duration-200">
+                                                    <Button size="sm" variant="secondary" className="h-8 rounded-lg border border-white/40 bg-white/95 text-slate-900 hover:bg-white text-xs font-semibold shadow-md">
+                                                        <Eye className="mr-1.5 h-3.5 w-3.5 text-blue-600" /> Preview PDF
                                                     </Button>
                                                 </div>
                                             )}
                                         </div>
 
                                         <div className="flex-1 p-4 flex flex-col justify-between space-y-4">
-                                            <div className="space-y-2">
-                                                <h3 className="font-semibold text-gray-800 line-clamp-1 group-hover:text-blue-600 transition-colors duration-200" title={doc.title}>
-                                                    {doc.title}
-                                                </h3>
-                                                <div className="flex flex-wrap items-center gap-1.5">
-                                                    <Badge variant="outline" className="rounded-md border-gray-200 text-[10px] px-2 text-gray-500 font-normal">
+                                            <div className="space-y-2.5">
+                                                <div className="flex items-start justify-between gap-2">
+                                                    <h3 className="font-semibold text-gray-900 text-sm leading-snug line-clamp-2 group-hover:text-blue-600 transition-colors duration-200" title={doc.title}>
+                                                        {doc.title}
+                                                    </h3>
+                                                </div>
+                                                <div className="flex items-center justify-between gap-2 pt-0.5">
+                                                    <Badge variant="outline" className="rounded-md border-gray-200 bg-slate-50/80 text-[10px] px-2 py-0.5 text-slate-600 font-medium tracking-tight">
                                                         {getCategoryName(doc.category)}
                                                     </Badge>
-                                                    <StatusBadge status={doc.status} />
-                                                </div>
-                                                <div className="text-xs text-gray-500 flex items-center justify-between border-t border-gray-100 pt-2">
-                                                    <span className="truncate max-w-[120px]">Proj: {doc.project?.name || '-'}</span>
-                                                    <Link href={route('documents.versions', doc.ulid)} className="text-blue-600 hover:underline font-medium">
+                                                    <Link href={route('documents.versions', doc.ulid)} className="text-[11px] font-semibold text-blue-600 hover:text-blue-700 bg-blue-50 px-2 py-0.5 rounded-md hover:bg-blue-100/80 transition-colors">
                                                         v{doc.version_count}
                                                     </Link>
                                                 </div>
+                                                <div className="text-xs text-gray-500 flex items-center justify-between border-t border-gray-100 pt-2.5">
+                                                    <span className="truncate max-w-[150px] font-normal text-slate-500" title={doc.project?.name}>
+                                                        Project: <span className="font-medium text-slate-700">{doc.project?.name || 'Global'}</span>
+                                                    </span>
+                                                </div>
                                             </div>
 
                                             <div className="flex items-center justify-between border-t border-gray-100 pt-3">
                                                 <div className="flex items-center gap-1">
-                                                    {isContractorAdmin && doc.status === 'Pending' && (
-                                                        <>
-                                                            <Button 
-                                                                variant="ghost" 
-                                                                size="icon-sm" 
-                                                                className="text-green-600 hover:bg-green-50"
-                                                                title="Approve" 
-                                                                onClick={() => approveDocument(doc.ulid, 'Approved')}
-                                                            >
-                                                                <CheckCircle className="h-4 w-4" />
-                                                            </Button>
-                                                            <Button 
-                                                                variant="ghost" 
-                                                                size="icon-sm" 
-                                                                className="text-red-600 hover:bg-red-50"
-                                                                title="Reject" 
-                                                                onClick={() => approveDocument(doc.ulid, 'Rejected')}
-                                                            >
-                                                                <XCircle className="h-4 w-4" />
-                                                            </Button>
-                                                        </>
+                                                    {doc.mime_type?.includes('pdf') && (
+                                                        <Button 
+                                                            variant="ghost" 
+                                                            size="icon-sm" 
+                                                            className="h-8 w-8 text-slate-500 hover:text-blue-600 hover:bg-blue-50/80 rounded-md transition-colors"
+                                                            title="Preview" 
+                                                            onClick={() => setPreviewDoc({ url: route('documents.download', doc.ulid), title: doc.title })}
+                                                        >
+                                                            <Eye className="h-4 w-4" />
+                                                        </Button>
                                                     )}
                                                     <a href={route('documents.download', doc.ulid)}>
                                                         <Button 
                                                             variant="ghost" 
                                                             size="icon-sm" 
-                                                            className="text-gray-500 hover:text-gray-800 hover:bg-gray-50"
+                                                            className="h-8 w-8 text-slate-500 hover:text-slate-800 hover:bg-slate-100/80 rounded-md transition-colors"
                                                             title="Download"
                                                         >
                                                             <Download className="h-4 w-4" />
@@ -642,8 +635,8 @@ export default function Index({ documents, categories, projects, filters }: Prop
                                                         <Button 
                                                             variant="ghost" 
                                                             size="icon-sm" 
-                                                            className="text-gray-500 hover:text-gray-800 hover:bg-gray-50"
-                                                            title="Versions"
+                                                            className="h-8 w-8 text-slate-500 hover:text-slate-800 hover:bg-slate-100/80 rounded-md transition-colors"
+                                                            title="Version History"
                                                         >
                                                             <History className="h-4 w-4" />
                                                         </Button>
@@ -653,8 +646,8 @@ export default function Index({ documents, categories, projects, filters }: Prop
                                                 <Button 
                                                     variant="ghost" 
                                                     size="icon-sm" 
-                                                    className="text-red-500 hover:bg-red-50 hover:text-red-600"
-                                                    title="Delete" 
+                                                    className="h-8 w-8 text-slate-400 hover:text-red-600 hover:bg-red-50 rounded-md transition-colors"
+                                                    title="Delete Document" 
                                                     onClick={() => { if (confirm('Delete document and all versions?')) router.delete(route('documents.destroy', doc.ulid)); }}
                                                 >
                                                     <Trash2 className="h-4 w-4" />
diff --git a/Modules/FinancialManagement/app/Http/Controllers/FinanceController.php b/Modules/FinancialManagement/app/Http/Controllers/FinanceController.php
index b64a44c..19f7831 100644
--- a/Modules/FinancialManagement/app/Http/Controllers/FinanceController.php
+++ b/Modules/FinancialManagement/app/Http/Controllers/FinanceController.php
@@ -12,10 +12,14 @@ use Modules\FinancialManagement\Models\RetentionEntry;
 use Modules\FinancialManagement\Services\ProgressBillingService;
 use Modules\ProjectManagement\Models\Project;
 
+use Modules\ApprovalWorkflow\Services\ApprovalService;
+use App\Models\User;
+
 class FinanceController extends Controller
 {
     public function __construct(
         private ProgressBillingService $billingService,
+        private ApprovalService $approvalService,
     ) {}
 
     // --- Invoice List ---
@@ -102,10 +106,28 @@ class FinanceController extends Controller
     }
 
     // --- State Transitions ---
-    public function submit(FinancialInvoice $invoice)
+    public function submit(Request $request, FinancialInvoice $invoice)
     {
         try {
             $invoice->transitionTo(InvoiceStatus::Submitted);
+
+            // Fetch Admins and Super Admins as approvers
+            $adminIds = User::where('user_type', 'admin')
+                ->orWhereHas('roles', function ($q) {
+                    $q->whereIn('name', ['Super Admin', 'admin']);
+                })
+                ->pluck('id')
+                ->toArray();
+
+            if (!empty($adminIds)) {
+                $this->approvalService->createChain(
+                    approvable: $invoice,
+                    approverIds: $adminIds,
+                    type: 'financial_invoice',
+                    initiatedBy: $request->user()->id,
+                    notes: "Progress Invoice {$invoice->invoice_number} submitted for approval.",
+                );
+            }
         } catch (\InvalidArgumentException $e) {
             return back()->with('error', $e->getMessage());
         }
@@ -115,6 +137,14 @@ class FinanceController extends Controller
 
     public function approve(FinancialInvoice $invoice)
     {
+        $user = auth()->user();
+        $isApprover = $user->user_type === 'admin' || 
+                       $user->roles()->whereIn('name', ['Super Admin', 'admin'])->exists();
+
+        if (!$isApprover) {
+            return back()->with('error', 'Unauthorized. Only Admin or Super Admin can approve client invoices.');
+        }
+
         try {
             $invoice->transitionTo(InvoiceStatus::Approved);
             $this->billingService->holdRetention($invoice);
@@ -127,6 +157,14 @@ class FinanceController extends Controller
 
     public function reject(FinancialInvoice $invoice)
     {
+        $user = auth()->user();
+        $isApprover = $user->user_type === 'admin' || 
+                       $user->roles()->whereIn('name', ['Super Admin', 'admin'])->exists();
+
+        if (!$isApprover) {
+            return back()->with('error', 'Unauthorized. Only Admin or Super Admin can reject client invoices.');
+        }
+
         try {
             $invoice->transitionTo(InvoiceStatus::Rejected);
         } catch (\InvalidArgumentException $e) {
@@ -192,4 +230,66 @@ class FinanceController extends Controller
             'filters' => $request->only(['project_id']),
         ]);
     }
+
+    // Cash Advances
+    public function cashAdvances(Request $request)
+    {
+        $query = \Modules\FinancialManagement\Models\CashAdvance::with(['project:id,name,code', 'requester:id,name,email', 'approver:id,name,email']);
+
+        if ($projectId = $request->project_id) {
+            $query->where('project_id', $projectId);
+        }
+
+        $cashAdvances = $query->latest()->paginate(20)->withQueryString();
+        $projects = Project::select('id', 'ulid', 'name', 'code')->get();
+
+        return Inertia::render('FinancialManagement::CashAdvances/Index', [
+            'cashAdvances' => $cashAdvances,
+            'projects' => $projects,
+            'filters' => $request->only(['project_id']),
+        ]);
+    }
+
+    public function storeCashAdvance(Request $request)
+    {
+        $validated = $request->validate([
+            'project_ulid' => 'required|string',
+            'amount' => 'required|numeric|min:1',
+            'reason' => 'required|string|max:1000',
+        ]);
+
+        $project = Project::where('ulid', $validated['project_ulid'])->firstOrFail();
+
+        $cashAdvance = \Modules\FinancialManagement\Models\CashAdvance::create([
+            'project_id' => $project->id,
+            'amount' => $validated['amount'],
+            'reason' => $validated['reason'],
+            'status' => 'pending',
+            'requested_by' => auth()->id(),
+        ]);
+
+        return back()->with('success', 'Cash advance request submitted successfully.');
+    }
+
+    public function approveCashAdvance(\Modules\FinancialManagement\Models\CashAdvance $cashAdvance)
+    {
+        $user = auth()->user();
+        if ($cashAdvance->requested_by === $user->id && $user->user_type !== 'admin' && !$user->hasRole('Super Admin')) {
+            return back()->with('error', 'You cannot approve your own cash advance request.');
+        }
+
+        $isApprover = $user->user_type === 'admin' || 
+                       $user->roles()->whereIn('name', ['Super Admin', 'admin', 'Project Manager', 'Main Contractor Admin'])->exists();
+
+        if (! $isApprover) {
+            return back()->with('error', 'Unauthorized to approve cash advance requests.');
+        }
+
+        $cashAdvance->update([
+            'status' => 'approved',
+            'approved_by' => auth()->id(),
+        ]);
+
+        return back()->with('success', 'Cash advance request approved.');
+    }
 }
diff --git a/Modules/FinancialManagement/resources/js/Pages/CashAdvances/Index.tsx b/Modules/FinancialManagement/resources/js/Pages/CashAdvances/Index.tsx
new file mode 100644
index 0000000..4133abb
--- /dev/null
+++ b/Modules/FinancialManagement/resources/js/Pages/CashAdvances/Index.tsx
@@ -0,0 +1,266 @@
+import AuthenticatedLayout from '@/Layouts/AuthenticatedLayout';
+import { Head, router, useForm, usePage } from '@inertiajs/react';
+import { Button } from '@/Components/ui/button';
+import { Card, CardContent, CardHeader, CardTitle, CardDescription } from '@/Components/ui/card';
+import { Input } from '@/Components/ui/input';
+import { Label } from '@/Components/ui/label';
+import { Textarea } from '@/Components/ui/textarea';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/Components/ui/select';
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@/Components/ui/table';
+import { Badge } from '@/Components/ui/badge';
+import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogTrigger } from '@/Components/ui/dialog';
+import { PageProps } from '@/types';
+import { FormEvent, useState } from 'react';
+import { Wallet, Plus, CheckCircle2, DollarSign, Clock, FileText } from 'lucide-react';
+
+interface ProjectRef {
+    id: number;
+    ulid: string;
+    name: string;
+    code: string;
+}
+
+interface CashAdvanceItem {
+    id: number;
+    ulid: string;
+    amount: string;
+    reason: string;
+    status: string;
+    created_at: string;
+    project?: ProjectRef;
+    requester?: { id: number; name: string; email: string };
+    approver?: { id: number; name: string; email: string };
+}
+
+interface Props extends PageProps {
+    cashAdvances: {
+        data: CashAdvanceItem[];
+        links: any[];
+    };
+    projects: ProjectRef[];
+}
+
+export default function CashAdvancesIndex({ cashAdvances, projects }: Props) {
+    const { auth } = usePage<PageProps>().props;
+    const [openModal, setOpenModal] = useState(false);
+    const [selectedItemToApprove, setSelectedItemToApprove] = useState<CashAdvanceItem | null>(null);
+
+    const { data, setData, post, processing, errors, reset } = useForm({
+        project_ulid: projects[0]?.ulid || '',
+        amount: '',
+        reason: '',
+    });
+
+    const submitRequest = (e: FormEvent) => {
+        e.preventDefault();
+        post(route('cash-advances.store'), {
+            onSuccess: () => {
+                reset();
+                setOpenModal(false);
+            },
+        });
+    };
+
+    const isApprover = auth.user.user_type === 'admin' || 
+                       auth.roles?.some((r: any) => ['Super Admin', 'admin', 'Project Manager', 'Main Contractor Admin'].includes(r.name));
+
+    const handleApprove = () => {
+        if (!selectedItemToApprove) return;
+        router.patch(route('cash-advances.approve', selectedItemToApprove.ulid), {}, {
+            onSuccess: () => setSelectedItemToApprove(null)
+        });
+    };
+
+    return (
+        <AuthenticatedLayout
+            header={<h2 className="text-xl font-semibold leading-tight text-gray-800 flex items-center gap-2"><Wallet className="h-5 w-5 text-emerald-600"/> Cash Advances & Site Petty Cash</h2>}
+        >
+            <Head title="Cash Advances" />
+
+            <div className="py-6 max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 space-y-6">
+                <div className="flex justify-between items-center">
+                    <div>
+                        <h3 className="text-lg font-bold text-slate-800">Petty Cash & Site Advances</h3>
+                        <p className="text-sm text-slate-500">Manage site cash advances, emergency field purchases, and approvals.</p>
+                    </div>
+
+                    <Dialog open={openModal} onOpenChange={setOpenModal}>
+                        <DialogTrigger render={<Button className="bg-emerald-600 hover:bg-emerald-700 text-white" />}>
+                            <Plus className="mr-2 h-4 w-4" /> Request Cash Advance
+                        </DialogTrigger>
+                        <DialogContent className="sm:max-w-md">
+                            <DialogHeader>
+                                <DialogTitle>Request Cash Advance</DialogTitle>
+                            </DialogHeader>
+                            <form onSubmit={submitRequest} className="space-y-4 pt-2">
+                                <div>
+                                    <Label>Project *</Label>
+                                    <Select value={data.project_ulid} onValueChange={(v) => setData('project_ulid', v || '')}>
+                                        <SelectTrigger><SelectValue placeholder="Select Project" /></SelectTrigger>
+                                        <SelectContent>
+                                            {projects.map((p) => (
+                                                <SelectItem key={p.ulid} value={p.ulid}>
+                                                    {p.name} ({p.code})
+                                                </SelectItem>
+                                            ))}
+                                        </SelectContent>
+                                    </Select>
+                                    {errors.project_ulid && <p className="text-xs text-rose-500 mt-1">{errors.project_ulid}</p>}
+                                </div>
+
+                                <div>
+                                    <Label>Amount ($) *</Label>
+                                    <Input
+                                        type="number"
+                                        step="0.01"
+                                        min="1"
+                                        placeholder="500.00"
+                                        value={data.amount}
+                                        onChange={(e) => setData('amount', e.target.value)}
+                                    />
+                                    {errors.amount && <p className="text-xs text-rose-500 mt-1">{errors.amount}</p>}
+                                </div>
+
+                                <div>
+                                    <Label>Reason / Purpose *</Label>
+                                    <Textarea
+                                        placeholder="Petty cash for emergency site fasteners and local worker refreshments."
+                                        value={data.reason}
+                                        onChange={(e) => setData('reason', e.target.value)}
+                                        rows={3}
+                                    />
+                                    {errors.reason && <p className="text-xs text-rose-500 mt-1">{errors.reason}</p>}
+                                </div>
+
+                                <div className="flex justify-end gap-2 pt-2">
+                                    <Button type="button" variant="outline" onClick={() => setOpenModal(false)}>
+                                        Cancel
+                                    </Button>
+                                    <Button type="submit" disabled={processing} className="bg-emerald-600 hover:bg-emerald-700 text-white">
+                                        Submit Request
+                                    </Button>
+                                </div>
+                            </form>
+                        </DialogContent>
+                    </Dialog>
+                </div>
+
+                {/* Styled Approval Confirmation Dialog */}
+                <Dialog open={!!selectedItemToApprove} onOpenChange={(open) => !open && setSelectedItemToApprove(null)}>
+                    <DialogContent className="sm:max-w-lg">
+                        <DialogHeader>
+                            <DialogTitle className="flex items-center gap-2 text-slate-900 text-lg font-bold">
+                                <div className="p-2 bg-emerald-50 rounded-lg text-emerald-600">
+                                    <CheckCircle2 className="h-5 w-5" />
+                                </div>
+                                Approve Cash Advance Request
+                            </DialogTitle>
+                        </DialogHeader>
+                        <div className="space-y-4 py-2 text-sm text-slate-600">
+                            <p className="text-slate-600 leading-relaxed">
+                                Are you sure you want to approve this cash advance request? This action will mark the request as approved and log your manager verification.
+                            </p>
+                            {selectedItemToApprove && (
+                                <div className="rounded-xl border border-slate-200 bg-slate-50/70 p-4 space-y-2.5">
+                                    <div className="flex items-center justify-between border-b border-slate-200/60 pb-2.5">
+                                        <div>
+                                            <p className="text-xs font-medium text-slate-400 uppercase tracking-wider">Project</p>
+                                            <p className="font-semibold text-slate-900 text-sm mt-0.5">{selectedItemToApprove.project?.name}</p>
+                                        </div>
+                                        <div className="text-right">
+                                            <p className="text-xs font-medium text-slate-400 uppercase tracking-wider">Amount</p>
+                                            <p className="font-mono font-bold text-emerald-700 text-base mt-0.5">
+                                                ${Number(selectedItemToApprove.amount).toLocaleString('en-US', { minimumFractionDigits: 2 })}
+                                            </p>
+                                        </div>
+                                    </div>
+                                    <div>
+                                        <p className="text-xs font-medium text-slate-400 uppercase tracking-wider mb-1">Reason / Purpose</p>
+                                        <p className="text-xs text-slate-700 leading-normal bg-white p-2.5 rounded-lg border border-slate-100 whitespace-normal break-words">
+                                            {selectedItemToApprove.reason}
+                                        </p>
+                                    </div>
+                                </div>
+                            )}
+                        </div>
+                        <div className="flex justify-end gap-2.5 pt-3 border-t border-slate-100">
+                            <Button type="button" variant="outline" onClick={() => setSelectedItemToApprove(null)}>
+                                Cancel
+                            </Button>
+                            <Button type="button" onClick={handleApprove} className="bg-emerald-600 hover:bg-emerald-700 text-white font-medium px-5">
+                                Confirm Approval
+                            </Button>
+                        </div>
+                    </DialogContent>
+                </Dialog>
+
+                <Card className="shadow-xs">
+                    <CardContent className="p-0">
+                        <Table>
+                            <TableHeader className="bg-slate-50">
+                                <TableRow>
+                                    <TableHead>Project</TableHead>
+                                    <TableHead>Requested By</TableHead>
+                                    <TableHead>Reason</TableHead>
+                                    <TableHead className="text-right">Amount</TableHead>
+                                    <TableHead>Status</TableHead>
+                                    <TableHead className="text-right">Action</TableHead>
+                                </TableRow>
+                            </TableHeader>
+                            <TableBody>
+                                {cashAdvances.data.length === 0 ? (
+                                    <TableRow>
+                                        <TableCell colSpan={6} className="text-center py-8 text-slate-400">
+                                            No cash advance requests found.
+                                        </TableCell>
+                                    </TableRow>
+                                ) : (
+                                    cashAdvances.data.map((ca) => (
+                                        <TableRow key={ca.id}>
+                                            <TableCell className="font-semibold text-slate-800">
+                                                {ca.project?.name || 'N/A'}
+                                            </TableCell>
+                                            <TableCell className="text-slate-600 text-sm">
+                                                {ca.requester?.name || 'System User'}
+                                            </TableCell>
+                                            <TableCell className="text-slate-600 text-sm max-w-xs truncate">
+                                                {ca.reason}
+                                            </TableCell>
+                                            <TableCell className="text-right font-mono font-bold text-slate-900">
+                                                ${Number(ca.amount).toLocaleString('en-US', { minimumFractionDigits: 2 })}
+                                            </TableCell>
+                                            <TableCell>
+                                                <Badge
+                                                    variant={ca.status === 'approved' ? 'default' : 'secondary'}
+                                                    className={ca.status === 'approved' ? 'bg-emerald-100 text-emerald-800 hover:bg-emerald-100' : 'bg-amber-100 text-amber-800 hover:bg-amber-100'}
+                                                >
+                                                    {ca.status.toUpperCase()}
+                                                </Badge>
+                                            </TableCell>
+                                            <TableCell className="text-right">
+                                                {ca.status !== 'approved' && isApprover && (
+                                                    <Button
+                                                        size="sm"
+                                                        className="bg-emerald-600 hover:bg-emerald-700 text-white"
+                                                        onClick={() => setSelectedItemToApprove(ca)}
+                                                    >
+                                                        <CheckCircle2 className="mr-1 h-3.5 w-3.5" /> Approve
+                                                    </Button>
+                                                )}
+                                                {ca.status === 'approved' && (
+                                                    <span className="text-xs text-slate-400 font-medium flex items-center justify-end gap-1">
+                                                        <CheckCircle2 className="h-3.5 w-3.5 text-emerald-500" /> Approved by {ca.approver?.name || 'Manager'}
+                                                    </span>
+                                                )}
+                                            </TableCell>
+                                        </TableRow>
+                                    ))
+                                )}
+                            </TableBody>
+                        </Table>
+                    </CardContent>
+                </Card>
+            </div>
+        </AuthenticatedLayout>
+    );
+}
diff --git a/Modules/FinancialManagement/resources/js/Pages/Invoices/Create.tsx b/Modules/FinancialManagement/resources/js/Pages/Invoices/Create.tsx
index abe8351..1f08e26 100644
--- a/Modules/FinancialManagement/resources/js/Pages/Invoices/Create.tsx
+++ b/Modules/FinancialManagement/resources/js/Pages/Invoices/Create.tsx
@@ -25,8 +25,8 @@ export default function Create({ projects }: Props) {
     const projectSelectItems = useMemo(() => projects.map(p => ({ value: p.ulid, label: `${p.name} (${p.code}) — ${formatCurrency(p.contract_value)}` })), [projects]);
 
     const selectedProject = projects.find(p => p.ulid === form.data.project_id);
-    const lastBilled = selectedProject ? Number(selectedProject.last_billed_percentage) : 0;
-    const contractValue = selectedProject ? Number(selectedProject.contract_value) : 0;
+    const lastBilled = selectedProject ? (Number(selectedProject.last_billed_percentage) || 0) : 0;
+    const contractValue = selectedProject ? (Number(selectedProject.contract_value) || 0) : 0;
     const currentPct = Number(form.data.current_percentage) || 0;
     const incrementalPct = Math.max(0, currentPct - lastBilled);
     const subtotal = contractValue * (incrementalPct / 100);
diff --git a/Modules/FinancialManagement/resources/js/Pages/Invoices/Show.tsx b/Modules/FinancialManagement/resources/js/Pages/Invoices/Show.tsx
index 063e904..9c4cdb6 100644
--- a/Modules/FinancialManagement/resources/js/Pages/Invoices/Show.tsx
+++ b/Modules/FinancialManagement/resources/js/Pages/Invoices/Show.tsx
@@ -36,12 +36,15 @@ const statusConfig: Record<string, { variant: 'default' | 'secondary' | 'destruc
 };
 
 export default function Show({ invoice }: Props) {
-    const { flash } = usePage<PageProps>().props;
+    const { flash, auth } = usePage<PageProps>().props;
     const [payDialog, setPayDialog] = useState(false);
     const payForm = useForm({ amount: '' });
     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 submitPayment = (e: FormEvent) => {
         e.preventDefault();
         payForm.post(route('finance.payment', invoice.ulid), { onSuccess: () => { payForm.reset(); setPayDialog(false); } });
@@ -59,30 +62,7 @@ export default function Show({ invoice }: Props) {
                         </div>
                         <Badge variant={cfg.variant}>{cfg.label}</Badge>
                     </div>
-                    <div className="flex items-center gap-2">
-                        {invoice.status === 'draft' && <Button size="sm" variant="outline" onClick={() => router.patch(route('finance.submit', invoice.ulid))}><Send className="mr-2 h-4 w-4" /> Submit</Button>}
-                        {invoice.status === 'submitted' && (
-                            <>
-                                <Button size="sm" onClick={() => router.patch(route('finance.approve', invoice.ulid))}><CheckCircle2 className="mr-2 h-4 w-4" /> Approve</Button>
-                                <Button size="sm" variant="destructive" onClick={() => router.patch(route('finance.reject', invoice.ulid))}><XCircle className="mr-2 h-4 w-4" /> Reject</Button>
-                            </>
-                        )}
-                        {invoice.status === 'approved' && <Button size="sm" onClick={() => router.patch(route('finance.send', invoice.ulid))}><MailCheck className="mr-2 h-4 w-4" /> Send to Client</Button>}
-                        {(invoice.status === 'sent' || invoice.status === 'partially_paid') && (
-                            <Dialog open={payDialog} onOpenChange={setPayDialog}>
-                                <DialogTrigger render={<Button size="sm" />}><DollarSign className="mr-2 h-4 w-4" /> Record Payment</DialogTrigger>
-                                <DialogContent>
-                                    <DialogHeader><DialogTitle>Record Payment</DialogTitle></DialogHeader>
-                                    <form onSubmit={submitPayment} className="space-y-4">
-                                        <div>
-                                            <Label>Amount (Balance Due: {formatCurrency(balanceDue)})</Label>
-                                            <Input type="number" step="0.01" max={balanceDue} value={payForm.data.amount} onChange={(e) => payForm.setData('amount', e.target.value)} />
-                                        </div>
-                                        <div className="flex justify-end"><Button type="submit" disabled={payForm.processing}><DollarSign className="mr-2 h-4 w-4" /> Record</Button></div>
-                                    </form>
-                                </DialogContent>
-                            </Dialog>
-                        )}
+                    <div className="flex items-center gap-3">
                     </div>
                 </div>
             }
@@ -92,6 +72,62 @@ export default function Show({ invoice }: Props) {
                 {flash?.success && <div className="rounded-md bg-green-50 p-4 text-sm text-green-700">{flash.success}</div>}
                 {flash?.error && <div className="rounded-md bg-red-50 p-4 text-sm text-red-700">{flash.error}</div>}
 
+                {/* Primary Action Callout Banner */}
+                {invoice.status === 'draft' && (
+                    <Card className="border-amber-200 bg-amber-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-amber-100 text-amber-700 rounded-lg shrink-0">
+                                    <Send className="h-5 w-5" />
+                                </div>
+                                <div>
+                                    <h4 className="font-semibold text-amber-900 text-sm">Invoice Draft Prepared</h4>
+                                    <p className="text-xs text-amber-700">Review the progress calculations and line items below before submitting for approval.</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.submit', invoice.ulid))}
+                            >
+                                <Send className="mr-2 h-4 w-4" /> Submit for Approval
+                            </Button>
+                        </CardContent>
+                    </Card>
+                )}
+
+                {invoice.status === 'submitted' && (
+                    <Card className="border-blue-200 bg-blue-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-blue-100 text-blue-700 rounded-lg shrink-0">
+                                    <CheckCircle2 className="h-5 w-5" />
+                                </div>
+                                <div>
+                                    <h4 className="font-semibold text-blue-900 text-sm">Awaiting Approval</h4>
+                                    <p className="text-xs text-blue-700">This invoice has been submitted and is currently awaiting approval.</p>
+                                </div>
+                            </div>
+                            {isHigherUp && (
+                                <div className="flex items-center gap-2 shrink-0 ml-4">
+                                    <Button 
+                                        className="bg-emerald-600 hover:bg-emerald-700 text-white font-semibold shadow-sm hover:shadow" 
+                                        onClick={() => router.patch(route('finance.approve', invoice.ulid))}
+                                    >
+                                        <CheckCircle2 className="mr-2 h-4 w-4" /> Approve Invoice
+                                    </Button>
+                                    <Button 
+                                        variant="destructive" 
+                                        className="font-semibold shadow-sm hover:shadow" 
+                                        onClick={() => router.patch(route('finance.reject', invoice.ulid))}
+                                    >
+                                        <XCircle className="mr-2 h-4 w-4" /> Reject
+                                    </Button>
+                                </div>
+                            )}
+                        </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/routes/web.php b/Modules/FinancialManagement/routes/web.php
index bcab28f..06b51ce 100644
--- a/Modules/FinancialManagement/routes/web.php
+++ b/Modules/FinancialManagement/routes/web.php
@@ -20,3 +20,10 @@ Route::middleware(['web', 'auth', 'permission:finance.access'])->group(function
     // Retention
     Route::get('retention', [FinanceController::class, 'retention'])->name('retention.index');
 });
+
+Route::middleware(['web', 'auth'])->group(function () {
+    // Cash Advances (Accessible to Supervisors, Site Techs, PMs, and Admins)
+    Route::get('cash-advances', [FinanceController::class, 'cashAdvances'])->name('cash-advances.index');
+    Route::post('cash-advances', [FinanceController::class, 'storeCashAdvance'])->name('cash-advances.store');
+    Route::patch('cash-advances/{cashAdvance:ulid}/approve', [FinanceController::class, 'approveCashAdvance'])->name('cash-advances.approve');
+});
diff --git a/Modules/Labors/database/factories/LaborFactory.php b/Modules/Labors/database/factories/LaborFactory.php
index e1833b5..731b6e8 100644
--- a/Modules/Labors/database/factories/LaborFactory.php
+++ b/Modules/Labors/database/factories/LaborFactory.php
@@ -13,7 +13,7 @@ class LaborFactory extends Factory
     {
         return [
             'name'        => fake()->jobTitle(),
-            'category'    => fake()->randomElement(['skilled', 'unskilled', 'technical']),
+            'category'    => fake()->randomElement(['skilled', 'unskilled']),
             'hourly_rate' => fake()->randomFloat(2, 50, 500),
             'status'      => 'active',
         ];
diff --git a/Modules/MaterialLogistics/app/Http/Controllers/MaterialController.php b/Modules/MaterialLogistics/app/Http/Controllers/MaterialController.php
index a23beab..5f3363e 100644
--- a/Modules/MaterialLogistics/app/Http/Controllers/MaterialController.php
+++ b/Modules/MaterialLogistics/app/Http/Controllers/MaterialController.php
@@ -144,7 +144,15 @@ class MaterialController extends Controller
             ->with(['warehouseStocks', 'projectInventories'])
             ->get();
 
-        $projectManagers = User::role('Project Manager')->select('id', 'name')->get();
+        $projectManagers = User::whereIn('user_type', ['admin', 'employee', 'contractor'])
+            ->where(function ($q) {
+                $q->whereIn('user_type', ['admin'])
+                  ->orWhereHas('roles', function ($rq) {
+                      $rq->whereIn('name', ['Project Manager', 'Main Contractor Admin', 'Super Admin', 'admin', 'Construction Supervisor', 'Site Technical', 'Contractor']);
+                  });
+            })
+            ->select('id', 'name', 'email')
+            ->get();
 
         return Inertia::render('MaterialLogistics::Inventory/OperationsForm', [
             'warehouses' => $warehouses,
diff --git a/Modules/MaterialLogistics/resources/js/Pages/Inventory/OperationsForm.tsx b/Modules/MaterialLogistics/resources/js/Pages/Inventory/OperationsForm.tsx
index b7d7f62..388d109 100644
--- a/Modules/MaterialLogistics/resources/js/Pages/Inventory/OperationsForm.tsx
+++ b/Modules/MaterialLogistics/resources/js/Pages/Inventory/OperationsForm.tsx
@@ -655,7 +655,7 @@ export default function OperationsForm({ warehouses, projects, materials, projec
                                 <div>
                                     <Label>{uiConfig.handlerLabel} *</Label>
                                     <Select value={data.handler_id} onValueChange={(v) => updateForm('handler_id', v)} items={personnelItems}>
-                                        <SelectTrigger><SelectValue placeholder="Select Project Manager" /></SelectTrigger>
+                                        <SelectTrigger><SelectValue placeholder="Select Personnel" /></SelectTrigger>
                                         <SelectContent>{mergedProjectManagers.map(pm => <SelectItem key={pm.id} value={String(pm.id)}>{pm.name}</SelectItem>)}</SelectContent>
                                     </Select>
                                     {errors.handler_id && <p className="text-sm text-red-500 mt-1">{errors.handler_id}</p>}
@@ -706,29 +706,55 @@ export default function OperationsForm({ warehouses, projects, materials, projec
                                                         </Button>
                                                     </div>
                                                     
-                                                    <div className="mt-2 flex items-center justify-between border-t pt-3">
+                                                    <div className="mt-2 flex items-center justify-between border-t border-slate-100 pt-3">
                                                         <div className="flex items-center gap-2">
-                                                            <Label className="text-xs text-gray-600 shrink-0">Quantity</Label>
-                                                            <div className="relative">
+                                                            <Label className="text-xs font-semibold text-slate-700 shrink-0">Quantity</Label>
+                                                            <div className="flex items-center border border-slate-200 rounded-lg bg-white overflow-hidden shadow-xs focus-within:ring-2 focus-within:ring-emerald-500 focus-within:border-emerald-500">
+                                                                <button
+                                                                    type="button"
+                                                                    className="px-2 py-1.5 bg-slate-50 hover:bg-slate-100 text-slate-600 text-xs font-bold transition-colors border-r border-slate-200 disabled:opacity-40"
+                                                                    disabled={Number(item.quantity || 0) <= 1}
+                                                                    onClick={() => {
+                                                                        const current = Math.max(1, Number(item.quantity || 1) - 1);
+                                                                        updateLineItem(idx, 'quantity', String(current));
+                                                                    }}
+                                                                >
+                                                                    -
+                                                                </button>
                                                                 <Input 
                                                                     type="number" step="0.01" min="0.01" 
-                                                                    className="w-24 text-right pr-8 font-medium h-9"
+                                                                    className="w-20 text-center font-semibold text-slate-800 h-8 border-none focus-visible:ring-0 focus-visible:outline-none focus:ring-0 [appearance:textfield] [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none"
                                                                     value={item.quantity} 
                                                                     onChange={(e) => updateLineItem(idx, 'quantity', e.target.value)} 
                                                                 />
-                                                                <span className="absolute right-3 top-2.5 text-xs text-gray-500">{mat?.unit}</span>
+                                                                <button
+                                                                    type="button"
+                                                                    className="px-2 py-1.5 bg-slate-50 hover:bg-slate-100 text-slate-600 text-xs font-bold transition-colors border-l border-slate-200 disabled:opacity-40"
+                                                                    disabled={unallocatedStock !== null && Number(item.quantity || 0) >= unallocatedStock}
+                                                                    onClick={() => {
+                                                                        const current = Number(item.quantity || 0) + 1;
+                                                                        if (unallocatedStock === null || current <= unallocatedStock) {
+                                                                            updateLineItem(idx, 'quantity', String(current));
+                                                                        }
+                                                                    }}
+                                                                >
+                                                                    +
+                                                                </button>
                                                             </div>
+                                                            <Badge variant="outline" className="bg-slate-50 text-slate-600 border-slate-200 text-[11px] font-normal py-0.5 px-2">
+                                                                {mat?.unit}
+                                                            </Badge>
                                                         </div>
                                                         {unallocatedStock !== null && (
                                                             <div className="text-xs text-right">
-                                                                <span className="text-gray-500">Available: </span>
-                                                                <span className={`font-semibold ${Number(item.quantity) > unallocatedStock ? 'text-red-600' : 'text-green-600'}`}>
+                                                                <span className="text-slate-400">Available: </span>
+                                                                <span className={`font-semibold font-mono ${Number(item.quantity) > unallocatedStock ? 'text-rose-600' : 'text-emerald-700'}`}>
                                                                     {unallocatedStock}
                                                                 </span>
                                                             </div>
                                                         )}
                                                     </div>
-                                                    {errorQty && <p className="text-xs text-red-500 mt-1">{errorQty}</p>}
+                                                    {errorQty && <p className="text-xs text-rose-500 mt-1 font-medium">{errorQty}</p>}
                                                 </div>
                                             );
                                         })}
diff --git a/Modules/MaterialLogistics/resources/js/Pages/PurchaseOrders/Show.tsx b/Modules/MaterialLogistics/resources/js/Pages/PurchaseOrders/Show.tsx
index 3984f06..9c4ee2f 100644
--- a/Modules/MaterialLogistics/resources/js/Pages/PurchaseOrders/Show.tsx
+++ b/Modules/MaterialLogistics/resources/js/Pages/PurchaseOrders/Show.tsx
@@ -40,7 +40,7 @@ const paymentColor = (s: string) => ({ unpaid: 'destructive', partial: 'secondar
 import { ConfirmModal } from '@/Components/ConfirmModal';
 
 export default function Show({ purchaseOrder, warehouses, budgetAnalysis }: Props) {
-    const { flash, errors } = usePage<PageProps>().props;
+    const { auth, flash, errors } = usePage<PageProps>().props;
     const [payDialog, setPayDialog] = useState(false);
     const [paying, setPaying] = useState(false);
     const [submitModalOpen, setSubmitModalOpen] = useState(false);
@@ -203,7 +203,7 @@ export default function Show({ purchaseOrder, warehouses, budgetAnalysis }: Prop
                             </Link>
                         </>
                     )}
-                    {purchaseOrder.status === 'submitted' && (
+                    {purchaseOrder.status === 'submitted' && (auth.user.user_type === 'admin' || auth.user.roles?.some((r: any) => ['Super Admin', 'admin', 'Project Manager', 'Main Contractor Admin'].includes(r.name))) && (
                         <Button
                             className="bg-emerald-600 hover:bg-emerald-700 text-white"
                             onClick={() => {
diff --git a/Modules/MaterialLogistics/resources/js/Pages/Requisitions/Form.tsx b/Modules/MaterialLogistics/resources/js/Pages/Requisitions/Form.tsx
index 2c814b7..ca1f52a 100644
--- a/Modules/MaterialLogistics/resources/js/Pages/Requisitions/Form.tsx
+++ b/Modules/MaterialLogistics/resources/js/Pages/Requisitions/Form.tsx
@@ -23,6 +23,7 @@ interface ProjectOption {
     start_date?: string | null;
     target_end_date?: string | null;
     contract_value?: string | number | null;
+    contractor?: { id: number; ulid: string; company_name: string } | null;
 }
 interface ItemEntry { material_ulid: string; quantity: string; unit_cost: string; }
 interface PrefilledItem { material_ulid: string; material_name: string; unit: string; quantity: number; unit_cost: number; }
diff --git a/Modules/MaterialLogistics/resources/js/Pages/Requisitions/Show.tsx b/Modules/MaterialLogistics/resources/js/Pages/Requisitions/Show.tsx
index c30b5b5..308d7fd 100644
--- a/Modules/MaterialLogistics/resources/js/Pages/Requisitions/Show.tsx
+++ b/Modules/MaterialLogistics/resources/js/Pages/Requisitions/Show.tsx
@@ -20,7 +20,7 @@ import { ConfirmModal } from '@/Components/ConfirmModal';
 import { useState } from 'react';
 
 export default function Show({ requisition }: Props) {
-    const { flash } = usePage<PageProps>().props;
+    const { flash, auth } = usePage<PageProps>().props;
     const [confirmModalOpen, setConfirmModalOpen] = useState(false);
 
     const handleSubmitApproval = () => {
@@ -78,7 +78,7 @@ export default function Show({ requisition }: Props) {
                             </Link>
                         </>
                     )}
-                    {requisition.status === 'submitted' && (
+                    {requisition.status === 'submitted' && (auth.user.user_type === 'admin' || auth.user.roles?.some((r: any) => ['Super Admin', 'admin', 'Project Manager', 'Main Contractor Admin'].includes(r.name))) && (
                         <div className="flex items-center gap-2">
                             <Button
                                 className="bg-emerald-600 hover:bg-emerald-700 text-white"
diff --git a/Modules/ProjectManagement/app/Http/Controllers/ProjectController.php b/Modules/ProjectManagement/app/Http/Controllers/ProjectController.php
index 514852e..3592cb8 100644
--- a/Modules/ProjectManagement/app/Http/Controllers/ProjectController.php
+++ b/Modules/ProjectManagement/app/Http/Controllers/ProjectController.php
@@ -45,16 +45,37 @@ class ProjectController extends Controller
             ->where('current_wizard_step', '<', 7)
             ->with(['contractor:id,company_name', 'personnel:id,name']);
  
-        // Non-platform admins only see projects they are assigned to
-        if ($user && !$user->hasRole('Super Admin')) {
-            $query->whereHas('personnel', function ($q) use ($user) {
-                $q->where('users.id', $user->id);
+        // Filter non-admin users to assigned projects or company projects
+        if ($user && $user->user_type !== 'admin' && ! $user->hasRole('Super Admin')) {
+            $query->where(function ($q) use ($user) {
+                $q->whereHas('personnel', function ($pq) use ($user) {
+                    $pq->where('users.id', $user->id);
+                });
+                if ($user->contractor_id) {
+                    $q->orWhere('contractor_id', $user->contractor_id);
+                } else {
+                    $q->orWhereNull('contractor_id');
+                }
             });
-            $historyQuery->whereHas('personnel', function ($q) use ($user) {
-                $q->where('users.id', $user->id);
+            $historyQuery->where(function ($q) use ($user) {
+                $q->whereHas('personnel', function ($pq) use ($user) {
+                    $pq->where('users.id', $user->id);
+                });
+                if ($user->contractor_id) {
+                    $q->orWhere('contractor_id', $user->contractor_id);
+                } else {
+                    $q->orWhereNull('contractor_id');
+                }
             });
-            $draftsQuery->whereHas('personnel', function ($q) use ($user) {
-                $q->where('users.id', $user->id);
+            $draftsQuery->where(function ($q) use ($user) {
+                $q->whereHas('personnel', function ($pq) use ($user) {
+                    $pq->where('users.id', $user->id);
+                });
+                if ($user->contractor_id) {
+                    $q->orWhere('contractor_id', $user->contractor_id);
+                } else {
+                    $q->orWhereNull('contractor_id');
+                }
             });
         }
  
@@ -64,7 +85,7 @@ class ProjectController extends Controller
             ->latest()
             ->paginate(15, ['*'], 'page')
             ->withQueryString()
-            ->through(fn ($p) => $p->append(['capitalization_percentage', 'is_over_budget']));
+            ->through(fn ($p) => $p->append(['capitalization_percentage', 'is_over_budget', 'milestone_completion']));
 
         $history = $historyQuery
             ->when($request->search, fn ($q, $s) => $q->where('name', 'like', "%{$s}%")->orWhere('code', 'like', "%{$s}%"))
@@ -72,7 +93,7 @@ class ProjectController extends Controller
             ->latest()
             ->paginate(15, ['*'], 'history_page')
             ->withQueryString()
-            ->through(fn ($p) => $p->append(['capitalization_percentage', 'is_over_budget']));
+            ->through(fn ($p) => $p->append(['capitalization_percentage', 'is_over_budget', 'milestone_completion']));
  
         $drafts = $draftsQuery->latest()->get();
  
@@ -90,7 +111,16 @@ class ProjectController extends Controller
 
     public function create()
     {
-        $employees = User::whereIn('user_type', ['admin', 'employee'])->with('employeeProfile')->select('id', 'ulid', 'name', 'email', 'profile_picture')->get();
+        $employees = User::whereIn('user_type', ['admin', 'employee'])
+            ->where(function ($q) {
+                $q->whereIn('user_type', ['admin'])
+                  ->orWhereHas('roles', function ($rq) {
+                      $rq->whereIn('name', ['Project Manager', 'Main Contractor Admin', 'Super Admin', 'admin', 'Contractor']);
+                  });
+            })
+            ->with('employeeProfile')
+            ->select('id', 'ulid', 'name', 'email', 'profile_picture')
+            ->get();
         $projects = Project::active()->with('parentProject:id,ulid,name,code')->get(['id', 'ulid', 'name', 'code', 'parent_project_id', 'project_type']);
 
         return Inertia::render('ProjectManagement::Projects/Create', [
@@ -241,7 +271,16 @@ class ProjectController extends Controller
             'materialsEstimates.material',
         ]);
 
-        $employees = User::whereIn('user_type', ['admin', 'employee'])->with('employeeProfile')->select('id', 'ulid', 'name', 'email', 'profile_picture')->get();
+        $employees = User::whereIn('user_type', ['admin', 'employee'])
+            ->where(function ($q) {
+                $q->whereIn('user_type', ['admin'])
+                  ->orWhereHas('roles', function ($rq) {
+                      $rq->whereIn('name', ['Project Manager', 'Main Contractor Admin', 'Super Admin', 'admin', 'Contractor']);
+                  });
+            })
+            ->with('employeeProfile')
+            ->select('id', 'ulid', 'name', 'email', 'profile_picture')
+            ->get();
         $projects = Project::active()->with('parentProject:id,ulid,name,code')->where('id', '!=', $project->id)->get(['id', 'ulid', 'name', 'code', 'parent_project_id', 'project_type']);
 
         $materials = \Modules\MasterData\Models\Material::where('type', 'single')
@@ -412,7 +451,16 @@ class ProjectController extends Controller
             'personnel:id,ulid,name,email',
         ]);
 
-        $employees = User::whereIn('user_type', ['admin', 'employee'])->with('employeeProfile')->select('id', 'ulid', 'name', 'email', 'profile_picture')->get();
+        $employees = User::whereIn('user_type', ['admin', 'employee'])
+            ->where(function ($q) {
+                $q->whereIn('user_type', ['admin'])
+                  ->orWhereHas('roles', function ($rq) {
+                      $rq->whereIn('name', ['Project Manager', 'Main Contractor Admin', 'Super Admin', 'admin', 'Contractor']);
+                  });
+            })
+            ->with(['employeeProfile', 'roles'])
+            ->select('id', 'ulid', 'name', 'email', 'user_type', 'profile_picture')
+            ->get();
         $parentProjects = Project::active()->with('parentProject:id,ulid,name,code')->where('id', '!=', $project->id)->get(['id', 'ulid', 'name', 'code', 'parent_project_id', 'project_type']);
         $materials = \Modules\MasterData\Models\Material::where('type', 'single')
             ->where('status', 'active')
diff --git a/Modules/ProjectManagement/app/Models/Task.php b/Modules/ProjectManagement/app/Models/Task.php
index 5b9784a..e23ee65 100644
--- a/Modules/ProjectManagement/app/Models/Task.php
+++ b/Modules/ProjectManagement/app/Models/Task.php
@@ -282,8 +282,8 @@ class Task extends Model
             }
             if ($currentStatus === TaskStatus::Completed) {
                 $updates['actual_end_date'] = null;
-                $updates['completion_percentage'] = 0;
             }
+            $updates['completion_percentage'] = 50;
         }
 
         if ($newStatus === TaskStatus::Pending) {
diff --git a/Modules/ProjectManagement/resources/js/Components/ProjectForm.tsx b/Modules/ProjectManagement/resources/js/Components/ProjectForm.tsx
index c06ceb0..5a8c131 100644
--- a/Modules/ProjectManagement/resources/js/Components/ProjectForm.tsx
+++ b/Modules/ProjectManagement/resources/js/Components/ProjectForm.tsx
@@ -87,62 +87,64 @@ function ProjectManagerLookup({ employees, selectedId, onSelect, disabled }: { e
                 <ChevronDown className="h-4 w-4 shrink-0 opacity-50" />
             </Button>
             <Dialog open={open} onOpenChange={handleOpenChange}>
-                <DialogContent className="max-w-4xl max-h-[85vh] flex flex-col p-0 gap-0">
-                    <DialogHeader className="px-6 py-5 border-b">
-                        <DialogTitle>Select Project Manager</DialogTitle>
+                <DialogContent className="sm:max-w-2xl max-h-[85vh] flex flex-col p-0 gap-0">
+                    <DialogHeader className="px-6 py-4 border-b">
+                        <DialogTitle className="text-base font-semibold">Select Project Manager</DialogTitle>
                     </DialogHeader>
                     
-                    <div className="px-6 py-5 border-b bg-muted/30">
+                    <div className="px-6 py-3 border-b bg-muted/20">
                         <div className="relative">
                             <Search className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
                             <Input
                                 placeholder="Search by name, email, or position..."
                                 value={search}
                                 onChange={(e) => setSearch(e.target.value)}
-                                className="pl-9 bg-background"
+                                className="pl-9 bg-background text-sm h-9"
                             />
                         </div>
                     </div>
 
-                    <div className="flex-1 overflow-y-auto p-6 max-h-[500px]">
+                    <div className="flex-1 overflow-y-auto p-4 max-h-[420px]">
                         {filteredEmployees.length === 0 ? (
-                            <div className="text-center py-8 text-muted-foreground">
+                            <div className="text-center py-8 text-sm text-muted-foreground">
                                 No project managers found matching your search.
                             </div>
                         ) : (
-                            <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-4">
+                            <div className="grid grid-cols-1 sm:grid-cols-2 gap-3">
                                 {filteredEmployees.map((emp) => {
                                     const isSelected = tempSelectedId === emp.ulid;
                                     return (
                                         <div
                                             key={emp.ulid}
                                             onClick={() => setTempSelectedId(emp.ulid)}
-                                            className={`flex items-start gap-3 p-3 rounded-lg border cursor-pointer transition-colors ${
+                                            className={`flex items-center gap-3 p-3 rounded-lg border cursor-pointer transition-all ${
                                                 isSelected 
                                                 ? 'border-primary bg-primary/5 ring-1 ring-primary' 
-                                                : 'border-border hover:bg-accent/50'
+                                                : 'border-border hover:bg-accent/40'
                                             }`}
                                         >
                                             <Avatar className="h-10 w-10 shrink-0">
                                                 {emp.profile_picture && (
                                                     <AvatarImage src={emp.profile_picture} alt={emp.name} className="object-cover" />
                                                 )}
-                                                <AvatarFallback className="bg-primary/10 text-primary font-medium">
+                                                <AvatarFallback className="bg-primary/10 text-primary text-xs font-semibold">
                                                     {emp.name.substring(0, 2).toUpperCase()}
                                                 </AvatarFallback>
                                             </Avatar>
-                                            <div className="flex-1 min-w-0">
+                                            <div className="flex-1 min-w-0 pr-1">
                                                 <div className="flex items-center justify-between gap-1">
-                                                    <p className="text-sm font-medium truncate">{emp.name}</p>
+                                                    <p className="text-sm font-semibold truncate text-foreground">{emp.name}</p>
                                                     {isSelected && <CheckCircle2 className="h-4 w-4 text-primary shrink-0" />}
                                                 </div>
                                                 <p className="text-xs text-muted-foreground truncate" title={emp.email}>
                                                     {emp.email || 'No email provided'}
                                                 </p>
                                                 {emp.employee_profile?.position && (
-                                                    <Badge variant="secondary" className="mt-1.5 text-[10px] font-normal px-1.5 py-0">
-                                                        {emp.employee_profile.position}
-                                                    </Badge>
+                                                    <div className="mt-1">
+                                                        <span className="inline-block rounded-md bg-muted px-2 py-0.5 text-[11px] font-medium text-muted-foreground truncate max-w-full">
+                                                            {emp.employee_profile.position}
+                                                        </span>
+                                                    </div>
                                                 )}
                                             </div>
                                         </div>
diff --git a/Modules/ProjectManagement/resources/js/Pages/Projects/Index.tsx b/Modules/ProjectManagement/resources/js/Pages/Projects/Index.tsx
index af03de1..57d75ec 100644
--- a/Modules/ProjectManagement/resources/js/Pages/Projects/Index.tsx
+++ b/Modules/ProjectManagement/resources/js/Pages/Projects/Index.tsx
@@ -27,9 +27,11 @@ interface Project {
     capitalization_percentage: number;
     is_over_budget: boolean;
     completion_percentage: string;
+    milestone_completion?: number;
     start_date?: string;
     target_end_date?: string;
     created_at: string;
+    contractor?: { id: number; ulid: string; company_name: string };
     personnel?: { id: number; ulid: string; name: string }[];
     current_wizard_step?: number;
 }
@@ -238,11 +240,11 @@ export default function Index({ projects, history, drafts = [], filters, statuse
                                                                 <div className="w-16 h-2 rounded-full bg-gray-200 overflow-hidden">
                                                                     <div
                                                                         className="h-full bg-green-500 rounded-full transition-all"
-                                                                        style={{ width: `${project.completion_percentage}%` }}
+                                                                        style={{ width: `${Math.min(Number(project.milestone_completion ?? project.completion_percentage ?? 0), 100)}%` }}
                                                                     />
                                                                 </div>
-                                                                <span className="text-xs text-gray-500">
-                                                                    {Number(project.completion_percentage).toFixed(0)}%
+                                                                <span className="text-xs text-gray-600 font-semibold font-mono">
+                                                                    {Number(project.milestone_completion ?? project.completion_percentage ?? 0).toFixed(0)}%
                                                                 </span>
                                                             </div>
                                                         </TableCell>
diff --git a/Modules/ProjectManagement/resources/js/Pages/Projects/Modules/Documents.tsx b/Modules/ProjectManagement/resources/js/Pages/Projects/Modules/Documents.tsx
index 97d4aea..ef9c821 100644
--- a/Modules/ProjectManagement/resources/js/Pages/Projects/Modules/Documents.tsx
+++ b/Modules/ProjectManagement/resources/js/Pages/Projects/Modules/Documents.tsx
@@ -400,28 +400,17 @@ export default function Documents({ project, currentTab, documents, categories,
                         onSearchChange={setSearch}
                         onSearchSubmit={handleSearch}
                         filters={
-                            <>
-                                <Select value={catFilter} onValueChange={handleCatFilter}>
-                                    <SelectTrigger className="w-[160px]">
-                                        <SelectValue placeholder="All Categories">
-                                            {catFilter === 'all' ? 'All Categories' : categories?.find(c => c.id.toString() === catFilter)?.name || 'All Categories'}
-                                        </SelectValue>
-                                    </SelectTrigger>
-                                    <SelectContent>
-                                        <SelectItem value="all">All Categories</SelectItem>
-                                        {categories && categories.map(c => <SelectItem key={c.id} value={c.id.toString()}>{c.name}</SelectItem>)}
-                                    </SelectContent>
-                                </Select>
-                                <Select value={statusFilter} onValueChange={handleStatusFilter}>
-                                    <SelectTrigger className="w-[140px]"><SelectValue placeholder="All Status" /></SelectTrigger>
-                                    <SelectContent>
-                                        <SelectItem value="all">All Status</SelectItem>
-                                        <SelectItem value="Pending">Pending</SelectItem>
-                                        <SelectItem value="Approved">Approved</SelectItem>
-                                        <SelectItem value="Rejected">Rejected</SelectItem>
-                                    </SelectContent>
-                                </Select>
-                            </>
+                            <Select value={catFilter} onValueChange={handleCatFilter}>
+                                <SelectTrigger className="w-[160px]">
+                                    <SelectValue placeholder="All Categories">
+                                        {catFilter === 'all' ? 'All Categories' : categories?.find(c => c.id.toString() === catFilter)?.name || 'All Categories'}
+                                    </SelectValue>
+                                </SelectTrigger>
+                                <SelectContent>
+                                    <SelectItem value="all">All Categories</SelectItem>
+                                    {categories && categories.map(c => <SelectItem key={c.id} value={c.id.toString()}>{c.name}</SelectItem>)}
+                                </SelectContent>
+                            </Select>
                         }
                         actions={
                             <div className="flex items-center gap-2">
@@ -451,15 +440,15 @@ export default function Documents({ project, currentTab, documents, categories,
                                         <form onSubmit={handleUpload} className="space-y-4 text-sm mt-2">
                                             <div><Label className="text-gray-700">Title *</Label><Input className="bg-white text-gray-900" value={form.data.title} onChange={(e) => form.setData('title', e.target.value)} /></div>
                                             <div className="grid grid-cols-2 gap-4">
-                                                <div><Label className="text-gray-700">Category *</Label>
-                                                    <Select value={form.data.category_id} onValueChange={(v) => { if (v) form.setData('category_id', v); }}>
-                                                        <SelectTrigger className="bg-white">
-                                                            <SelectValue placeholder="Select Category">
-                                                                {form.data.category_id ? categories?.find(c => c.id.toString() === form.data.category_id)?.name : 'Select Category'}
-                                                            </SelectValue>
-                                                        </SelectTrigger>
-                                                        <SelectContent className="rounded-md">{categories && categories.map(c => <SelectItem key={c.id} value={c.id.toString()}>{c.name}</SelectItem>)}</SelectContent>
-                                                    </Select></div>
+                                                 <div><Label className="text-gray-700">Category *</Label>
+                                                     <Select value={form.data.category_id} onValueChange={(v) => { if (v) form.setData('category_id', v); }}>
+                                                         <SelectTrigger className="bg-white">
+                                                             <SelectValue placeholder="Select Category">
+                                                                 {form.data.category_id ? categories?.find(c => String(c.id) === String(form.data.category_id))?.name : undefined}
+                                                             </SelectValue>
+                                                         </SelectTrigger>
+                                                         <SelectContent className="rounded-md">{categories?.map(c => <SelectItem key={c.id} value={String(c.id)}>{c.name}</SelectItem>)}</SelectContent>
+                                                     </Select></div>
                                                 <div><Label className="text-gray-700">Project</Label>
                                                     <Input value={project.name} disabled />
                                                 </div>
@@ -500,7 +489,6 @@ export default function Documents({ project, currentTab, documents, categories,
                             <Table className="font-sans text-sm">
                                 <TableHeader className="bg-gray-50/70"><TableRow className="hover:bg-transparent border-b border-gray-250">
                                     <TableHead className="w-[40px]"></TableHead><TableHead>Title</TableHead><TableHead>Category</TableHead>
-                                    <TableHead>Status</TableHead>
                                     <TableHead>Versions</TableHead>
                                     <TableHead className="text-right">Actions</TableHead>
                                 </TableRow></TableHeader>
@@ -510,7 +498,6 @@ export default function Documents({ project, currentTab, documents, categories,
                                             <TableCell>{isImage(doc.mime_type) ? <Image className="h-4 w-4 text-blue-500" /> : <File className="h-4 w-4 text-gray-400" />}</TableCell>
                                             <TableCell className="font-medium text-gray-900">{doc.title}</TableCell>
                                             <TableCell><Badge variant="outline" className="text-gray-600 border-gray-250 bg-gray-50">{getCategoryName(doc.category)}</Badge></TableCell>
-                                            <TableCell><StatusBadge status={doc.status} /></TableCell>
                                             <TableCell>
                                                 <Link href={route('documents.versions', doc.ulid)} className="text-blue-600 hover:underline">v{doc.version_count}</Link>
                                             </TableCell>
@@ -579,7 +566,6 @@ export default function Documents({ project, currentTab, documents, categories,
                                                     <Badge variant="outline" className="rounded-md border-gray-200 text-[10px] px-2 text-gray-500 font-normal">
                                                         {getCategoryName(doc.category)}
                                                     </Badge>
-                                                    <StatusBadge status={doc.status} />
                                                 </div>
                                                 <div className="text-xs text-gray-500 flex items-center justify-between border-t border-gray-100 pt-2">
                                                     <span>VERSION</span>
diff --git a/Modules/ProjectManagement/resources/js/Pages/Projects/Show.tsx b/Modules/ProjectManagement/resources/js/Pages/Projects/Show.tsx
index d2ab75b..267310e 100644
--- a/Modules/ProjectManagement/resources/js/Pages/Projects/Show.tsx
+++ b/Modules/ProjectManagement/resources/js/Pages/Projects/Show.tsx
@@ -362,7 +362,7 @@ export default function Show({ project, employees, availableMaterials, latestRep
                             </CardContent>
                         </Card>
                         <StatCard icon={Calendar} label="Timeline" value={project.start_date ? new Date(project.start_date).toLocaleDateString() : 'Not set'} sub={project.target_end_date ? `→ ${new Date(project.target_end_date).toLocaleDateString()}` : undefined} />
-                        <StatCard icon={Users} label="Progress" value={`${Number(project.completion_percentage).toFixed(0)}%`} sub={`${taskStats.completed} / ${taskStats.total} tasks done`} />
+                        <StatCard icon={Users} label="Progress" value={`${Number(milestoneStats.completion_percentage).toFixed(0)}%`} sub={`${taskStats.completed} / ${taskStats.total} tasks done`} />
                     </div>
 
                     <Tabs defaultValue="tasks">
diff --git a/Modules/ProjectManagement/resources/js/Pages/Projects/Wizard.tsx b/Modules/ProjectManagement/resources/js/Pages/Projects/Wizard.tsx
index be3c3c1..26d1f88 100644
--- a/Modules/ProjectManagement/resources/js/Pages/Projects/Wizard.tsx
+++ b/Modules/ProjectManagement/resources/js/Pages/Projects/Wizard.tsx
@@ -74,6 +74,12 @@ interface Employee {
     ulid: string;
     name: string;
     email: string;
+    user_type?: string;
+    roles?: { id: number; name: string }[];
+    employee_profile?: {
+        position?: string;
+        department?: string;
+    };
 }
 
 interface Props extends PageProps {
@@ -909,7 +915,7 @@ export default function Wizard({ project, step: currentStep, employees, projects
                                                     const total = Number(item.estimated_hours || 0) * rate;
                                                     return (
                                                         <TableRow key={idx} className="hover:bg-slate-50/20 transition-colors">
-                                                            <TableCell>
+                                                            <TableCell className="w-56 max-w-[220px]">
                                                                 <Select 
                                                                     value={item.task_ulid} 
                                                                     onValueChange={val => updateLaborAllocation(idx, 'task_ulid', val || '')}
@@ -918,13 +924,13 @@ export default function Wizard({ project, step: currentStep, employees, projects
                                                                         ...project.tasks.map(t => ({ value: t.ulid, label: t.name }))
                                                                     ]}
                                                                 >
-                                                                    <SelectTrigger className="h-8 text-xs border-slate-200">
-                                                                        <SelectValue placeholder="Select Task" />
+                                                                    <SelectTrigger className="h-8 text-xs border-slate-200 w-full truncate">
+                                                                        <SelectValue placeholder="Select Task" className="truncate" />
                                                                     </SelectTrigger>
-                                                                    <SelectContent>
+                                                                    <SelectContent className="max-w-xs">
                                                                         <SelectItem value="general">General Project / Unassigned</SelectItem>
                                                                         {project.tasks.map(t => (
-                                                                            <SelectItem key={t.ulid} value={t.ulid}>{t.name}</SelectItem>
+                                                                            <SelectItem key={t.ulid} value={t.ulid} className="truncate">{t.name}</SelectItem>
                                                                         ))}
                                                                     </SelectContent>
                                                                 </Select>
@@ -1279,19 +1285,23 @@ export default function Wizard({ project, step: currentStep, employees, projects
                                 ) : (
                                     <div className="space-y-4 max-w-lg">
                                         <div className="space-y-1.5">
-                                            <Label htmlFor="approver_ids" className="font-semibold text-slate-700">Required Approver(s)</Label>
+                                            <Label htmlFor="approver_ids" className="font-semibold text-slate-700">Required Approver (Admin / Super Admin) *</Label>
                                             <Select 
                                                 value={approverIds[0] || ''} 
                                                 onValueChange={val => setApproverIds(val ? [val] : [])}
-                                                items={employees.map(e => ({ value: e.ulid, label: `${e.name} (${e.email})` }))}
+                                                items={employees
+                                                    .filter(e => e.user_type === 'admin' || e.roles?.some(r => r.name === 'Super Admin' || r.name === 'admin'))
+                                                    .map(e => ({ value: e.ulid, label: `${e.name} (${e.email})` }))}
                                             >
                                                 <SelectTrigger className={`border-slate-200 mt-1 ${errors?.approver_ids ? 'border-rose-400 focus:ring-rose-500 focus:border-rose-500' : ''}`}>
-                                                    <SelectValue placeholder="Select Reviewing Admin" />
+                                                    <SelectValue placeholder="Select System Admin or Super Admin" />
                                                 </SelectTrigger>
                                                 <SelectContent>
-                                                    {employees.map(e => (
-                                                        <SelectItem key={e.ulid} value={e.ulid}>{e.name} ({e.email})</SelectItem>
-                                                    ))}
+                                                    {employees
+                                                        .filter(e => e.user_type === 'admin' || e.roles?.some(r => r.name === 'Super Admin' || r.name === 'admin'))
+                                                        .map(e => (
+                                                            <SelectItem key={e.ulid} value={e.ulid}>{e.name} ({e.email})</SelectItem>
+                                                        ))}
                                                 </SelectContent>
                                             </Select>
                                             {errors?.approver_ids && (
@@ -1299,11 +1309,10 @@ export default function Wizard({ project, step: currentStep, employees, projects
                                                     {String(errors.approver_ids)}
                                                 </span>
                                             )}
-                                            <span className="text-[10px] text-slate-400 mt-1 block">Select an administrator user to review and lock the budget estimation.</span>
                                         </div>
 
                                         <div className="space-y-1.5">
-                                            <Label htmlFor="notes" className="font-semibold text-slate-700">Review Notes</Label>
+                                            <Label htmlFor="notes" className="font-semibold text-slate-700">Review Notes (Optional)</Label>
                                             <Textarea 
                                                 id="notes" 
                                                 placeholder="Add setup notes, estimation summaries, or project margin context..." 
diff --git a/Modules/RolesPermissions/app/Http/Controllers/RolesPermissionsController.php b/Modules/RolesPermissions/app/Http/Controllers/RolesPermissionsController.php
index 438c89d..67c692e 100644
--- a/Modules/RolesPermissions/app/Http/Controllers/RolesPermissionsController.php
+++ b/Modules/RolesPermissions/app/Http/Controllers/RolesPermissionsController.php
@@ -12,7 +12,9 @@ class RolesPermissionsController extends Controller
 {
     public function index()
     {
-        $roles = Role::with('permissions')->get();
+        $roles = Role::whereNotIn('name', ['Super Admin', 'admin', 'Designer'])
+            ->with('permissions')
+            ->get();
         $permissions = Permission::all();
 
         return Inertia::render('RolesPermissions::Roles/Index', [
diff --git a/Modules/RolesPermissions/database/seeders/RolesPermissionsDatabaseSeeder.php b/Modules/RolesPermissions/database/seeders/RolesPermissionsDatabaseSeeder.php
index c521913..9cbabf9 100644
--- a/Modules/RolesPermissions/database/seeders/RolesPermissionsDatabaseSeeder.php
+++ b/Modules/RolesPermissions/database/seeders/RolesPermissionsDatabaseSeeder.php
@@ -55,6 +55,7 @@ class RolesPermissionsDatabaseSeeder extends Seeder
             'bidding.access',
             'materials-catalog.access',
             'inventory.access',
+            'finance.access',
             'documents.access',
             'approvals.access',
             'labors.access',
@@ -65,6 +66,7 @@ class RolesPermissionsDatabaseSeeder extends Seeder
             'dashboard.access',
             'projects.access',
             'bidding.access',
+            'finance.access',
             'documents.access',
         ]);
 
diff --git a/Modules/TaskManagement/app/Http/Controllers/TaskController.php b/Modules/TaskManagement/app/Http/Controllers/TaskController.php
index 4677537..fc2b42b 100644
--- a/Modules/TaskManagement/app/Http/Controllers/TaskController.php
+++ b/Modules/TaskManagement/app/Http/Controllers/TaskController.php
@@ -198,7 +198,17 @@ class TaskController extends Controller
                 : null;
         }
 
+        if (array_key_exists('completion_percentage', $validated)) {
+            $pct = (float) $validated['completion_percentage'];
+            if ($pct >= 100) {
+                $validated['status'] = 'completed';
+            } elseif ($pct > 0 && $task->status === TaskStatus::Pending) {
+                $validated['status'] = 'in_progress';
+            }
+        }
+
         $task->update($validated);
+        $this->updateProjectCompletion($project);
         $task->users()->sync($userIds);
 
         $addedUsers = array_diff($userIds, $oldUserIds);
@@ -244,6 +254,16 @@ class TaskController extends Controller
         try {
             $task->transitionTo($newStatus);
 
+            $completionPct = match ($newStatus->value) {
+                'completed', 'closed' => 100,
+                'in_progress' => 50,
+                default => 0,
+            };
+            $task->update([
+                'status' => $newStatus->value,
+                'completion_percentage' => $completionPct,
+            ]);
+
             if ($newStatus === TaskStatus::Completed) {
                 TaskCompleted::dispatch($task);
             }
@@ -286,7 +306,17 @@ class TaskController extends Controller
                     }
                 }
                 
-                $task->update(['sort_order' => $taskData['sort_order']]);
+                $completionPct = match ($taskData['status']) {
+                    'completed', 'closed' => 100,
+                    'in_progress' => 50,
+                    default => 0,
+                };
+
+                $task->update([
+                    'status' => $taskData['status'],
+                    'sort_order' => $taskData['sort_order'],
+                    'completion_percentage' => $completionPct,
+                ]);
             }
         }
 
@@ -294,7 +324,7 @@ class TaskController extends Controller
             $this->updateProjectCompletion($project);
         }
 
-        return back()->with('success', 'Tasks reordered successfully.');
+        return back()->with('success', 'Tasks updated successfully.');
     }
 
     private function updateProjectCompletion(Project $project): void
diff --git a/Modules/TaskManagement/resources/js/Components/KanbanBoard.tsx b/Modules/TaskManagement/resources/js/Components/KanbanBoard.tsx
index 34bb7bb..749ee41 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 } from 'lucide-react';
+import { Clock, Users, Lock, GripVertical } from 'lucide-react';
 
 interface KanbanBoardProps {
     tasks: any[];
@@ -125,21 +125,26 @@ export default function KanbanBoard({ tasks, onReorder, onTaskClick, readOnly =
                                                 <div
                                                     ref={provided.innerRef}
                                                     {...provided.draggableProps}
-                                                    {...provided.dragHandleProps}
                                                     style={provided.draggableProps.style}
-                                                    onClick={() => onTaskClick(task.ulid)}
                                                     className="outline-none"
                                                 >
-                                                    <Card className={`cursor-pointer transition-all duration-200 ease-in-out shadow-sm hover:shadow ${
+                                                    <Card className={`transition-all duration-200 ease-in-out shadow-sm hover:shadow ${
                                                          task.status === 'in_progress' ? 'border-l-4 border-l-blue-500 hover:border-blue-300' :
                                                          task.status === 'completed' ? 'border-l-4 border-l-emerald-500 hover:border-emerald-300' :
                                                          task.status === 'blocked' ? 'border-l-4 border-l-rose-500 hover:border-rose-300' :
                                                          task.status === 'closed' ? 'border-l-4 border-l-orange-500 hover:border-orange-300' :
                                                          'border-l-4 border-l-slate-400 hover:border-slate-300'
                                                      } ${snapshot.isDragging ? 'shadow-xl border-blue-400 rotate-2 scale-[1.02] opacity-90' : ''}`}>
-                                                        <CardContent className="p-4">
+                                                        <CardContent className="p-3.5">
                                                             <div className="font-medium text-gray-900 mb-2 leading-tight flex items-start justify-between gap-2">
-                                                                <span>{task.name}</span>
+                                                                <div className="flex items-center gap-2 overflow-hidden cursor-pointer" onClick={() => onTaskClick(task.ulid)}>
+                                                                    {!readOnly && task.status !== 'closed' && (
+                                                                        <div {...provided.dragHandleProps} className="cursor-grab active:cursor-grabbing p-1 rounded hover:bg-slate-100 text-slate-400 hover:text-slate-600 shrink-0" title="Drag to move column">
+                                                                            <GripVertical className="w-4 h-4" />
+                                                                        </div>
+                                                                    )}
+                                                                    <span className="hover:text-blue-600 font-semibold truncate">{task.name}</span>
+                                                                </div>
                                                                 {task.status === 'closed' && <Lock className="w-3.5 h-3.5 text-orange-500 shrink-0 mt-0.5" />}
                                                             </div>
                                                             {task.description && (
@@ -156,6 +161,52 @@ export default function KanbanBoard({ tasks, onReorder, onTaskClick, readOnly =
                                                                     <span>{task.estimated_hours || 0}h</span>
                                                                 </div>
                                                             </div>
+
+                                                            {/* Quick Status Action Buttons */}
+                                                            <div className="pt-2 border-t border-gray-100 flex items-center justify-between gap-1 mb-2" onClick={(e) => e.stopPropagation()}>
+                                                                <span className="text-[10px] uppercase tracking-wider font-semibold text-gray-400">Move Status:</span>
+                                                                <div className="flex items-center gap-1">
+                                                                    {task.status !== 'pending' && (
+                                                                        <button
+                                                                            type="button"
+                                                                            onClick={() => {
+                                                                                const updated = localTasks.map(t => t.ulid === task.ulid ? { ...t, status: 'pending' } : t);
+                                                                                setLocalTasks(updated);
+                                                                                onReorder(updated.map(t => ({ ulid: t.ulid, status: t.status, sort_order: t.sort_order || 0 })));
+                                                                            }}
+                                                                            className="px-2 py-0.5 text-[10px] font-medium rounded bg-slate-100 text-slate-700 hover:bg-slate-200"
+                                                                        >
+                                                                            Pending
+                                                                        </button>
+                                                                    )}
+                                                                    {task.status !== 'in_progress' && (
+                                                                        <button
+                                                                            type="button"
+                                                                            onClick={() => {
+                                                                                const updated = localTasks.map(t => t.ulid === task.ulid ? { ...t, status: 'in_progress' } : t);
+                                                                                setLocalTasks(updated);
+                                                                                onReorder(updated.map(t => ({ ulid: t.ulid, status: t.status, sort_order: t.sort_order || 0 })));
+                                                                            }}
+                                                                            className="px-2 py-0.5 text-[10px] font-medium rounded bg-blue-100 text-blue-700 hover:bg-blue-200"
+                                                                        >
+                                                                            In Progress
+                                                                        </button>
+                                                                    )}
+                                                                    {task.status !== 'completed' && (
+                                                                        <button
+                                                                            type="button"
+                                                                            onClick={() => {
+                                                                                const updated = localTasks.map(t => t.ulid === task.ulid ? { ...t, status: 'completed' } : t);
+                                                                                setLocalTasks(updated);
+                                                                                onReorder(updated.map(t => ({ ulid: t.ulid, status: t.status, sort_order: t.sort_order || 0 })));
+                                                                            }}
+                                                                            className="px-2 py-0.5 text-[10px] font-medium rounded bg-emerald-100 text-emerald-700 hover:bg-emerald-200"
+                                                                        >
+                                                                            Complete
+                                                                        </button>
+                                                                    )}
+                                                                </div>
+                                                            </div>
                                                             <div className="flex items-center justify-between">
                                                                 <div className="flex -space-x-2">
                                                                     {task.users?.slice(0, 3).map((user: any) => (
diff --git a/Modules/TaskManagement/resources/js/Pages/Tasks/Index.tsx b/Modules/TaskManagement/resources/js/Pages/Tasks/Index.tsx
index 7d1da40..22eb1e2 100644
--- a/Modules/TaskManagement/resources/js/Pages/Tasks/Index.tsx
+++ b/Modules/TaskManagement/resources/js/Pages/Tasks/Index.tsx
@@ -50,10 +50,11 @@ export default function Tasks({ project, employees, availableMaterials, delayRea
             labor_cost: task.labor_cost || '',
             equipment_cost: task.equipment_cost || '',
             estimated_hours: task.estimated_hours || '',
+            completion_percentage: task.completion_percentage ?? 0,
             start_date: task.start_date ? task.start_date.split('T')[0] : '',
             end_date: task.end_date ? task.end_date.split('T')[0] : '',
             milestone_id: task.milestone?.ulid || '',
-        });
+        } as any);
     };
 
     const handleEditTask = (e: FormEvent) => {
@@ -310,54 +311,28 @@ export default function Tasks({ project, employees, availableMaterials, delayRea
                                             <TableCell className="text-right">
                                                 <div className="flex items-center justify-end gap-1">
                                                     {can('edit', 'tasks') && (
-                                                        <>
+                                                        <div className="flex items-center gap-1 shrink-0 border-r pr-2 mr-1">
                                                             {task.status === 'pending' && (
-                                                                <>
-                                                                    <Button variant="ghost" size="icon-sm" title="Start" onClick={() => handleTaskTransition(task.ulid, 'in_progress')}>
-                                                                        <Play className="h-4 w-4 text-blue-500" />
-                                                                    </Button>
-                                                                    <Button variant="ghost" size="icon-sm" title="Block" onClick={() => handleTaskTransition(task.ulid, 'blocked')}>
-                                                                        <Ban className="h-4 w-4 text-red-500" />
-                                                                    </Button>
-                                                                </>
+                                                                <Button variant="outline" size="sm" className="h-7 text-xs bg-blue-50 text-blue-700 hover:bg-blue-100 border-blue-200" onClick={() => handleTaskTransition(task.ulid, 'in_progress')}>
+                                                                    <Play className="h-3 w-3 mr-1" /> Move to In Progress
+                                                                </Button>
                                                             )}
                                                             {task.status === 'in_progress' && (
-                                                                <>
-                                                                    <Button variant="ghost" size="icon-sm" title="Complete" onClick={() => handleTaskTransition(task.ulid, 'completed')}>
-                                                                        <CheckCircle2 className="h-4 w-4 text-green-500" />
-                                                                    </Button>
-                                                                    <Button variant="ghost" size="icon-sm" title="Block" onClick={() => handleTaskTransition(task.ulid, 'blocked')}>
-                                                                        <Ban className="h-4 w-4 text-red-500" />
-                                                                    </Button>
-                                                                    <Button variant="ghost" size="icon-sm" title="Reset to Pending" onClick={() => handleTaskTransition(task.ulid, 'pending')}>
-                                                                        <RotateCcw className="h-4 w-4 text-slate-500" />
-                                                                    </Button>
-                                                                </>
+                                                                <Button variant="outline" size="sm" className="h-7 text-xs bg-emerald-50 text-emerald-700 hover:bg-emerald-100 border-emerald-200" onClick={() => handleTaskTransition(task.ulid, 'completed')}>
+                                                                    <CheckCircle2 className="h-3 w-3 mr-1" /> Complete
+                                                                </Button>
                                                             )}
                                                             {task.status === 'completed' && (
-                                                                <>
-                                                                    <Button variant="ghost" size="icon-sm" title="Close Task" onClick={() => handleTaskTransition(task.ulid, 'closed')}>
-                                                                        <Lock className="h-4 w-4 text-orange-500" />
-                                                                    </Button>
-                                                                    <Button variant="ghost" size="icon-sm" title="Return to In Progress" onClick={() => handleTaskTransition(task.ulid, 'in_progress')}>
-                                                                        <Play className="h-4 w-4 text-blue-500" />
-                                                                    </Button>
-                                                                    <Button variant="ghost" size="icon-sm" title="Reset to Pending" onClick={() => handleTaskTransition(task.ulid, 'pending')}>
-                                                                        <RotateCcw className="h-4 w-4 text-slate-500" />
-                                                                    </Button>
-                                                                </>
+                                                                <Button variant="outline" size="sm" className="h-7 text-xs bg-orange-50 text-orange-700 hover:bg-orange-100 border-orange-200" onClick={() => handleTaskTransition(task.ulid, 'closed')}>
+                                                                    <Lock className="h-3 w-3 mr-1" /> Close
+                                                                </Button>
                                                             )}
                                                             {task.status === 'blocked' && (
-                                                                <>
-                                                                    <Button variant="ghost" size="icon-sm" title="Resume" onClick={() => handleTaskTransition(task.ulid, 'in_progress')}>
-                                                                        <Play className="h-4 w-4 text-blue-500" />
-                                                                    </Button>
-                                                                    <Button variant="ghost" size="icon-sm" title="Set to Pending" onClick={() => handleTaskTransition(task.ulid, 'pending')}>
-                                                                        <RotateCcw className="h-4 w-4 text-slate-500" />
-                                                                    </Button>
-                                                                </>
+                                                                <Button variant="outline" size="sm" className="h-7 text-xs bg-blue-50 text-blue-700 hover:bg-blue-100 border-blue-200" onClick={() => handleTaskTransition(task.ulid, 'in_progress')}>
+                                                                    <Play className="h-3 w-3 mr-1" /> Resume
+                                                                </Button>
                                                             )}
-                                                        </>
+                                                        </div>
                                                     )}
                                                     {can('edit', 'tasks') && (
                                                         <Button variant="ghost" size="icon-sm" title="Edit" onClick={() => openEditModal(task)}>
@@ -699,7 +674,7 @@ export default function Tasks({ project, employees, availableMaterials, delayRea
                                     <Input type="date" id="edit_end_date" value={editForm.data.end_date} onChange={(e) => editForm.setData('end_date', e.target.value)} />
                                 </FormField>
                             </div>
-                            <div className="grid grid-cols-3 gap-4">
+                            <div className="grid grid-cols-4 gap-4">
                                 <FormField label="Labor Cost" htmlFor="edit_labor_cost" error={editForm.errors.labor_cost}>
                                     <Input type="number" step="0.01" id="edit_labor_cost" value={editForm.data.labor_cost} onChange={(e) => editForm.setData('labor_cost', e.target.value)} />
                                 </FormField>
@@ -709,6 +684,9 @@ export default function Tasks({ project, employees, availableMaterials, delayRea
                                 <FormField label="Est. Hours" htmlFor="edit_estimated_hours" error={editForm.errors.estimated_hours}>
                                     <Input type="number" step="0.1" id="edit_estimated_hours" value={editForm.data.estimated_hours} onChange={(e) => editForm.setData('estimated_hours', e.target.value)} />
                                 </FormField>
+                                <FormField label="Progress %" htmlFor="edit_completion_percentage" error={(editForm.errors as any).completion_percentage}>
+                                    <Input type="number" min="0" max="100" id="edit_completion_percentage" value={(editForm.data as any).completion_percentage} onChange={(e) => editForm.setData('completion_percentage' as any, e.target.value)} />
+                                </FormField>
                             </div>
                             <FormField label="Milestone (Optional)" htmlFor="edit_milestone_id" error={editForm.errors.milestone_id}>
                                 <select
diff --git a/Modules/TaskManagement/tests/Feature/TaskStatusAndProgressTest.php b/Modules/TaskManagement/tests/Feature/TaskStatusAndProgressTest.php
new file mode 100644
index 0000000..285e96f
--- /dev/null
+++ b/Modules/TaskManagement/tests/Feature/TaskStatusAndProgressTest.php
@@ -0,0 +1,130 @@
+<?php
+
+namespace Modules\TaskManagement\Tests\Feature;
+
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Modules\ProjectManagement\Models\Project;
+use Modules\ProjectManagement\Models\ProjectMilestone;
+use Modules\ProjectManagement\Models\Task;
+use Spatie\Permission\Models\Role;
+use Tests\TestCase;
+
+class TaskStatusAndProgressTest extends TestCase
+{
+    use RefreshDatabase;
+
+    protected User $user;
+    protected Project $project;
+    protected ProjectMilestone $milestone;
+    protected Task $task;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        Role::firstOrCreate(['name' => 'Project Manager']);
+
+        $this->user = User::factory()->create(['user_type' => 'admin']);
+        $this->user->assignRole('Project Manager');
+
+        $this->project = Project::factory()->create([
+            'completion_percentage' => 0,
+        ]);
+
+        $this->milestone = ProjectMilestone::create([
+            'project_id' => $this->project->id,
+            'name' => 'Structural Works',
+            'weight_percentage' => 100,
+            'sort_order' => 1,
+        ]);
+
+        $this->task = Task::factory()->create([
+            'project_id' => $this->project->id,
+            'milestone_id' => $this->milestone->id,
+            'status' => 'pending',
+            'completion_percentage' => 0,
+            'sort_order' => 0,
+        ]);
+    }
+
+    /** @test */
+    public function reordering_task_to_completed_column_updates_status_and_project_completion()
+    {
+        $response = $this->actingAs($this->user)
+            ->post(route('projects.tasks.reorder'), [
+                'tasks' => [
+                    [
+                        'ulid' => $this->task->ulid,
+                        'status' => 'completed',
+                        'sort_order' => 0,
+                    ]
+                ]
+            ]);
+
+        $response->assertSessionHasNoErrors();
+
+        $this->assertDatabaseHas('tasks', [
+            'id' => $this->task->id,
+            'status' => 'completed',
+            'completion_percentage' => 100,
+        ]);
+    }
+
+    /** @test */
+    public function reordering_task_to_in_progress_column_updates_status_and_completion()
+    {
+        $response = $this->actingAs($this->user)
+            ->post(route('projects.tasks.reorder'), [
+                'tasks' => [
+                    [
+                        'ulid' => $this->task->ulid,
+                        'status' => 'in_progress',
+                        'sort_order' => 0,
+                    ]
+                ]
+            ]);
+
+        $response->assertSessionHasNoErrors();
+
+        $this->assertDatabaseHas('tasks', [
+            'id' => $this->task->id,
+            'status' => 'in_progress',
+        ]);
+    }
+
+    /** @test */
+    public function updating_task_progress_percentage_syncs_status_and_project_completion()
+    {
+        $response = $this->actingAs($this->user)
+            ->put(route('projects.tasks.update', $this->task->ulid), [
+                'name' => 'Updated Task Name',
+                'completion_percentage' => 100,
+            ]);
+
+        $response->assertSessionHasNoErrors();
+
+        $this->assertDatabaseHas('tasks', [
+            'id' => $this->task->id,
+            'status' => 'completed',
+            'completion_percentage' => 100,
+        ]);
+    }
+
+    /** @test */
+    public function status_transition_endpoint_updates_task_status_and_completion()
+    {
+        $response = $this->actingAs($this->user)
+            ->patch(route('projects.tasks.transition', $this->task->ulid), [
+                'status' => 'in_progress',
+            ]);
+
+        $response->assertSessionHasNoErrors();
+
+        $this->assertDatabaseHas('tasks', [
+            'id' => $this->task->id,
+            'status' => 'in_progress',
+            'completion_percentage' => 50,
+        ]);
+    }
+}
diff --git a/Modules/UserManagement/app/Http/Controllers/UserController.php b/Modules/UserManagement/app/Http/Controllers/UserController.php
index c043178..4f49bad 100644
--- a/Modules/UserManagement/app/Http/Controllers/UserController.php
+++ b/Modules/UserManagement/app/Http/Controllers/UserController.php
@@ -97,7 +97,7 @@ class UserController extends Controller
             'company_name'     => ['nullable', 'string', 'max:255'],
             'contact_person'   => ['nullable', 'string', 'max:255'],
             'tin_number'       => ['nullable', 'string', 'max:255'],
-            'spatie_role'      => ['nullable', 'string', Rule::in(['Super Admin', 'Contractor', 'Project Manager', 'Designer', 'Site Technical', 'Construction Supervisor'])],
+            'spatie_role'      => ['nullable', 'string', Rule::in(['Super Admin', 'admin', 'Contractor', 'Contractor Admin', 'Project Manager', 'Designer', 'Site Technical', 'Construction Supervisor'])],
         ]);
 
         // Resolve contractor_id: contractor admins always use their own;
@@ -123,12 +123,16 @@ class UserController extends Controller
 
         // Determine Spatie role to assign
         $roleToAssign = $validated['spatie_role'] ?? $validated['user_type'];
-        if ($roleToAssign === 'admin') {
-            $roleToAssign = 'Super Admin';
+        if ($roleToAssign === 'Contractor Admin') {
+            $roleToAssign = 'Contractor';
+        } elseif ($roleToAssign === 'admin') {
+            $roleToAssign = 'Main Contractor Admin';
         }
 
         // Explicitly assign the spatie role matching the user type or selected role
-        $user->assignRole($roleToAssign);
+        if ($roleToAssign) {
+            $user->assignRole($roleToAssign);
+        }
 
         // Create profile
         $this->createProfile($user, $validated);
diff --git a/Modules/UserManagement/resources/js/Pages/Users/Create.tsx b/Modules/UserManagement/resources/js/Pages/Users/Create.tsx
index 796e512..596dfe3 100644
--- a/Modules/UserManagement/resources/js/Pages/Users/Create.tsx
+++ b/Modules/UserManagement/resources/js/Pages/Users/Create.tsx
@@ -46,7 +46,7 @@ export default function Create({ contractors, isSuperAdmin, nextEmployeeCode }:
         company_name: '',
         contact_person: '',
         tin_number: '',
-        spatie_role: 'Project Manager',
+        spatie_role: '',
     });
 
     const [generatedPassword, setGeneratedPassword] = useState('');
@@ -211,8 +211,8 @@ export default function Create({ contractors, isSuperAdmin, nextEmployeeCode }:
                                             onValueChange={(v) => {
                                                 if (v) {
                                                     let targetType = 'employee';
-                                                    if (v === 'Super Admin') targetType = 'admin';
-                                                    if (v === 'Contractor') targetType = 'contractor';
+                                                    if (v === 'Super Admin' || v === 'admin') targetType = 'admin';
+                                                    if (v === 'Contractor Admin' || v === 'Contractor') targetType = 'contractor';
 
                                                     setData(d => ({
                                                         ...d,
@@ -226,14 +226,10 @@ export default function Create({ contractors, isSuperAdmin, nextEmployeeCode }:
                                                 <SelectValue placeholder="Select a role" />
                                             </SelectTrigger>
                                             <SelectContent>
-                                                {isSuperAdmin && (
-                                                    <SelectItem value="Super Admin">Super Admin</SelectItem>
-                                                )}
-                                                <SelectItem value="Contractor">Contractor (Contractor Admin)</SelectItem>
                                                 <SelectItem value="Project Manager">Project Manager</SelectItem>
-                                                <SelectItem value="Designer">Designer</SelectItem>
-                                                <SelectItem value="Site Technical">Site Technical</SelectItem>
+                                                <SelectItem value="Contractor Admin">Contractor Admin</SelectItem>
                                                 <SelectItem value="Construction Supervisor">Construction Supervisor</SelectItem>
+                                                <SelectItem value="Site Technical">Site Technical</SelectItem>
                                             </SelectContent>
                                         </Select>
                                         {/* @ts-ignore */}
diff --git a/Modules/UserManagement/resources/js/Pages/Users/Index.tsx b/Modules/UserManagement/resources/js/Pages/Users/Index.tsx
index 195722b..984fe1b 100644
--- a/Modules/UserManagement/resources/js/Pages/Users/Index.tsx
+++ b/Modules/UserManagement/resources/js/Pages/Users/Index.tsx
@@ -36,6 +36,7 @@ const typeLabel = (type: string) => {
     switch (type) {
         case 'admin': return 'Admin';
         case 'employee': return 'Employee';
+        case 'contractor': return 'Contractor';
         case 'customer': return 'Customer';
         default: return type;
     }
@@ -101,6 +102,7 @@ export default function Index({ users, filters }: Props) {
                                             <SelectItem value="all">All Types</SelectItem>
                                             <SelectItem value="admin">Admin</SelectItem>
                                             <SelectItem value="employee">Employee</SelectItem>
+                                            <SelectItem value="contractor">Contractor</SelectItem>
                                             <SelectItem value="customer">Customer</SelectItem>
                                         </SelectContent>
                                     </Select>
diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php
index 631925f..9ef1144 100644
--- a/app/Http/Controllers/DashboardController.php
+++ b/app/Http/Controllers/DashboardController.php
@@ -52,6 +52,10 @@ class DashboardController extends Controller
         // Fetch Resources
         $resources = $this->getResourcesData($selectedProject);
 
+        // Fetch Role-Tailored DB Analytics
+        $user = Auth::user();
+        $roleAnalytics = $this->getRoleAnalyticsData($user, $selectedProject);
+
         return Inertia::render('Dashboard', [
             'projects' => $projects,
             'selectedProject' => $selectedProject ? [
@@ -66,6 +70,7 @@ class DashboardController extends Controller
             'activities' => $activities,
             'blockers' => $blockers,
             'resources' => $resources,
+            'roleAnalytics' => $roleAnalytics,
         ]);
     }
 
@@ -355,4 +360,89 @@ class DashboardController extends Controller
             ]
         ];
     }
+
+    /**
+     * Compute role-tailored analytics metrics from database tables.
+     */
+    private function getRoleAnalyticsData(?\App\Models\User $user, ?Project $project): array
+    {
+        $roleName = $user ? ($user->roles->first()?->name ?? 'User') : 'User';
+        $userType = $user->user_type ?? 'employee';
+
+        $pQuery = function ($query) use ($project) {
+            if ($project) {
+                $query->where('project_id', $project->id);
+            }
+        };
+
+        // 1. Executive / Super Admin / Admin Analytics
+        $invoicesQuery = \Modules\FinancialManagement\Models\FinancialInvoice::query();
+        if ($project) {
+            $invoicesQuery->where('project_id', $project->id);
+        }
+        $totalBilled = (float) $invoicesQuery->sum('subtotal');
+        $totalPaid = (float) $invoicesQuery->sum('paid_amount');
+        $totalRetention = (float) $invoicesQuery->sum('retention_amount');
+
+        $pendingApprovalsCount = \Modules\ApprovalWorkflow\Models\ApprovalChain::where('status', 'in_review')->count();
+        $totalProjectsCount = Project::count();
+        $activeProjectsCount = Project::where('status', 'active')->count();
+
+        // 2. PM Milestone & Progress Analytics
+        $milestonesQuery = \Modules\TimelineScheduling\Models\Milestone::query();
+        if ($project) {
+            $milestonesQuery->where('project_id', $project->id);
+        }
+        $totalMilestones = $milestonesQuery->count();
+        $completedMilestones = (clone $milestonesQuery)->where('status', 'completed')->count();
+        $inProgressMilestones = (clone $milestonesQuery)->where('status', 'in_progress')->count();
+
+        // 3. Subcontractor / Bidding Analytics
+        $bidsQuery = \Modules\BiddingManagement\Models\BidPackage::query();
+        if ($project) {
+            $bidsQuery->where('project_id', $project->id);
+        }
+        $activeBids = $bidsQuery->count();
+        $openInvitations = \Modules\BiddingManagement\Models\BidInvitation::where('status', 'sent')->count();
+
+        // 4. Warehouse & Technical Inventory
+        $totalItems = \Modules\MasterData\Models\Material::count();
+        $totalWarehouses = \Modules\MaterialLogistics\Models\Warehouse::count();
+        $totalDocuments = \Modules\DocumentManagement\Models\Document::count();
+        $pendingCashAdvances = \Modules\FinancialManagement\Models\CashAdvance::where('status', 'pending')->count();
+
+        return [
+            'role' => $roleName,
+            'user_type' => $userType,
+            'financials' => [
+                'total_billed' => $totalBilled,
+                'total_paid' => $totalPaid,
+                'total_retention' => $totalRetention,
+                'outstanding_balance' => max(0, $totalBilled - $totalPaid),
+            ],
+            'projects' => [
+                'total' => $totalProjectsCount,
+                'active' => $activeProjectsCount,
+            ],
+            'approvals' => [
+                'pending' => $pendingApprovalsCount,
+            ],
+            'milestones' => [
+                'total' => $totalMilestones,
+                'completed' => $completedMilestones,
+                'in_progress' => $inProgressMilestones,
+                'completion_rate' => $totalMilestones > 0 ? round(($completedMilestones / $totalMilestones) * 100, 1) : 0,
+            ],
+            'bidding' => [
+                'active_packages' => $activeBids,
+                'open_invitations' => $openInvitations,
+            ],
+            'logistics' => [
+                'catalog_items' => $totalItems,
+                'warehouses' => $totalWarehouses,
+                'documents' => $totalDocuments,
+                'pending_cash_advances' => $pendingCashAdvances,
+            ],
+        ];
+    }
 }
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index c48fba0..33501fb 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -25,9 +25,15 @@ class AppServiceProvider extends ServiceProvider
         Vite::prefetch(concurrency: 3);
         User::observe(UserObserver::class);
 
-        // Implicitly grant all permissions to Super Admins
+        // Implicitly grant all permissions to Super Admins and System Admins
         \Illuminate\Support\Facades\Gate::before(function ($user, $ability) {
-            return $user->hasRole('Super Admin') ? true : null;
+            if ($user->user_type === 'admin' || 
+                $user->hasRole('Super Admin') || 
+                $user->hasRole('admin') || 
+                $user->hasRole('Main Contractor Admin')) {
+                return true;
+            }
+            return null;
         });
     }
 }
diff --git a/assign_admin_role.php b/assign_admin_role.php
new file mode 100644
index 0000000..e5787c9
--- /dev/null
+++ b/assign_admin_role.php
@@ -0,0 +1,15 @@
+<?php
+
+require __DIR__ . '/vendor/autoload.php';
+$app = require_once __DIR__ . '/bootstrap/app.php';
+$kernel = $app->make(Illuminate\Contracts\Console\Kernel::class);
+$kernel->bootstrap();
+
+$u = \App\Models\User::where('email', 'admin@example.com')->first();
+if ($u) {
+    $role = \Spatie\Permission\Models\Role::firstOrCreate(['name' => 'admin']);
+    $u->assignRole($role);
+    echo "Assigned 'admin' role to admin@example.com successfully!" . PHP_EOL;
+} else {
+    echo "User admin@example.com not found." . PHP_EOL;
+}
diff --git a/check_db.php b/check_db.php
new file mode 100644
index 0000000..82d7e74
--- /dev/null
+++ b/check_db.php
@@ -0,0 +1,19 @@
+<?php
+
+require __DIR__ . '/vendor/autoload.php';
+$app = require_once __DIR__ . '/bootstrap/app.php';
+$kernel = $app->make(Illuminate\Contracts\Console\Kernel::class);
+$kernel->bootstrap();
+
+echo "--- CONTRACTORS ---" . PHP_EOL;
+$contractors = \Modules\ContractorManagement\Models\Contractor::all();
+foreach ($contractors as $c) {
+    echo "ID: {$c->id} | Company: {$c->company_name} | Email: {$c->email}" . PHP_EOL;
+}
+
+echo PHP_EOL . "--- USERS ---" . PHP_EOL;
+$users = \App\Models\User::with('roles')->get();
+foreach ($users as $u) {
+    $roles = $u->roles->pluck('name')->implode(', ');
+    echo "ID: {$u->id} | Name: {$u->name} | Email: {$u->email} | Type: {$u->user_type} | Role: {$roles} | Contractor ID: {$u->contractor_id}" . PHP_EOL;
+}
diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
index b2169c2..e2d3168 100644
--- a/database/seeders/DatabaseSeeder.php
+++ b/database/seeders/DatabaseSeeder.php
@@ -25,6 +25,7 @@ class DatabaseSeeder extends Seeder
             \Modules\Labors\Database\Seeders\LaborsDatabaseSeeder::class,
             \Modules\Equipments\Database\Seeders\EquipmentsDatabaseSeeder::class,
             \Modules\MaterialLogistics\Database\Seeders\ConstructionMaterialsSeeder::class,
+            \Modules\DocumentManagement\Database\Seeders\DocumentCategorySeeder::class,
         ]);
     }
 }
diff --git a/package-lock.json b/package-lock.json
index 1b2319c..df871c7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
 {
-    "name": "gsb",
+    "name": "GSB-Construction",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
@@ -67,7 +67,6 @@
             "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.7.tgz",
             "integrity": "sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "@babel/code-frame": "^7.29.7",
                 "@babel/generator": "^7.29.7",
@@ -1479,7 +1478,6 @@
             "resolved": "https://registry.npmjs.org/@noble/ciphers/-/ciphers-1.3.0.tgz",
             "integrity": "sha512-2I0gnIVPtfnMw9ee9h1dJG7tp81+8Ob3OJb3Mv37rx5L40/b0i7djjCVvGOVqc9AEIQyvyu1i6ypKdFw8R8gQw==",
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": "^14.21.3 || >=16"
             },
@@ -2604,7 +2602,6 @@
             "integrity": "sha512-GRaXQx6jGfL8sKfaIDD6OupbIHBr9jv7Jnaml9tB7l4v068PAOXqfcujMMo5PhbIs6ggR1XODELqahT2R8v0fg==",
             "devOptional": true,
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "undici-types": "~5.26.4"
             }
@@ -2622,7 +2619,6 @@
             "integrity": "sha512-z9VXpC7MWrhfWipitjNdgCauoMLRdIILQsAEV+ZesIzBq/oUlxk0m3ApZuMFCXdnS4U7KrI+l3WRUEGQ8K1QKw==",
             "devOptional": true,
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "@types/prop-types": "*",
                 "csstype": "^3.2.2"
@@ -3010,7 +3006,6 @@
                 }
             ],
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "baseline-browser-mapping": "^2.9.0",
                 "caniuse-lite": "^1.0.30001759",
@@ -4375,7 +4370,6 @@
             "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.32.tgz",
             "integrity": "sha512-XcuyW9qE2kJn07PkecMOBd5Vq/hMy7mmGw+idz1yblbg9N17ijJODrvPkn7/dwL3Kulj8LcRJ69DLOWf91dRUg==",
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">=16.9.0"
             }
@@ -5816,7 +5810,6 @@
                 }
             ],
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "nanoid": "^3.3.16",
                 "picocolors": "^1.1.1",
@@ -5989,7 +5982,6 @@
             "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
             "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "loose-envify": "^1.1.0"
             },
@@ -6002,7 +5994,6 @@
             "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
             "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "loose-envify": "^1.1.0",
                 "scheduler": "^0.23.2"
@@ -6085,8 +6076,7 @@
             "version": "5.0.1",
             "resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz",
             "integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w==",
-            "license": "MIT",
-            "peer": true
+            "license": "MIT"
         },
         "node_modules/require-directory": {
             "version": "2.1.1",
@@ -6706,8 +6696,7 @@
             "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.2.2.tgz",
             "integrity": "sha512-KWBIxs1Xb6NoLdMVqhbhgwZf2PGBpPEiwOqgI4pFIYbNTfBXiKYyWoTsXgBQ9WFg/OlhnvHaY+AEpW7wSmFo2Q==",
             "dev": true,
-            "license": "MIT",
-            "peer": true
+            "license": "MIT"
         },
         "node_modules/tapable": {
             "version": "2.3.2",
@@ -6932,7 +6921,6 @@
             "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
             "devOptional": true,
             "license": "Apache-2.0",
-            "peer": true,
             "bin": {
                 "tsc": "bin/tsc",
                 "tsserver": "bin/tsserver"
@@ -7056,7 +7044,6 @@
             "integrity": "sha512-NTKlcQjlAK7MlQoyb6LgaqHc8sso/pVyUJYWMws3jg21uTJw/LddqIFPcPqP6PzpgbIcZyKI85sFE4HBrQDA8A==",
             "dev": true,
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "esbuild": "^0.25.0",
                 "fdir": "^6.4.4",
@@ -7299,7 +7286,6 @@
             "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz",
             "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==",
             "license": "MIT",
-            "peer": true,
             "funding": {
                 "url": "https://github.com/sponsors/colinhacks"
             }
diff --git a/resources/js/Components/AppSidebar.tsx b/resources/js/Components/AppSidebar.tsx
index a4426df..9edefa3 100644
--- a/resources/js/Components/AppSidebar.tsx
+++ b/resources/js/Components/AppSidebar.tsx
@@ -155,8 +155,13 @@ export default function AppSidebar() {
             <SidebarContent>
                 {navigationConfig.map(group => {
                     const filteredItems = group.items.map(item => {
-                        const hasParentAccess = auth.roles.includes('Super Admin') || 
-                                                auth.roles.includes('admin') || 
+                        const isAdminUser = auth.user.user_type === 'admin' || 
+                                            auth.roles.includes('Super Admin') || 
+                                            auth.roles.includes('admin') || 
+                                            auth.roles.includes('Project Manager') || 
+                                            auth.roles.includes('Main Contractor Admin');
+
+                        const hasParentAccess = isAdminUser || 
                                                 !item.permissions || 
                                                 item.permissions.length === 0 || 
                                                 item.permissions.some(p => auth.permissions.includes(p));
@@ -165,7 +170,7 @@ export default function AppSidebar() {
 
                         if (item.children && item.children.length > 0) {
                             const filteredChildren = item.children.filter(child => {
-                                if (auth.roles.includes('Super Admin') || auth.roles.includes('admin')) return true;
+                                if (isAdminUser) return true;
                                 if (!child.permissions || child.permissions.length === 0) return true;
                                 return child.permissions.some(p => auth.permissions.includes(p));
                             });
diff --git a/resources/js/Components/Dashboard/RoleAnalyticsBanner.tsx b/resources/js/Components/Dashboard/RoleAnalyticsBanner.tsx
new file mode 100644
index 0000000..69ba27f
--- /dev/null
+++ b/resources/js/Components/Dashboard/RoleAnalyticsBanner.tsx
@@ -0,0 +1,320 @@
+import React from 'react';
+import { Card, CardContent } from '@/Components/ui/card';
+import { Link } from '@inertiajs/react';
+import { 
+    DollarSign, 
+    CheckCircle2, 
+    FileText, 
+    Briefcase, 
+    HardHat, 
+    Wrench, 
+    Clock, 
+    Layers, 
+    TrendingUp
+} from 'lucide-react';
+
+interface RoleAnalyticsProps {
+    analytics: {
+        role: string;
+        user_type: string;
+        financials: {
+            total_billed: number;
+            total_paid: number;
+            total_retention: number;
+            outstanding_balance: number;
+        };
+        projects: {
+            total: number;
+            active: number;
+        };
+        approvals: {
+            pending: number;
+        };
+        milestones: {
+            total: number;
+            completed: number;
+            in_progress: number;
+            completion_rate: number;
+        };
+        bidding: {
+            active_packages: number;
+            open_invitations: number;
+        };
+        logistics: {
+            catalog_items: number;
+            warehouses: number;
+            documents: number;
+            pending_cash_advances: number;
+        };
+    };
+}
+
+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 isSupervisor = role.includes('supervisor');
+
+    const formatCurrency = (amount: number) => {
+        return new Intl.NumberFormat('en-US', {
+            style: 'currency',
+            currency: 'USD',
+            maximumFractionDigits: 0,
+        }).format(amount || 0);
+    };
+
+    return (
+        <div className="mb-8">
+            <div className="flex items-center justify-between mb-4">
+                <div>
+                    <h3 className="text-lg font-bold text-gray-900 dark:text-white flex items-center gap-2">
+                        <TrendingUp className="w-5 h-5 text-indigo-600 dark:text-indigo-400" />
+                        Role Analytics Focus: <span className="text-indigo-600 dark:text-indigo-400">{analytics?.role || 'User'}</span>
+                    </h3>
+                    <p className="text-xs text-gray-500 font-medium mt-0.5">
+                        Live analytics tailored to your role scope & system permissions
+                    </p>
+                </div>
+            </div>
+
+            {/* 1. Super Admin / Executive KPIs */}
+            {isExecutive && (
+                <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4">
+                    <Link href="/finance" className="block transition-transform hover:-translate-y-1">
+                        <Card className="bg-gradient-to-br from-indigo-900 via-indigo-950 to-slate-900 text-white shadow-md border-0 hover:shadow-indigo-500/20">
+                            <CardContent className="p-5 flex items-center justify-between">
+                                <div>
+                                    <p className="text-xs font-semibold uppercase tracking-wider text-indigo-200">Total Billed</p>
+                                    <h4 className="text-2xl font-black mt-1">{formatCurrency(analytics?.financials?.total_billed || 0)}</h4>
+                                    <p className="text-xs text-indigo-300 mt-1">Paid: {formatCurrency(analytics?.financials?.total_paid || 0)}</p>
+                                </div>
+                                <div className="p-3 bg-indigo-800/50 rounded-xl text-indigo-300">
+                                    <DollarSign className="w-6 h-6" />
+                                </div>
+                            </CardContent>
+                        </Card>
+                    </Link>
+
+                    <Link href="/retention" className="block transition-transform hover:-translate-y-1">
+                        <Card className="bg-gradient-to-br from-emerald-900 via-emerald-950 to-slate-900 text-white shadow-md border-0 hover:shadow-emerald-500/20">
+                            <CardContent className="p-5 flex items-center justify-between">
+                                <div>
+                                    <p className="text-xs font-semibold uppercase tracking-wider text-emerald-200">Total Retention</p>
+                                    <h4 className="text-2xl font-black mt-1">{formatCurrency(analytics?.financials?.total_retention || 0)}</h4>
+                                    <p className="text-xs text-emerald-300 mt-1">Withheld in project ledger</p>
+                                </div>
+                                <div className="p-3 bg-emerald-800/50 rounded-xl text-emerald-300">
+                                    <Layers className="w-6 h-6" />
+                                </div>
+                            </CardContent>
+                        </Card>
+                    </Link>
+
+                    <Link href="/approvals" className="block transition-transform hover:-translate-y-1">
+                        <Card className="bg-gradient-to-br from-amber-900 via-amber-950 to-slate-900 text-white shadow-md border-0 hover:shadow-amber-500/20">
+                            <CardContent className="p-5 flex items-center justify-between">
+                                <div>
+                                    <p className="text-xs font-semibold uppercase tracking-wider text-amber-200">Pending Approvals</p>
+                                    <h4 className="text-2xl font-black mt-1">{analytics?.approvals?.pending || 0} Items</h4>
+                                    <span className="text-xs text-amber-300 font-medium mt-1 inline-block">
+                                        Review Awaiting Invoices &rarr;
+                                    </span>
+                                </div>
+                                <div className="p-3 bg-amber-800/50 rounded-xl text-amber-300">
+                                    <CheckCircle2 className="w-6 h-6" />
+                                </div>
+                            </CardContent>
+                        </Card>
+                    </Link>
+
+                    <Link href="/projects" className="block transition-transform hover:-translate-y-1">
+                        <Card className="bg-gradient-to-br from-blue-900 via-blue-950 to-slate-900 text-white shadow-md border-0 hover:shadow-blue-500/20">
+                            <CardContent className="p-5 flex items-center justify-between">
+                                <div>
+                                    <p className="text-xs font-semibold uppercase tracking-wider text-blue-200">Active Portfolio</p>
+                                    <h4 className="text-2xl font-black mt-1">{analytics?.projects?.active || 0} / {analytics?.projects?.total || 0}</h4>
+                                    <p className="text-xs text-blue-300 mt-1">Projects in execution</p>
+                                </div>
+                                <div className="p-3 bg-blue-800/50 rounded-xl text-blue-300">
+                                    <Briefcase className="w-6 h-6" />
+                                </div>
+                            </CardContent>
+                        </Card>
+                    </Link>
+                </div>
+            )}
+
+            {/* 2. Project Manager KPIs */}
+            {isPM && (
+                <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4">
+                    <Card className="bg-gradient-to-br from-blue-900 to-indigo-950 text-white shadow-md border-0">
+                        <CardContent className="p-5 flex items-center justify-between">
+                            <div>
+                                <p className="text-xs font-semibold uppercase tracking-wider text-blue-200">Milestone Progress</p>
+                                <h4 className="text-2xl font-black mt-1">{analytics?.milestones?.completion_rate || 0}%</h4>
+                                <p className="text-xs text-blue-300 mt-1">{analytics?.milestones?.completed || 0} completed of {analytics?.milestones?.total || 0}</p>
+                            </div>
+                            <div className="p-3 bg-blue-800/50 rounded-xl text-blue-300">
+                                <CheckCircle2 className="w-6 h-6" />
+                            </div>
+                        </CardContent>
+                    </Card>
+
+                    <Card className="bg-gradient-to-br from-purple-900 to-slate-900 text-white shadow-md border-0">
+                        <CardContent className="p-5 flex items-center justify-between">
+                            <div>
+                                <p className="text-xs font-semibold uppercase tracking-wider text-purple-200">Billed Progress</p>
+                                <h4 className="text-2xl font-black mt-1">{formatCurrency(analytics?.financials?.total_billed || 0)}</h4>
+                                <p className="text-xs text-purple-300 mt-1">Outstanding: {formatCurrency(analytics?.financials?.outstanding_balance || 0)}</p>
+                            </div>
+                            <div className="p-3 bg-purple-800/50 rounded-xl text-purple-300">
+                                <DollarSign className="w-6 h-6" />
+                            </div>
+                        </CardContent>
+                    </Card>
+
+                    <Card className="bg-gradient-to-br from-amber-900 to-slate-900 text-white shadow-md border-0">
+                        <CardContent className="p-5 flex items-center justify-between">
+                            <div>
+                                <p className="text-xs font-semibold uppercase tracking-wider text-amber-200">Submissions Pending</p>
+                                <h4 className="text-2xl font-black mt-1">{analytics?.approvals?.pending || 0} Approvals</h4>
+                                <p className="text-xs text-amber-300 mt-1">Awaiting higher-up action</p>
+                            </div>
+                            <div className="p-3 bg-amber-800/50 rounded-xl text-amber-300">
+                                <Clock className="w-6 h-6" />
+                            </div>
+                        </CardContent>
+                    </Card>
+
+                    <Card className="bg-gradient-to-br from-teal-900 to-slate-900 text-white shadow-md border-0">
+                        <CardContent className="p-5 flex items-center justify-between">
+                            <div>
+                                <p className="text-xs font-semibold uppercase tracking-wider text-teal-200">Materials & Stock</p>
+                                <h4 className="text-2xl font-black mt-1">{analytics?.logistics?.catalog_items || 0} Items</h4>
+                                <p className="text-xs text-teal-300 mt-1">{analytics?.logistics?.warehouses || 0} active warehouses</p>
+                            </div>
+                            <div className="p-3 bg-teal-800/50 rounded-xl text-teal-300">
+                                <Layers className="w-6 h-6" />
+                            </div>
+                        </CardContent>
+                    </Card>
+                </div>
+            )}
+
+            {/* 3. Contractor Admin KPIs */}
+            {isContractor && (
+                <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4">
+                    <Card className="bg-gradient-to-br from-indigo-900 to-slate-900 text-white shadow-md border-0">
+                        <CardContent className="p-5 flex items-center justify-between">
+                            <div>
+                                <p className="text-xs font-semibold uppercase tracking-wider text-indigo-200">Bidding Invitations</p>
+                                <h4 className="text-2xl font-black mt-1">{analytics?.bidding?.open_invitations || 0} Active</h4>
+                                <p className="text-xs text-indigo-300 mt-1">{analytics?.bidding?.active_packages || 0} packages available</p>
+                            </div>
+                            <div className="p-3 bg-indigo-800/50 rounded-xl text-indigo-300">
+                                <FileText className="w-6 h-6" />
+                            </div>
+                        </CardContent>
+                    </Card>
+
+                    <Card className="bg-gradient-to-br from-emerald-900 to-slate-900 text-white shadow-md border-0">
+                        <CardContent className="p-5 flex items-center justify-between">
+                            <div>
+                                <p className="text-xs font-semibold uppercase tracking-wider text-emerald-200">Submitted Invoices</p>
+                                <h4 className="text-2xl font-black mt-1">{formatCurrency(analytics?.financials?.total_billed || 0)}</h4>
+                                <p className="text-xs text-emerald-300 mt-1">Paid: {formatCurrency(analytics?.financials?.total_paid || 0)}</p>
+                            </div>
+                            <div className="p-3 bg-emerald-800/50 rounded-xl text-emerald-300">
+                                <DollarSign className="w-6 h-6" />
+                            </div>
+                        </CardContent>
+                    </Card>
+
+                    <Card className="bg-gradient-to-br from-amber-900 to-slate-900 text-white shadow-md border-0">
+                        <CardContent className="p-5 flex items-center justify-between">
+                            <div>
+                                <p className="text-xs font-semibold uppercase tracking-wider text-amber-200">Retention Amount</p>
+                                <h4 className="text-2xl font-black mt-1">{formatCurrency(analytics?.financials?.total_retention || 0)}</h4>
+                                <p className="text-xs text-amber-300 mt-1">Held until project completion</p>
+                            </div>
+                            <div className="p-3 bg-amber-800/50 rounded-xl text-amber-300">
+                                <Layers className="w-6 h-6" />
+                            </div>
+                        </CardContent>
+                    </Card>
+
+                    <Card className="bg-gradient-to-br from-sky-900 to-slate-900 text-white shadow-md border-0">
+                        <CardContent className="p-5 flex items-center justify-between">
+                            <div>
+                                <p className="text-xs font-semibold uppercase tracking-wider text-sky-200">Documents Hub</p>
+                                <h4 className="text-2xl font-black mt-1">{analytics?.logistics?.documents || 0} Shared</h4>
+                                <p className="text-xs text-sky-300 mt-1">Contracts & Transmittals</p>
+                            </div>
+                            <div className="p-3 bg-sky-800/50 rounded-xl text-sky-300">
+                                <FileText className="w-6 h-6" />
+                            </div>
+                        </CardContent>
+                    </Card>
+                </div>
+            )}
+
+            {/* 4. Construction Supervisor & Site Tech KPIs */}
+            {(isSupervisor || (!isExecutive && !isPM && !isContractor)) && (
+                <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4">
+                    <Card className="bg-gradient-to-br from-orange-900 to-slate-900 text-white shadow-md border-0">
+                        <CardContent className="p-5 flex items-center justify-between">
+                            <div>
+                                <p className="text-xs font-semibold uppercase tracking-wider text-orange-200">Site Operations</p>
+                                <h4 className="text-2xl font-black mt-1">{analytics?.projects?.active || 0} Projects</h4>
+                                <p className="text-xs text-orange-300 mt-1">Active site execution</p>
+                            </div>
+                            <div className="p-3 bg-orange-800/50 rounded-xl text-orange-300">
+                                <HardHat className="w-6 h-6" />
+                            </div>
+                        </CardContent>
+                    </Card>
+
+                    <Card className="bg-gradient-to-br from-amber-900 to-slate-900 text-white shadow-md border-0">
+                        <CardContent className="p-5 flex items-center justify-between">
+                            <div>
+                                <p className="text-xs font-semibold uppercase tracking-wider text-amber-200">Cash Advances</p>
+                                <h4 className="text-2xl font-black mt-1">{analytics?.logistics?.pending_cash_advances || 0} Pending</h4>
+                                <p className="text-xs text-amber-300 mt-1">Petty cash requests</p>
+                            </div>
+                            <div className="p-3 bg-amber-800/50 rounded-xl text-amber-300">
+                                <Clock className="w-6 h-6" />
+                            </div>
+                        </CardContent>
+                    </Card>
+
+                    <Card className="bg-gradient-to-br from-cyan-900 to-slate-900 text-white shadow-md border-0">
+                        <CardContent className="p-5 flex items-center justify-between">
+                            <div>
+                                <p className="text-xs font-semibold uppercase tracking-wider text-cyan-200">Warehouse Inventory</p>
+                                <h4 className="text-2xl font-black mt-1">{analytics?.logistics?.catalog_items || 0} Materials</h4>
+                                <p className="text-xs text-cyan-300 mt-1">{analytics?.logistics?.warehouses || 0} active depots</p>
+                            </div>
+                            <div className="p-3 bg-cyan-800/50 rounded-xl text-cyan-300">
+                                <Wrench className="w-6 h-6" />
+                            </div>
+                        </CardContent>
+                    </Card>
+
+                    <Card className="bg-gradient-to-br from-slate-800 to-slate-900 text-white shadow-md border-0">
+                        <CardContent className="p-5 flex items-center justify-between">
+                            <div>
+                                <p className="text-xs font-semibold uppercase tracking-wider text-slate-300">Technical Docs</p>
+                                <h4 className="text-2xl font-black mt-1">{analytics?.logistics?.documents || 0} Drawings</h4>
+                                <p className="text-xs text-slate-400 mt-1">Approved & uploaded</p>
+                            </div>
+                            <div className="p-3 bg-slate-700/50 rounded-xl text-slate-300">
+                                <FileText className="w-6 h-6" />
+                            </div>
+                        </CardContent>
+                    </Card>
+                </div>
+            )}
+        </div>
+    );
+}
diff --git a/resources/js/Pages/Dashboard.tsx b/resources/js/Pages/Dashboard.tsx
index 4211b1d..978c8f1 100644
--- a/resources/js/Pages/Dashboard.tsx
+++ b/resources/js/Pages/Dashboard.tsx
@@ -4,6 +4,7 @@ import WeatherWidget from '@/Components/Dashboard/WeatherWidget';
 import ActivityFeed from '@/Components/Dashboard/ActivityFeed';
 import BlockerList from '@/Components/Dashboard/BlockerList';
 import ResourceSummary from '@/Components/Dashboard/ResourceSummary';
+import RoleAnalyticsBanner from '@/Components/Dashboard/RoleAnalyticsBanner';
 
 interface Project {
     id: number;
@@ -20,6 +21,7 @@ interface DashboardProps {
     activities: any;
     blockers: any;
     resources: any;
+    roleAnalytics: any;
 }
 
 export default function Dashboard({
@@ -28,7 +30,8 @@ export default function Dashboard({
     weather,
     activities,
     blockers,
-    resources
+    resources,
+    roleAnalytics
 }: DashboardProps) {
     const handleProjectChange = (projectIdOrUlid: string) => {
         if (!projectIdOrUlid) {
@@ -77,6 +80,9 @@ export default function Dashboard({
             <div className="py-8">
                 <div className="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8">
                     
+                    {/* Role Analytics Focus Banner */}
+                    {roleAnalytics && <RoleAnalyticsBanner analytics={roleAnalytics} />}
+
                     {/* Top Row: Weather / critical high-level alerts */}
                     <div className="mb-6">
                         <WeatherWidget data={weather} />
diff --git a/resources/js/lib/nav-config.ts b/resources/js/lib/nav-config.ts
index 42c94db..20708bd 100644
--- a/resources/js/lib/nav-config.ts
+++ b/resources/js/lib/nav-config.ts
@@ -80,13 +80,6 @@ export const navigationConfig: NavGroup[] = [
                 routeMatch: 'users.*',
                 permissions: ['users.access'],
             },
-            {
-                title: 'Roles & Permissions',
-                icon: Shield,
-                href: 'rolespermissions.index',
-                routeMatch: 'rolespermissions.*',
-                permissions: ['roles.access'],
-            },
         ],
     },
     {
@@ -163,12 +156,12 @@ export const navigationConfig: NavGroup[] = [
             {
                 title: 'Finance',
                 icon: Receipt,
-                href: 'finance.index',
+                href: 'cash-advances.index',
                 routeMatch: 'finance.*',
-                permissions: ['finance.access'],
                 children: [
-                    { title: 'Invoices', href: 'finance.index', routeMatch: 'finance.*' },
-                    { title: 'Retention', href: 'retention.index', routeMatch: 'retention.*' },
+                    { title: 'Invoices', href: 'finance.index', routeMatch: 'finance.*', permissions: ['finance.access'] },
+                    { title: 'Retention', href: 'retention.index', routeMatch: 'retention.*', permissions: ['finance.access'] },
+                    { title: 'Cash Advances', href: 'cash-advances.index', routeMatch: 'cash-advances.*' },
                 ],
             },
         ],
diff --git a/tests/Feature/RoleBasedActionTest.php b/tests/Feature/RoleBasedActionTest.php
new file mode 100644
index 0000000..7c0c530
--- /dev/null
+++ b/tests/Feature/RoleBasedActionTest.php
@@ -0,0 +1,326 @@
+<?php
+
+namespace Tests\Feature;
+
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Modules\FinancialManagement\Models\CashAdvance;
+use Modules\MaterialLogistics\Models\MaterialRequisition;
+use Modules\MaterialLogistics\Models\PurchaseOrder;
+use Modules\ProjectManagement\Models\Project;
+use Spatie\Permission\Models\Role;
+use Tests\TestCase;
+
+class RoleBasedActionTest extends TestCase
+{
+    use RefreshDatabase;
+
+    protected User $superAdmin;
+    protected User $admin;
+    protected User $projectManager;
+    protected User $contractorAdmin;
+    protected User $supervisor;
+    protected User $siteTech;
+    protected Project $project;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        // Create roles
+        Role::firstOrCreate(['name' => 'Super Admin']);
+        Role::firstOrCreate(['name' => 'admin']);
+        Role::firstOrCreate(['name' => 'Project Manager']);
+        Role::firstOrCreate(['name' => 'Main Contractor Admin']);
+        Role::firstOrCreate(['name' => 'Construction Supervisor']);
+        Role::firstOrCreate(['name' => 'Site Technical']);
+
+        // Create test users
+        $this->superAdmin = User::factory()->create(['user_type' => 'admin']);
+        $this->superAdmin->assignRole('Super Admin');
+
+        $this->admin = User::factory()->create(['user_type' => 'admin']);
+        $this->admin->assignRole('admin');
+
+        $this->projectManager = User::factory()->create(['user_type' => 'employee']);
+        $this->projectManager->assignRole('Project Manager');
+
+        $this->contractorAdmin = User::factory()->create(['user_type' => 'contractor']);
+        $this->contractorAdmin->assignRole('Main Contractor Admin');
+
+        $this->supervisor = User::factory()->create(['user_type' => 'employee']);
+        $this->supervisor->assignRole('Construction Supervisor');
+
+        $this->siteTech = User::factory()->create(['user_type' => 'employee']);
+        $this->siteTech->assignRole('Site Technical');
+
+        $this->project = Project::factory()->create();
+    }
+
+    /** @test */
+    public function supervisor_can_create_cash_advance_request()
+    {
+        $response = $this->actingAs($this->supervisor)
+            ->post(route('cash-advances.store'), [
+                'project_ulid' => $this->project->ulid,
+                'amount' => 500.00,
+                'reason' => 'Petty cash for emergency site fasteners',
+            ]);
+
+        $response->assertSessionHasNoErrors();
+        $this->assertDatabaseHas('cash_advances', [
+            'amount' => 500.00,
+            'status' => 'pending',
+            'requested_by' => $this->supervisor->id,
+        ]);
+    }
+
+    /** @test */
+    public function project_manager_can_approve_cash_advance_request()
+    {
+        $cashAdvance = CashAdvance::create([
+            'project_id' => $this->project->id,
+            'amount' => 500.00,
+            'reason' => 'Emergency fasteners',
+            'status' => 'pending',
+            'requested_by' => $this->supervisor->id,
+        ]);
+
+        $response = $this->actingAs($this->projectManager)
+            ->patch(route('cash-advances.approve', $cashAdvance->ulid));
+
+        $response->assertSessionHasNoErrors();
+        $this->assertDatabaseHas('cash_advances', [
+            'id' => $cashAdvance->id,
+            'status' => 'approved',
+            'approved_by' => $this->projectManager->id,
+        ]);
+    }
+
+    /** @test */
+    public function site_technical_cannot_approve_cash_advances()
+    {
+        $cashAdvance = CashAdvance::create([
+            'project_id' => $this->project->id,
+            'amount' => 500.00,
+            'reason' => 'Emergency fasteners',
+            'status' => 'pending',
+            'requested_by' => $this->supervisor->id,
+        ]);
+
+        // Attempting approval as Site Technical should not approve
+        $response = $this->actingAs($this->siteTech)
+            ->patch(route('cash-advances.approve', $cashAdvance->ulid));
+
+        // Status remains pending
+        $this->assertDatabaseHas('cash_advances', [
+            'id' => $cashAdvance->id,
+            'status' => 'pending',
+        ]);
+    }
+
+    /** @test */
+    public function admin_and_super_admin_can_approve_cash_advances()
+    {
+        $cashAdvance = CashAdvance::create([
+            'project_id' => $this->project->id,
+            'amount' => 300.00,
+            'reason' => 'Local refreshments',
+            'status' => 'pending',
+            'requested_by' => $this->supervisor->id,
+        ]);
+
+        $response = $this->actingAs($this->superAdmin)
+            ->patch(route('cash-advances.approve', $cashAdvance->ulid));
+
+        $response->assertSessionHasNoErrors();
+        $this->assertDatabaseHas('cash_advances', [
+            'id' => $cashAdvance->id,
+            'status' => 'approved',
+            'approved_by' => $this->superAdmin->id,
+        ]);
+    }
+
+    /** @test */
+    public function user_cannot_self_approve_cash_advance()
+    {
+        $cashAdvance = CashAdvance::create([
+            'project_id' => $this->project->id,
+            'amount' => 400.00,
+            'reason' => 'Self request test',
+            'status' => 'pending',
+            'requested_by' => $this->projectManager->id,
+        ]);
+
+        $response = $this->actingAs($this->projectManager)
+            ->patch(route('cash-advances.approve', $cashAdvance->ulid));
+
+        $this->assertDatabaseHas('cash_advances', [
+            'id' => $cashAdvance->id,
+            'status' => 'pending',
+        ]);
+    }
+
+    /** @test */
+    public function project_manager_cannot_approve_submitted_invoice()
+    {
+        $invoice = \Modules\FinancialManagement\Models\FinancialInvoice::create([
+            'project_id' => $this->project->id,
+            'invoice_number' => 'INV-TEST-001',
+            'status' => 'submitted',
+            'subtotal' => 100000,
+            'retention_rate' => 10,
+            'retention_amount' => 10000,
+            'total_amount' => 90000,
+            'billed_percentage' => 10,
+            'invoice_date' => now(),
+        ]);
+
+        $response = $this->actingAs($this->projectManager)
+            ->patch(route('finance.approve', $invoice->ulid));
+
+        $this->assertDatabaseHas('financial_invoices', [
+            'id' => $invoice->id,
+            'status' => 'submitted',
+        ]);
+    }
+
+    /** @test */
+    public function super_admin_and_admin_can_approve_submitted_invoice()
+    {
+        $invoice = \Modules\FinancialManagement\Models\FinancialInvoice::create([
+            'project_id' => $this->project->id,
+            'invoice_number' => 'INV-TEST-002',
+            'status' => 'submitted',
+            'subtotal' => 100000,
+            'retention_rate' => 10,
+            'retention_amount' => 10000,
+            'total_amount' => 90000,
+            'billed_percentage' => 10,
+            'invoice_date' => now(),
+        ]);
+
+        $response = $this->actingAs($this->superAdmin)
+            ->patch(route('finance.approve', $invoice->ulid));
+
+        $response->assertSessionHasNoErrors();
+        $this->assertDatabaseHas('financial_invoices', [
+            'id' => $invoice->id,
+            'status' => 'approved',
+        ]);
+    }
+
+    /** @test */
+    public function all_roles_can_access_their_permissioned_pages_without_errors()
+    {
+        // Give permissions to roles
+        $permission = \Spatie\Permission\Models\Permission::firstOrCreate(['name' => 'finance.access']);
+        $this->projectManager->givePermissionTo($permission);
+
+        // Test PM navigation
+        $this->actingAs($this->projectManager)
+            ->get(route('finance.index'))
+            ->assertStatus(200);
+
+        $this->actingAs($this->projectManager)
+            ->get(route('retention.index'))
+            ->assertStatus(200);
+
+        // Test Super Admin navigation
+        $this->actingAs($this->superAdmin)
+            ->get(route('finance.index'))
+            ->assertStatus(200);
+
+        $this->actingAs($this->superAdmin)
+            ->get(route('approvals.index'))
+            ->assertStatus(200);
+    }
+
+    /** @test */
+    public function test_comprehensive_all_roles_all_modules_page_access_and_crud_integrity(): void
+    {
+        // Grant permissions matching RolesPermissionsDatabaseSeeder
+        $permissions = [
+            'dashboard.access', 'projects.access', 'contractors.access', 'bidding.access',
+            'users.access', 'materials-catalog.access', 'inventory.access', 'finance.access',
+            'documents.access', 'approvals.access', 'roles.access', 'labors.access', 'equipments.access'
+        ];
+        foreach ($permissions as $p) {
+            \Spatie\Permission\Models\Permission::firstOrCreate(['name' => $p]);
+        }
+
+        $this->projectManager->syncPermissions([
+            'dashboard.access', 'projects.access', 'contractors.access', 'bidding.access',
+            'materials-catalog.access', 'inventory.access', 'finance.access', 'documents.access',
+            'approvals.access', 'labors.access', 'equipments.access'
+        ]);
+
+        $this->contractorAdmin->syncPermissions([
+            'dashboard.access', 'projects.access', 'bidding.access', 'finance.access', 'documents.access'
+        ]);
+
+        $this->supervisor->syncPermissions([
+            'dashboard.access', 'projects.access', 'inventory.access', 'materials-catalog.access', 'documents.access'
+        ]);
+
+        $this->siteTech->syncPermissions([
+            'dashboard.access', 'projects.access', 'inventory.access', 'documents.access'
+        ]);
+
+        // 1. Super Admin Page Access & CRUD Across All Modules
+        $this->actingAs($this->superAdmin);
+
+        $superAdminRoutes = [
+            'dashboard', 'projects.index', 'contractors.index',
+            'bids.index', 'users.index', 'materials-catalog.items.index', 'inventory.index',
+            'labors.index', 'equipments.index', 'resources.index',
+            'finance.index', 'retention.index', 'cash-advances.index', 'documents.index',
+            'approvals.index', 'rolespermissions.index', 'purchase-orders.index', 'requisitions.index'
+        ];
+
+        foreach ($superAdminRoutes as $routeName) {
+            $response = $this->get(route($routeName));
+            $response->assertStatus(200);
+        }
+
+        // 2. Project Manager Page Access Across Permissioned Modules
+        $this->actingAs($this->projectManager);
+        $pmRoutes = [
+            'dashboard', 'projects.index', 'materials-catalog.items.index', 'inventory.index',
+            'labors.index', 'equipments.index', 'finance.index', 'retention.index',
+            'documents.index', 'approvals.index'
+        ];
+
+        foreach ($pmRoutes as $routeName) {
+            $response = $this->get(route($routeName));
+            $response->assertStatus(200);
+        }
+
+        // 3. Contractor Admin Page Access
+        $this->actingAs($this->contractorAdmin);
+        $contractorRoutes = ['dashboard', 'projects.index', 'bids.index', 'finance.index', 'documents.index'];
+
+        foreach ($contractorRoutes as $routeName) {
+            $response = $this->get(route($routeName));
+            $response->assertStatus(200);
+        }
+
+        // 4. Construction Supervisor Page Access
+        $this->actingAs($this->supervisor);
+        $supervisorRoutes = ['dashboard', 'projects.index', 'inventory.index', 'materials-catalog.items.index', 'documents.index', 'cash-advances.index'];
+
+        foreach ($supervisorRoutes as $routeName) {
+            $response = $this->get(route($routeName));
+            $response->assertStatus(200);
+        }
+
+        // 5. Site Technical Page Access
+        $this->actingAs($this->siteTech);
+        $siteTechRoutes = ['dashboard', 'projects.index', 'inventory.index', 'documents.index', 'cash-advances.index'];
+
+        foreach ($siteTechRoutes as $routeName) {
+            $response = $this->get(route($routeName));
+            $response->assertStatus(200);
+        }
+    }
+}