diff --git a/src/App.tsx b/src/App.tsx
index 0578268..7f7e5df 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -15,6 +15,7 @@ import { FinanceDashboard } from './components/dashboard/FinanceDashboard';
 import { DealerDashboard } from './components/dashboard/DealerDashboard';
 import { ProspectiveDashboardPage } from './components/dashboard/ProspectiveDashboardPage';
 import { FDDDashboardPage } from './components/dashboard/FDDDashboardPage';
+import { FDDApplicationDetails } from './components/applications/FDDApplicationDetails';
 import { ApplicationsPage } from './components/applications/ApplicationsPage';
 import { AllApplicationsPage } from './components/applications/AllApplicationsPage';
 import { OpportunityRequestsPage } from './components/applications/OpportunityRequestsPage';
@@ -149,6 +150,7 @@ export default function App() {
       '/questionnaire-builder': 'Questionnaire Builder',
       '/approval-policies': 'Approval Policies',
       '/fdd-dashboard': 'FDD Dashboard',
+      '/fdd-details': 'Audit Workspace',
     };
     return titles[pathname] || 'Dashboard';
   };
@@ -228,6 +230,7 @@ export default function App() {
 
           {/* FDD Routes - Integrated into Layout */}
           <Route path="/fdd-dashboard" element={<FDDDashboardPage />} />
+          <Route path="/fdd-details/:id" element={<FDDApplicationDetails />} />
 
           {/* Admin/Lead Routes */}
           <Route path="/opportunity-requests" element={<OpportunityRequestsPage onViewDetails={(id) => navigate(`/applications/${id}`)} />} />
diff --git a/src/api/API.ts b/src/api/API.ts
index 5c24a21..2fe5a79 100644
--- a/src/api/API.ts
+++ b/src/api/API.ts
@@ -180,6 +180,11 @@ export const API = {
     getEorChecklistForRelocation: (relocationId: string) => client.get(`/eor/relocation/${relocationId}`),
     updateEorChecklistItem: (checklistId: string, data: any) => client.post(`/eor/item/${checklistId}`, data),
     submitEorAudit: (checklistId: string, data: any) => client.post(`/eor/audit/${checklistId}`, data),
+    
+    // FDD module additional routes
+    submitFddReport: (data: any) => client.post('/fdd/report', data),
+    getFddAssignment: (applicationId: string) => client.get(`/fdd/${applicationId}`),
+    assignFddAgency: (data: any) => client.post('/fdd/assign', data),
 };
 
 export default API;
diff --git a/src/components/applications/ApplicationDetails.tsx b/src/components/applications/ApplicationDetails.tsx
index b726601..3fdeddd 100644
--- a/src/components/applications/ApplicationDetails.tsx
+++ b/src/components/applications/ApplicationDetails.tsx
@@ -261,10 +261,20 @@ export const ApplicationDetails = () => {
   // const application = mockApplications.find(app => app.id === applicationId);
   const [application, setApplication] = useState<Application | null>(null);
   const [loading, setLoading] = useState(true);
+  const [documents, setDocuments] = useState<any[]>([]);
 
-  const fetchApplication = async () => {
+  const refreshDocuments = async () => {
     try {
-      setLoading(true);
+      const docs = await onboardingService.getDocuments(applicationId!);
+      setDocuments(docs || []);
+    } catch (error) {
+      console.error('Failed to refresh documents:', error);
+    }
+  };
+
+  const fetchApplication = async (silent = false) => {
+    try {
+      if (!silent) setLoading(true);
       const data = await onboardingService.getApplicationById(applicationId!);
 
       // Helper to find stage date
@@ -345,6 +355,9 @@ export const ApplicationDetails = () => {
         constitutionType: data.constitutionType,
       };
       setApplication(mappedApp);
+      if (data.uploadedDocuments) {
+        setDocuments(data.uploadedDocuments || []);
+      }
     } catch (error) {
       console.error('Failed to fetch application details', error);
     } finally {
@@ -355,6 +368,7 @@ export const ApplicationDetails = () => {
   useEffect(() => {
     if (applicationId) {
       fetchApplication();
+      refreshDocuments();
     }
   }, [applicationId]);
 
@@ -374,7 +388,9 @@ export const ApplicationDetails = () => {
   };
 
   useEffect(() => {
-    if (['EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application?.status || '')) {
+    // Always fetch EOR data regardless of status — documents can be uploaded
+    // before 'EOR In Progress' and must show as linked in the checklist.
+    if (applicationId) {
       fetchEorData();
     }
   }, [applicationId, application?.status]);
@@ -404,11 +420,11 @@ export const ApplicationDetails = () => {
 
   // Fetch audit logs when application loads
   useEffect(() => {
-    if (applicationId) {
+    if (application?.id) {
       const fetchAuditLogs = async () => {
         setAuditLoading(true);
         try {
-          const logs = await auditService.getAuditLogs('application', applicationId);
+          const logs = await auditService.getAuditLogs('application', application.id);
           setAuditLogs(Array.isArray(logs) ? logs : []);
         } catch (error) {
           console.error('Failed to fetch audit logs', error);
@@ -419,7 +435,7 @@ export const ApplicationDetails = () => {
       };
       fetchAuditLogs();
     }
-  }, [applicationId]);
+  }, [application?.id]);
 
   const routerLocation = useLocation();
   const [activeTab, setActiveTab] = useState(routerLocation.state?.activeTab || 'questionnaire');
@@ -450,7 +466,6 @@ export const ApplicationDetails = () => {
   const [interviewType, setInterviewType] = useState('level1');
   const [meetingLink, setMeetingLink] = useState('');
   const [location, setLocation] = useState('');
-  const [documents, setDocuments] = useState<any[]>([]);
   const [showUploadForm, setShowUploadForm] = useState(false); // Toggle for upload view
   const [uploadFile, setUploadFile] = useState<File | null>(null);
   const [uploadDocType, setUploadDocType] = useState('');
@@ -473,6 +488,38 @@ export const ApplicationDetails = () => {
 
 
   // Fetch document configurations
+  const [fddAgencies, setFddAgencies] = useState<any[]>([]);
+  const [selectedAgencyId, setSelectedAgencyId] = useState<string>('');
+  const [isAssigningAgency, setIsAssigningAgency] = useState(false);
+
+  const fetchFddAgencies = async () => {
+    try {
+      const agencies = await onboardingService.getUsers({ roleCode: 'FDD' });
+      setFddAgencies(Array.isArray(agencies) ? agencies : []);
+    } catch (error) {
+      console.error('Failed to fetch FDD agencies', error);
+    }
+  };
+
+  const handleAssignAgency = async () => {
+    if (!selectedAgencyId) {
+      toast.warning('Please select an agency');
+      return;
+    }
+    try {
+      setIsAssigningAgency(true);
+      await onboardingService.assignFddAgency({
+        applicationId: application?.id || applicationId,
+        assignedToAgency: selectedAgencyId
+      });
+      toast.success('FDD Agency assigned successfully');
+      fetchApplication();
+    } catch (error) {
+      toast.error('Failed to assign agency');
+    } finally {
+      setIsAssigningAgency(false);
+    }
+  };
   // Fetch document configurations
   useEffect(() => {
     const fetchConfigs = async () => {
@@ -513,7 +560,7 @@ export const ApplicationDetails = () => {
     // FDD Partner States
     const [showFddFinalizeModal, setShowFddFinalizeModal] = useState(false);
     const [showFddFlagModal, setShowFddFlagModal] = useState(false);
-    const [fddAuditRecommendation, setFddAuditRecommendation] = useState<string>('Green');
+    const [fddAuditRecommendation, setFddAuditRecommendation] = useState<string>('Recommended');
     const [fddAuditFindings, setFddAuditFindings] = useState<string>('');
     const [isFinalizingFdd, setIsFinalizingFdd] = useState(false);
     const [isFddFlagging, setIsFddFlagging] = useState(false);
@@ -798,16 +845,11 @@ export const ApplicationDetails = () => {
     };
 
     useEffect(() => {
-      if ((activeTab === 'documents' || activeTab === 'progress') && applicationId) {
-        const fetchDocuments = async () => {
-          try {
-            const docs = await onboardingService.getDocuments(applicationId);
-            setDocuments(docs || []);
-          } catch (error) {
-            console.error('Failed to fetch documents', error);
-          }
-        };
-        fetchDocuments();
+      if (['documents', 'progress', 'fdd', 'eor'].includes(activeTab) && applicationId) {
+        refreshDocuments();
+      }
+      if (activeTab === 'fdd' && (currentUser?.role === 'DD Admin' || currentUser?.role === 'Super Admin')) {
+        fetchFddAgencies();
       }
     }, [activeTab, applicationId]);
 
@@ -978,8 +1020,11 @@ export const ApplicationDetails = () => {
 
     const getStageStatus = (stageName: string, fallbackLogic: () => ProcessStage['status']): ProcessStage['status'] => {
       const backendStage = (application.progressTracking || []).find((ps: any) => ps.stageName === stageName);
-      if (backendStage && (backendStage.status === 'completed' || backendStage.status === 'active')) {
-        return backendStage.status as any;
+      if (backendStage) {
+        if (backendStage.status === 'completed' || backendStage.status === 'active') {
+          return backendStage.status as any;
+        }
+        // If backend says 'pending' fall through to fallback — it may have richer context
       }
       return fallbackLogic();
     };
@@ -997,7 +1042,7 @@ export const ApplicationDetails = () => {
         id: 2,
         name: 'Questionnaire',
         status: getStageStatus('Questionnaire', () =>
-          ['Questionnaire Completed', 'Shortlisted', 'Level 1 Interview Pending', 'Level 1 Approved', 'Level 2 Interview Pending', 'Level 2 Approved', 'Level 2 Recommended', 'Level 3 Interview Pending', 'Level 3 Approved', 'FDD Verification', 'LOI In Progress', 'Payment Pending', 'LOI Issued', 'Statutory LOI Ack', 'Dealer Code Generation', 'Architecture Team Assigned', 'Architecture Document Upload', 'Architecture Team Completion', 'LOA Pending', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) ? 'completed' :
+          ['Questionnaire Completed', 'Shortlisted', 'Level 1 Interview Pending', 'Level 1 Approved', 'Level 2 Interview Pending', 'Level 2 Approved', 'Level 2 Recommended', 'Level 3 Interview Pending', 'Level 3 Approved', 'FDD Verification', 'LOI In Progress', 'Payment Pending', 'LOI Issued', 'Statutory LOI Ack', 'Dealer Code Generation', 'Architecture Team Assigned', 'Architecture Document Upload', 'Architecture Team Completion', 'LOA Pending', 'LOA Issued', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) ? 'completed' :
             application.status === 'Questionnaire Pending' ? 'active' : 'pending'
         ),
         date: application.questionnaireDate,
@@ -1007,7 +1052,7 @@ export const ApplicationDetails = () => {
       {
         id: 3,
         name: 'Shortlist',
-        status: getStageStatus('Shortlist', () => ['Shortlisted', 'Level 1 Interview Pending', 'Level 1 Approved', 'Level 2 Interview Pending', 'Level 2 Approved', 'Level 2 Recommended', 'Level 3 Interview Pending', 'Level 3 Approved', 'FDD Verification', 'LOI In Progress', 'Payment Pending', 'LOI Issued', 'Statutory LOI Ack', 'Dealer Code Generation', 'Architecture Team Assigned', 'Architecture Document Upload', 'Architecture Team Completion', 'LOA Pending', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Rejected', 'Onboarded'].includes(application.status) ? 'completed' : 'pending'),
+        status: getStageStatus('Shortlist', () => ['Shortlisted', 'Level 1 Interview Pending', 'Level 1 Approved', 'Level 2 Interview Pending', 'Level 2 Approved', 'Level 2 Recommended', 'Level 3 Interview Pending', 'Level 3 Approved', 'FDD Verification', 'LOI In Progress', 'Payment Pending', 'LOI Issued', 'Statutory LOI Ack', 'Dealer Code Generation', 'Architecture Team Assigned', 'Architecture Document Upload', 'Architecture Team Completion', 'LOA Pending', 'LOA Issued', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Rejected', 'Onboarded'].includes(application.status) ? 'completed' : 'pending'),
         date: application.shortlistDate,
         description: 'Application shortlisted by DD',
         evaluators: Array.from(new Set((application.participants || [])
@@ -1019,7 +1064,7 @@ export const ApplicationDetails = () => {
       {
         id: 4,
         name: '1st Level Interview',
-        status: getStageStatus('1st Level Interview', () => ['Level 1 Approved', 'Level 2 Interview Pending', 'Level 2 Approved', 'Level 2 Recommended', 'Level 3 Interview Pending', 'Level 3 Approved', 'FDD Verification', 'LOI In Progress', 'Payment Pending', 'LOI Issued', 'Statutory LOI Ack', 'Dealer Code Generation', 'Architecture Team Assigned', 'Architecture Document Upload', 'Architecture Team Completion', 'LOA Pending', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) ? 'completed' : application.status === 'Level 1 Interview Pending' ? 'active' : application.status === 'Rejected' && application.progress >= 40 ? 'completed' : 'pending'),
+        status: getStageStatus('1st Level Interview', () => ['Level 1 Approved', 'Level 2 Interview Pending', 'Level 2 Approved', 'Level 2 Recommended', 'Level 3 Interview Pending', 'Level 3 Approved', 'FDD Verification', 'LOI In Progress', 'Payment Pending', 'LOI Issued', 'Statutory LOI Ack', 'Dealer Code Generation', 'Architecture Team Assigned', 'Architecture Document Upload', 'Architecture Team Completion', 'LOA Pending', 'LOA Issued', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) ? 'completed' : application.status === 'Level 1 Interview Pending' ? 'active' : application.status === 'Rejected' && application.progress >= 40 ? 'completed' : 'pending'),
         date: application.level1InterviewDate,
         description: 'DD-ZM + RBM evaluation',
         evaluators: Array.from(new Set((application.participants || [])
@@ -1036,7 +1081,7 @@ export const ApplicationDetails = () => {
       {
         id: 5,
         name: '2nd Level Interview',
-        status: getStageStatus('2nd Level Interview', () => ['Level 2 Approved', 'Level 2 Recommended', 'Level 3 Interview Pending', 'Level 3 Approved', 'FDD Verification', 'LOI In Progress', 'Payment Pending', 'LOI Issued', 'Statutory LOI Ack', 'Dealer Code Generation', 'Architecture Team Assigned', 'Architecture Document Upload', 'Architecture Team Completion', 'LOA Pending', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) ? 'completed' : application.status === 'Level 2 Interview Pending' ? 'active' : application.status === 'Rejected' && application.progress >= 55 ? 'completed' : 'pending'),
+        status: getStageStatus('2nd Level Interview', () => ['Level 2 Approved', 'Level 2 Recommended', 'Level 3 Interview Pending', 'Level 3 Approved', 'FDD Verification', 'LOI In Progress', 'Payment Pending', 'LOI Issued', 'Statutory LOI Ack', 'Dealer Code Generation', 'Architecture Team Assigned', 'Architecture Document Upload', 'Architecture Team Completion', 'LOA Pending', 'LOA Issued', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) ? 'completed' : application.status === 'Level 2 Interview Pending' ? 'active' : application.status === 'Rejected' && application.progress >= 55 ? 'completed' : 'pending'),
         date: application.level2InterviewDate,
         description: 'DD Lead + ZBH evaluation',
         evaluators: Array.from(new Set((application.participants || [])
@@ -1053,7 +1098,7 @@ export const ApplicationDetails = () => {
       {
         id: 6,
         name: '3rd Level Interview',
-        status: getStageStatus('3rd Level Interview', () => ['Level 3 Approved', 'FDD Verification', 'LOI In Progress', 'Payment Pending', 'LOI Issued', 'Statutory LOI Ack', 'Dealer Code Generation', 'Architecture Team Assigned', 'Architecture Document Upload', 'Architecture Team Completion', 'LOA Pending', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) ? 'completed' : application.status === 'Level 3 Interview Pending' ? 'active' : application.status === 'Rejected' && application.progress >= 70 ? 'completed' : 'pending'),
+        status: getStageStatus('3rd Level Interview', () => ['Level 3 Approved', 'FDD Verification', 'LOI In Progress', 'Payment Pending', 'LOI Issued', 'Statutory LOI Ack', 'Dealer Code Generation', 'Architecture Team Assigned', 'Architecture Document Upload', 'Architecture Team Completion', 'LOA Pending', 'LOA Issued', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) ? 'completed' : application.status === 'Level 3 Interview Pending' ? 'active' : application.status === 'Rejected' && application.progress >= 70 ? 'completed' : 'pending'),
         date: application.level3InterviewDate,
         description: 'NBH + DD Head evaluation',
         evaluators: Array.from(new Set((application.participants || [])
@@ -1070,7 +1115,7 @@ export const ApplicationDetails = () => {
       {
         id: 7,
         name: 'FDD',
-        status: getStageStatus('FDD', () => ['LOI In Progress', 'Payment Pending', 'LOI Issued', 'Statutory LOI Ack', 'Dealer Code Generation', 'Architecture Team Assigned', 'Architecture Document Upload', 'Architecture Team Completion', 'LOA Pending', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) ? 'completed' : application.status === 'FDD Verification' ? 'active' : 'pending'),
+        status: getStageStatus('FDD', () => ['LOI In Progress', 'Payment Pending', 'LOI Issued', 'Statutory LOI Ack', 'Dealer Code Generation', 'Architecture Team Assigned', 'Architecture Document Upload', 'Architecture Team Completion', 'LOA Pending', 'LOA Issued', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) ? 'completed' : application.status === 'FDD Verification' ? 'active' : 'pending'),
         date: application.fddDate,
         description: 'Financial Due Diligence',
         documentsUploaded: 5
@@ -1078,7 +1123,7 @@ export const ApplicationDetails = () => {
       {
         id: 8,
         name: 'LOI Approval',
-        status: getStageStatus('LOI Approval', () => ['Payment Pending', 'LOI Issued', 'Statutory LOI Ack', 'Dealer Code Generation', 'Architecture Team Assigned', 'Architecture Document Upload', 'Architecture Team Completion', 'LOA Pending', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) ? 'completed' : application.status === 'LOI In Progress' ? 'active' : 'pending'),
+        status: getStageStatus('LOI Approval', () => ['Payment Pending', 'LOI Issued', 'Statutory LOI Ack', 'Dealer Code Generation', 'Architecture Team Assigned', 'Architecture Document Upload', 'Architecture Team Completion', 'LOA Pending', 'LOA Issued', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) ? 'completed' : application.status === 'LOI In Progress' ? 'active' : 'pending'),
         date: application.loiApprovalDate,
         description: 'Letter of Intent approval',
         evaluators: Array.from(new Set((application.participants || [])
@@ -1093,7 +1138,7 @@ export const ApplicationDetails = () => {
       {
         id: 9,
         name: 'Security Details',
-        status: getStageStatus('Security Details', () => ['LOI Issued', 'Statutory LOI Ack', 'Dealer Code Generation', 'Architecture Team Assigned', 'Architecture Document Upload', 'Architecture Team Completion', 'LOA Pending', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) ? 'completed' : application.status === 'Payment Pending' ? 'active' : 'pending'),
+        status: getStageStatus('Security Details', () => ['LOI Issued', 'Statutory LOI Ack', 'Dealer Code Generation', 'Architecture Team Assigned', 'Architecture Document Upload', 'Architecture Team Completion', 'LOA Pending', 'LOA Issued', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) ? 'completed' : application.status === 'Payment Pending' ? 'active' : 'pending'),
         date: application.securityDetailsDate,
         description: 'Security verification',
         documentsUploaded: 3
@@ -1101,7 +1146,7 @@ export const ApplicationDetails = () => {
       {
         id: 10,
         name: 'LOI Issue',
-        status: getStageStatus('LOI Issue', () => ['Statutory LOI Ack', 'Dealer Code Generation', 'Architecture Team Assigned', 'Architecture Document Upload', 'Architecture Team Completion', 'LOA Pending', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) ? 'completed' : application.status === 'LOI Issued' ? 'active' : 'pending'),
+        status: getStageStatus('LOI Issue', () => ['LOI Issued', 'Statutory LOI Ack', 'Dealer Code Generation', 'Architecture Team Assigned', 'Architecture Document Upload', 'Architecture Team Completion', 'LOA Pending', 'LOA Issued', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) ? 'completed' : 'pending'),
         date: application.loiIssueDate,
         description: 'Letter of Intent issued',
         documentsUploaded: 1
@@ -1109,7 +1154,7 @@ export const ApplicationDetails = () => {
       {
         id: 11,
         name: 'Dealer Code Generation',
-        status: getStageStatus('Dealer Code Generation', () => (application.dealerCode || ['Architecture Team Assigned', 'Architecture Document Upload', 'Architecture Team Completion', 'Statutory GST', 'Statutory PAN', 'Statutory NODAL', 'Statutory NODAL', 'Statutory Check', 'Statutory Partnership', 'Statutory Firm Reg', 'Statutory Rental', 'Statutory Virtual Code', 'Statutory Domain', 'Statutory MSD', 'Statutory LOI Ack', 'LOA Pending', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status)) ? 'completed' : application.status === 'Dealer Code Generation' ? 'active' : 'pending'),
+        status: getStageStatus('Dealer Code Generation', () => (application.dealerCode || ['Dealer Code Generation', 'Architecture Team Assigned', 'Architecture Document Upload', 'Architecture Team Completion', 'Statutory GST', 'Statutory PAN', 'Statutory NODAL', 'Statutory NODAL', 'Statutory Check', 'Statutory Partnership', 'Statutory Firm Reg', 'Statutory Rental', 'Statutory Virtual Code', 'Statutory Domain', 'Statutory MSD', 'Statutory LOI Ack', 'LOA Pending', 'LOA Issued', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status)) ? 'completed' : 'pending'),
         date: application.dealerCodeDate,
         description: 'Dealer code generated and assigned',
         documentsUploaded: 0,
@@ -1122,7 +1167,7 @@ export const ApplicationDetails = () => {
               {
                 id: '11a-1',
                 name: 'Assigned to Architecture Team',
-                status: application.architectureAssignedTo || ['Architecture Document Upload', 'Architecture Team Completion', 'Statutory GST', 'Statutory PAN', 'Statutory Nodal', 'Statutory Check', 'Statutory Partnership', 'Statutory Firm Reg', 'Statutory Rental', 'Statutory Virtual Code', 'Statutory Domain', 'Statutory MSD', 'Statutory LOI Ack', 'LOA Pending', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) || application.architectureStatus === 'COMPLETED' || isDocumentUploaded('Architecture Assignment Document') ? 'completed' : application.status === 'Architecture Team Assigned' ? 'active' : 'pending',
+                status: application.architectureAssignedTo || ['Architecture Document Upload', 'Architecture Team Completion', 'Statutory GST', 'Statutory PAN', 'Statutory Nodal', 'Statutory Check', 'Statutory Partnership', 'Statutory Firm Reg', 'Statutory Rental', 'Statutory Virtual Code', 'Statutory Domain', 'Statutory MSD', 'Statutory LOI Ack', 'LOA Pending', 'LOA Issued', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) || application.architectureStatus === 'COMPLETED' || isDocumentUploaded('Architecture Assignment Document') ? 'completed' : application.status === 'Architecture Team Assigned' ? 'active' : 'pending',
                 date: application.architectureAssignedDate,
                 description: 'Assigned to architecture team for site planning',
                 documentsUploaded: 0
@@ -1130,7 +1175,7 @@ export const ApplicationDetails = () => {
               {
                 id: '11a-2',
                 name: 'Architectural Document Upload',
-                status: isDocumentUploaded('Architecture Blueprint') || isDocumentUploaded('Site Plan') || ['Architecture Team Completion', 'LOA Pending', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) || application.architectureStatus === 'COMPLETED' ? 'completed' : (application.architectureAssignedTo || application.status === 'Architecture Document Upload' || application.architectureStatus === 'IN_PROGRESS') ? 'active' : 'pending',
+                status: isDocumentUploaded('Architecture Blueprint') || isDocumentUploaded('Site Plan') || ['Architecture Team Completion', 'LOA Pending', 'LOA Issued', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) || application.architectureStatus === 'COMPLETED' ? 'completed' : (application.architectureAssignedTo || application.status === 'Architecture Document Upload' || application.architectureStatus === 'IN_PROGRESS') ? 'active' : 'pending',
                 date: application.architectureDocumentDate,
                 description: 'Architectural documents and blueprints uploaded',
                 documentsUploaded: (documents || []).filter(d => ['Architecture Blueprint', 'Site Plan'].includes(d.documentType)).length
@@ -1138,7 +1183,7 @@ export const ApplicationDetails = () => {
               {
                 id: '11a-3',
                 name: 'Architecture Team Completion',
-                status: ['LOA Pending', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) || application.architectureStatus === 'COMPLETED' || isDocumentUploaded('Architecture Completion Certificate') ? 'completed' : application.status === 'Architecture Team Completion' ? 'active' : 'pending',
+                status: ['LOA Pending', 'LOA Issued', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) || application.architectureStatus === 'COMPLETED' || isDocumentUploaded('Architecture Completion Certificate') ? 'completed' : application.status === 'Architecture Team Completion' ? 'active' : 'pending',
                 date: application.architectureCompletionDate,
                 description: 'Architecture team work completed',
                 documentsUploaded: 0
@@ -1152,77 +1197,77 @@ export const ApplicationDetails = () => {
               {
                 id: '11b-1',
                 name: 'GST',
-                status: isDocumentUploaded('GST Certificate') || ['Statutory PAN', 'Statutory Nodal', 'Statutory Check', 'Statutory Partnership', 'Statutory Firm Reg', 'Statutory Rental', 'Statutory Virtual Code', 'Statutory Domain', 'Statutory MSD', 'Statutory LOI Ack', 'LOA Pending', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) ? 'completed' : application.status === 'Statutory GST' ? 'active' : 'pending',
+                status: isDocumentUploaded('GST Certificate') || ['Statutory PAN', 'Statutory Nodal', 'Statutory Check', 'Statutory Partnership', 'Statutory Firm Reg', 'Statutory Rental', 'Statutory Virtual Code', 'Statutory Domain', 'Statutory MSD', 'Statutory LOI Ack', 'LOA Pending', 'LOA Issued', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) ? 'completed' : application.status === 'Statutory GST' ? 'active' : 'pending',
                 description: 'GST certificate',
                 documentsUploaded: (documents || []).filter(d => d.documentType === 'GST Certificate').length
               },
               {
                 id: '11b-2',
                 name: 'PAN',
-                status: isDocumentUploaded('PAN Card') || ['Statutory Nodal', 'Statutory Check', 'Statutory Partnership', 'Statutory Firm Reg', 'Statutory Rental', 'Statutory Virtual Code', 'Statutory Domain', 'Statutory MSD', 'Statutory LOI Ack', 'LOA Pending', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) ? 'completed' : application.status === 'Statutory PAN' ? 'active' : 'pending',
+                status: isDocumentUploaded('PAN Card') || ['Statutory Nodal', 'Statutory Check', 'Statutory Partnership', 'Statutory Firm Reg', 'Statutory Rental', 'Statutory Virtual Code', 'Statutory Domain', 'Statutory MSD', 'Statutory LOI Ack', 'LOA Pending', 'LOA Issued', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) ? 'completed' : application.status === 'Statutory PAN' ? 'active' : 'pending',
                 description: 'PAN card',
                 documentsUploaded: (documents || []).filter(d => d.documentType === 'PAN Card').length
               },
               {
                 id: '11b-3',
                 name: 'Nodal Agreement',
-                status: isDocumentUploaded('Nodal Agreement') || ['Statutory Check', 'Statutory Partnership', 'Statutory Firm Reg', 'Statutory Rental', 'Statutory Virtual Code', 'Statutory Domain', 'Statutory MSD', 'Statutory LOI Ack', 'LOA Pending', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) ? 'completed' : application.status === 'Statutory Nodal' ? 'active' : 'pending',
+                status: isDocumentUploaded('Nodal Agreement') || ['Statutory Check', 'Statutory Partnership', 'Statutory Firm Reg', 'Statutory Rental', 'Statutory Virtual Code', 'Statutory Domain', 'Statutory MSD', 'Statutory LOI Ack', 'LOA Pending', 'LOA Issued', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) ? 'completed' : application.status === 'Statutory Nodal' ? 'active' : 'pending',
                 description: 'Nodal agreement document',
                 documentsUploaded: (documents || []).filter(d => d.documentType === 'Nodal Agreement').length
               },
               {
                 id: '11b-4',
                 name: 'Cancelled Check',
-                status: isDocumentUploaded('Cancelled Check') || ['Statutory Partnership', 'Statutory Firm Reg', 'Statutory Rental', 'Statutory Virtual Code', 'Statutory Domain', 'Statutory MSD', 'Statutory LOI Ack', 'LOA Pending', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) ? 'completed' : application.status === 'Statutory Check' ? 'active' : 'pending',
+                status: isDocumentUploaded('Cancelled Check') || ['Statutory Partnership', 'Statutory Firm Reg', 'Statutory Rental', 'Statutory Virtual Code', 'Statutory Domain', 'Statutory MSD', 'Statutory LOI Ack', 'LOA Pending', 'LOA Issued', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) ? 'completed' : application.status === 'Statutory Check' ? 'active' : 'pending',
                 description: 'Cancelled check copy',
                 documentsUploaded: (documents || []).filter(d => d.documentType === 'Cancelled Check').length
               },
               {
                 id: '11b-5',
                 name: 'Partnership Deed/LLP/MOA/AOA/COI',
-                status: isDocumentUploaded('Partnership Deed') || isDocumentUploaded('LLP Agreement') || isDocumentUploaded('Certificate of Incorporation') || isDocumentUploaded('MOA') || isDocumentUploaded('AOA') || ['Statutory Firm Reg', 'Statutory Rental', 'Statutory Virtual Code', 'Statutory Domain', 'Statutory MSD', 'Statutory LOI Ack', 'LOA Pending', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) ? 'completed' : application.status === 'Statutory Partnership' ? 'active' : 'pending',
+                status: isDocumentUploaded('Partnership Deed') || isDocumentUploaded('LLP Agreement') || isDocumentUploaded('Certificate of Incorporation') || isDocumentUploaded('MOA') || isDocumentUploaded('AOA') || ['Statutory Firm Reg', 'Statutory Rental', 'Statutory Virtual Code', 'Statutory Domain', 'Statutory MSD', 'Statutory LOI Ack', 'LOA Pending', 'LOA Issued', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) ? 'completed' : application.status === 'Statutory Partnership' ? 'active' : 'pending',
                 description: 'Business entity documents',
                 documentsUploaded: (documents || []).filter(d => ['Partnership Deed', 'LLP Agreement', 'Certificate of Incorporation', 'MOA', 'AOA'].includes(d.documentType)).length
               },
               {
                 id: '11b-6',
                 name: 'Firm Registration Certificate',
-                status: isDocumentUploaded('Firm Registration') || ['Statutory Rental', 'Statutory Virtual Code', 'Statutory Domain', 'Statutory MSD', 'Statutory LOI Ack', 'LOA Pending', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) ? 'completed' : application.status === 'Statutory Firm Reg' ? 'active' : 'pending',
+                status: isDocumentUploaded('Firm Registration') || ['Statutory Rental', 'Statutory Virtual Code', 'Statutory Domain', 'Statutory MSD', 'Statutory LOI Ack', 'LOA Pending', 'LOA Issued', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) ? 'completed' : application.status === 'Statutory Firm Reg' ? 'active' : 'pending',
                 description: 'Firm registration certificate',
                 documentsUploaded: (documents || []).filter(d => d.documentType === 'Firm Registration').length
               },
               {
                 id: '11b-7',
                 name: 'Rental agreement/ Lease agreement / Own/ Land agreement',
-                status: isDocumentUploaded('Rental Agreement') || isDocumentUploaded('Property Documents') || ['Statutory Virtual Code', 'Statutory Domain', 'Statutory MSD', 'Statutory LOI Ack', 'LOA Pending', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) ? 'completed' : application.status === 'Statutory Rental' ? 'active' : 'pending',
+                status: isDocumentUploaded('Rental Agreement') || isDocumentUploaded('Property Documents') || ['Statutory Virtual Code', 'Statutory Domain', 'Statutory MSD', 'Statutory LOI Ack', 'LOA Pending', 'LOA Issued', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) ? 'completed' : application.status === 'Statutory Rental' ? 'active' : 'pending',
                 description: 'Property agreement document',
                 documentsUploaded: (documents || []).filter(d => ['Rental Agreement', 'Property Documents'].includes(d.documentType)).length
               },
               {
                 id: '11b-8',
                 name: 'Virtual Code',
-                status: isDocumentUploaded('Virtual Code Confirmation') || ['Statutory Domain', 'Statutory MSD', 'Statutory LOI Ack', 'LOA Pending', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) ? 'completed' : application.status === 'Statutory Virtual Code' ? 'active' : 'pending',
+                status: isDocumentUploaded('Virtual Code Confirmation') || ['Statutory Domain', 'Statutory MSD', 'Statutory LOI Ack', 'LOA Pending', 'LOA Issued', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) ? 'completed' : application.status === 'Statutory Virtual Code' ? 'active' : 'pending',
                 description: 'Virtual code availability',
                 documentsUploaded: (documents || []).filter(d => d.documentType === 'Virtual Code Confirmation').length
               },
               {
                 id: '11b-9',
                 name: 'Domain ID',
-                status: isDocumentUploaded('Domain ID Setup') || ['Statutory MSD', 'Statutory LOI Ack', 'LOA Pending', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) ? 'completed' : application.status === 'Statutory Domain' ? 'active' : 'pending',
+                status: isDocumentUploaded('Domain ID Setup') || ['Statutory MSD', 'Statutory LOI Ack', 'LOA Pending', 'LOA Issued', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) ? 'completed' : application.status === 'Statutory Domain' ? 'active' : 'pending',
                 description: 'Domain ID setup',
                 documentsUploaded: (documents || []).filter(d => d.documentType === 'Domain ID Setup').length
               },
               {
                 id: '11b-10',
                 name: 'MSD Configuration',
-                status: isDocumentUploaded('MSD Configuration') || ['Statutory LOI Ack', 'LOA Pending', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) ? 'completed' : application.status === 'Statutory MSD' ? 'active' : 'pending',
+                status: isDocumentUploaded('MSD Configuration') || ['Statutory LOI Ack', 'LOA Pending', 'LOA Issued', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) ? 'completed' : application.status === 'Statutory MSD' ? 'active' : 'pending',
                 description: 'Microsoft Dynamics configuration',
                 documentsUploaded: (documents || []).filter(d => d.documentType === 'MSD Configuration').length
               },
               {
                 id: '11b-11',
                 name: 'LOI Acknowledgement Copy',
-                status: isDocumentUploaded('LOI Acknowledgement') || ['LOA Pending', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) ? 'completed' : application.status === 'Statutory LOI Ack' ? 'active' : 'pending',
+                status: isDocumentUploaded('LOI Acknowledgement') || ['LOA Pending', 'LOA Issued', 'EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) ? 'completed' : application.status === 'Statutory LOI Ack' ? 'active' : 'pending',
                 description: 'LOI acknowledgement copy',
                 documentsUploaded: (documents || []).filter(d => d.documentType === 'LOI Acknowledgement').length
               }
@@ -1236,8 +1281,8 @@ export const ApplicationDetails = () => {
         status: getStageStatus('LOA', () => ['EOR In Progress', 'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'].includes(application.status) ? 'completed' : application.status === 'LOA Pending' ? 'active' : 'pending'),
         isLocked: application.status === 'LOA Pending' &&
           getDeposit('FINAL')?.status !== 'Verified' &&
-          !documents.some(d => (d.documentType?.toLowerCase().includes('final') && d.documentType?.toLowerCase().includes('deposit')) && d.status === 'Approved'),
-        lockMessage: 'Final Security Deposit (₹15L) must be verified by Finance before LOA Approval.',
+          !documents.some(d => (d.documentType?.toLowerCase().includes('first') && d.documentType?.toLowerCase().includes('fill')) && d.status === 'Approved'),
+        lockMessage: 'First Fill (₹15L) must be verified by Finance before LOA Approval.',
         date: application.loaDate,
         description: 'Letter of Authorization',
         evaluators: Array.from(new Set((application.participants || [])
@@ -1252,7 +1297,9 @@ export const ApplicationDetails = () => {
       {
         id: 13,
         name: 'EOR Complete',
-        status: getStageStatus('EOR Complete', () => ['Inauguration', 'Approved', 'Onboarded'].includes(application.status) ? 'completed' : application.status === 'EOR Complete' ? 'active' : 'pending'),
+        status: getStageStatus('EOR Complete', () =>
+          ['Inauguration', 'Approved', 'Onboarded'].includes(application.status) ? 'completed' :
+          ['EOR In Progress', 'EOR Complete'].includes(application.status) ? 'active' : 'pending'),
         date: application.eorCompleteDate,
         description: 'Essential Operating Requirements completed',
         documentsUploaded: 6
@@ -1645,8 +1692,12 @@ export const ApplicationDetails = () => {
       }
     };
 
-    if (loading) {
-      return <div className="flex justify-center items-center h-96">Loading...</div>;
+    if (loading && !application) {
+      return (
+        <div className="flex items-center justify-center min-h-[60vh]">
+          <Loader2 className="w-10 h-10 animate-spin text-amber-600" />
+        </div>
+      );
     }
 
     if (!application) {
@@ -1711,7 +1762,7 @@ export const ApplicationDetails = () => {
       ['Approved', 'Rejected', 'Selected'].includes(currentUserEvaluation?.recommendation || '');
 
     // Final visibility flags
-    const isAdmin = currentUser && ['DD Admin', 'Super Admin', 'NBH', 'DD Lead', 'DD Head', 'Finance', 'Finance Admin', 'FDD'].includes(currentUser.role);
+    const isAdmin = currentUser && ['DD Admin', 'Super Admin', 'NBH', 'DD Lead', 'DD Head', 'Finance', 'Finance Admin', 'FDD', 'ZBH', 'RBM'].includes(currentUser.role);
     const isAdministrativeStage = [
       'Level 3 Approved', 'FDD Verification',
       'LOI In Progress', 'LOI Issued', 'Statutory LOI Ack',
@@ -1719,19 +1770,16 @@ export const ApplicationDetails = () => {
       'Statutory GST', 'Statutory PAN', 'Statutory Nodal', 'Statutory Check',
       'Statutory Partnership', 'Statutory Firm Reg', 'Statutory Rental',
       'Statutory Virtual Code', 'Statutory Domain', 'Statutory MSD',
-      'LOA Pending', 'EOR Complete', 'Inauguration'
+      'LOA Pending', 'EOR In Progress', 'EOR Complete', 'Inauguration'
     ].includes(application.status);
 
     const finalDepositVerified = getDeposit('FINAL')?.status === 'Verified';
     const isLoaLocked = application.status === 'LOA Pending' && !finalDepositVerified;
 
     // Sequential Enforcement for LOI APPROVAL (SRS 6.16.3.5)
-    // Approval Chain: Finance -> DD-Head -> NBH
+    // Approval Chain: DD-Head -> NBH
     // Sequential Enforcement for LOI APPROVAL (SRS 6.16.3.5)
-    // Approval Chain: Finance -> DD-Head -> NBH
-    const financeApproved = application.stageApprovals?.some(
-      (a: any) => a.stageCode === 'LOI_APPROVAL' && a.actorRole === 'Finance' && a.decision === 'Approved'
-    );
+    // Approval Chain: DD-Head -> NBH
     const ddHeadApproved = application.stageApprovals?.some(
       (a: any) => a.stageCode === 'LOI_APPROVAL' && a.actorRole === 'DD Head' && a.decision === 'Approved'
     );
@@ -1744,14 +1792,18 @@ export const ApplicationDetails = () => {
 
     let sequenceMet = true;
     if (!['Super Admin', 'DD Admin'].includes(currentUser?.role || '')) {
+      // FDD Stage Restriction: Only DD Admin or Super Admin can approve
+      if (application.status === 'FDD Verification' || application.status === 'Level 3 Approved') {
+        sequenceMet = false;
+      }
+
       // LOI Sequence Enforcement
       if (application.status === 'LOI In Progress') {
-        if (currentUser?.role === 'DD Head') sequenceMet = !!financeApproved;
         if (currentUser?.role === 'NBH') {
           sequenceMet = !!ddHeadApproved; // NBH can only approve after DD Head
         }
-        // Roles not in the sequence (like DD Lead or FDD) should not see the buttons for LOI issuance decision
-        if (!['Finance', 'DD Head', 'NBH'].includes(currentUser?.role || '')) {
+        // Roles not in the sequence (like Admin or Finance) should not see the buttons for LOI issuance decision
+        if (!['DD Head', 'NBH'].includes(currentUser?.role || '')) {
           sequenceMet = false;
         }
       }
@@ -1784,43 +1836,107 @@ export const ApplicationDetails = () => {
 
     const renderFddAuditContent = () => {
       const assignments = application?.fddAssignments || [];
+      const fddParticipants = application?.participants?.filter((p: any) => 
+        p.user?.role === 'FDD' || 
+        p.user?.roleCode === 'FDD' || 
+        p.user?.allRoles?.includes('FDD')
+      ) || [];
+
+      const hasAssignment = assignments.length > 0 || fddParticipants.length > 0;
+      const primaryFddUser = fddParticipants[0]?.user;
 
       const MANDATORY_FINANCIAL_DOCS = [
         { type: 'Bank Statement', label: 'Bank Statements' },
         { type: 'Income Tax Returns (ITR)', label: 'ITR (Last 3 Years)' },
-        { type: 'Credit Reports', label: 'CIBIL / Credit Reports' },
+        { type: 'CIBIL Report', label: 'CIBIL / Credit Reports' },
         { type: 'Property Documents', label: 'Property Documents' },
         { type: 'Business Valuation Report', label: 'Valuation Reports' }
       ];
 
       const getDocByTypeName = (typeName: string) => {
-        // Look in documents array (which is state)
-        return (documents || []).find((d: any) => d.documentType === typeName);
+        if (!documents) return null;
+        const target = typeName.toLowerCase();
+        return documents.find((d: any) => {
+          const docType = (d.documentType || '').toLowerCase();
+          const fileName = (d.fileName || '').toLowerCase();
+          
+          if (docType === target) return true;
+          
+          if (target.includes('itr') && (docType.includes('itr') || fileName.includes('itr'))) return true;
+          if (target.includes('bank statement') && (docType.includes('bank') || fileName.includes('bank'))) return true;
+          if (target.includes('cibil') && (docType.includes('cibil') || fileName.includes('cibil') || docType.includes('credit'))) return true;
+          
+          return false;
+        });
       };
 
-      if (assignments.length === 0 && (application.status !== 'FDD Verification' && application.status !== 'LOI In Progress')) {
+      if (!hasAssignment && !['FDD Verification', 'LOI In Progress', 'Payment Pending'].includes(application.status)) {
         return (
-          <div className="flex flex-col items-center justify-center p-12 bg-slate-50 rounded-xl border-2 border-dashed border-slate-200">
-            <ShieldCheck className="w-12 h-12 text-slate-300 mb-4" />
-            <h3 className="text-slate-900 font-semibold">No FDD Assignment</h3>
-            <p className="text-slate-500 text-sm text-center max-w-xs mt-2">
-              The Financial Due Diligence process has not been initiated for this application yet.
-            </p>
+          <div className="space-y-6">
+            <div className="flex flex-col items-center justify-center p-12 bg-slate-50 rounded-2xl border-2 border-dashed border-slate-200">
+              <ShieldCheck className="w-12 h-12 text-slate-300 mb-4" />
+              <h3 className="text-slate-900 font-semibold uppercase tracking-widest text-xs">No FDD Assignment</h3>
+              <p className="text-slate-500 text-[10px] text-center max-w-xs mt-2 font-medium leading-relaxed uppercase tracking-tight">
+                The Financial Due Diligence process has not been initiated for this application yet.
+              </p>
+            </div>
+
+            {(currentUser?.role === 'DD Admin' || currentUser?.role === 'Super Admin') && (
+              <Card className="border-amber-100 bg-amber-50/30 overflow-hidden rounded-2xl">
+                <CardHeader className="pb-2">
+                  <CardTitle className="text-xs font-black uppercase tracking-widest text-amber-800 flex items-center gap-2">
+                    <ShieldAlert className="w-4 h-4" />
+                    Initiate FDD Audit
+                  </CardTitle>
+                </CardHeader>
+                <CardContent>
+                  <div className="flex flex-col md:flex-row gap-4">
+                    <div className="flex-1">
+                      <label className="text-[10px] font-black uppercase tracking-widest text-slate-400 mb-1.5 block">Select FDD Agency</label>
+                      <select 
+                        className="w-full h-11 bg-white border border-slate-200 rounded-xl px-4 text-sm font-medium focus:ring-2 focus:ring-amber-500/20 focus:border-amber-500 outline-none transition-all shadow-sm"
+                        value={selectedAgencyId}
+                        onChange={(e) => setSelectedAgencyId(e.target.value)}
+                      >
+                        <option value="">Choose partner agency...</option>
+                        {fddAgencies && fddAgencies.map((agency: any) => (
+                          <option key={agency.id} value={agency.id}>
+                            {agency.fullName || agency.name} ({agency.email})
+                          </option>
+                        ))}
+                      </select>
+                    </div>
+                    <div className="flex items-end">
+                      <Button 
+                        className="bg-slate-900 text-white hover:bg-slate-800 font-black text-[10px] uppercase tracking-widest px-8 h-11 border-none shadow-lg shadow-slate-900/10 transition-all active:scale-[0.98]"
+                        onClick={() => handleAssignAgency()}
+                        disabled={isAssigningAgency || !selectedAgencyId}
+                      >
+                        {isAssigningAgency ? 'Assigning...' : 'Assign & Start Audit'}
+                      </Button>
+                    </div>
+                  </div>
+                </CardContent>
+              </Card>
+            )}
           </div>
         );
       }
 
       return (
         <div className="space-y-8">
-          {/* FDD Partner Actions (Only visible to FDD role in Active FDD stage) */}
-          {currentUser?.role === 'FDD' && application.status === 'FDD Verification' && (
+          {/* FDD/Finance Audit Workspace */}
+          {((currentUser?.role === 'FDD' || currentUser?.role === 'DD Admin' || currentUser?.role === 'Super Admin' || hasAssignment) && 
+            (['FDD Verification', 'Level 3 Approved', 'LOI In Progress'].includes(application.status))) && (
             <div className="flex flex-col md:flex-row gap-4 p-6 bg-slate-900 rounded-2xl text-white shadow-xl border-b-4 border-amber-500 mb-8">
               <div className="flex-1">
-                <h4 className="text-lg font-bold flex items-center gap-2">
-                  <ShieldCheck className="w-5 h-5 text-amber-400" />
-                  Audit Workspace
+                <h4 className="text-lg font-bold flex items-center gap-3">
+                  <div className="p-2 bg-amber-500/20 rounded-lg">
+                    <ShieldCheck className="w-5 h-5 text-amber-400" />
+                  </div>
+                  Audit Management Workspace {primaryFddUser && <span className="text-amber-400 text-sm font-normal ml-2">Assigned to: {primaryFddUser.name}</span>}
                 </h4>
-                <p className="text-slate-400 text-sm mt-1 font-medium">Capture findings and upload the final audit report to progress the LOI issuance.</p>
+                <p className="text-slate-400 text-[11px] mt-1 font-medium leading-relaxed max-w-md">Capture financial findings, upload reports, and provide your formal recommendation to progress the application.</p>
               </div>
               <div className="flex items-center gap-3">
                 <input
@@ -1834,11 +1950,12 @@ export const ApplicationDetails = () => {
                       setIsUploading(true);
                       const formData = new FormData();
                       formData.append('file', file);
-                      formData.append('documentType', 'FDD Audit Report');
+                      formData.append('documentType', 'FDD Final Audit Report');
+                      formData.append('stage', 'FDD');
                       formData.append('applicationId', application.id);
                       await onboardingService.uploadDocument(application.id, formData);
-                      toast.success('FDD Audit Report uploaded successfully');
-                      fetchApplication();
+                      toast.success('FDD Final Audit Report uploaded successfully');
+                      refreshDocuments();
                     } catch (err) {
                       toast.error('Upload failed');
                     } finally {
@@ -1854,19 +1971,23 @@ export const ApplicationDetails = () => {
                   <Upload className="w-4 h-4 mr-2" />
                   {isUploading ? 'Uploading...' : 'Upload Report'}
                 </Button>
-                <Button
-                  variant="outline"
-                  className="bg-transparent text-white border-white/20 hover:bg-red-600/20 hover:border-red-500/50 hover:text-red-400 font-black text-[10px] uppercase tracking-widest px-6 h-11"
-                  onClick={() => setShowFddFlagModal(true)}
-                >
-                  Flag Non-Responsive
-                </Button>
-                <Button
-                  className="bg-amber-500 text-white hover:bg-amber-600 font-black text-[10px] uppercase tracking-widest px-6 h-11 border-none shadow-lg shadow-amber-500/20"
-                  onClick={() => setShowFddFinalizeModal(true)}
-                >
-                  Finalize Audit
-                </Button>
+                {(currentUser?.role === 'DD Admin' || currentUser?.role === 'Super Admin') && (
+                  <>
+                    <Button
+                      variant="outline"
+                      className="bg-transparent text-white border-white/20 hover:bg-red-600/20 hover:border-red-500/50 hover:text-red-400 font-black text-[10px] uppercase tracking-widest px-6 h-11"
+                      onClick={() => setShowFddFlagModal(true)}
+                    >
+                      Flag Non-Responsive
+                    </Button>
+                    <Button
+                      className="bg-amber-500 text-white hover:bg-amber-600 font-black text-[10px] uppercase tracking-widest px-6 h-11 border-none shadow-lg shadow-amber-500/20"
+                      onClick={() => setShowFddFinalizeModal(true)}
+                    >
+                      Finalize Audit
+                    </Button>
+                  </> 
+                )}
               </div>
             </div>
           )}
@@ -1895,21 +2016,55 @@ export const ApplicationDetails = () => {
                         <div>
                           <p className="text-sm font-bold text-slate-800">{docType.label}</p>
                           <p className="text-[10px] text-slate-400 font-bold uppercase tracking-tighter">
-                            {doc ? `Uploaded: ${new Date(doc.createdAt).toLocaleDateString()}` : 'Missing in Documentation'}
+                            {doc ? `Uploaded: ${formatDateTime(doc.createdAt)}` : 'Missing in Documentation'}
                           </p>
                         </div>
                       </div>
-                      {doc && (
+                      {doc ? (
                         <div className="flex gap-2">
-                          <Button variant="ghost" size="sm" className="h-8 text-blue-600 font-black text-[10px] uppercase tracking-widest"
+                          <Button variant="ghost" size="sm" className="h-8 text-blue-600 font-black text-[10px] uppercase tracking-widest hover:bg-blue-50"
                             onClick={() => {
                               setPreviewDoc(doc);
                               setShowPreviewModal(true);
                             }}
                           >
+                            <Eye className="w-4 h-4 mr-1" />
                             Preview
                           </Button>
                         </div>
+                      ) : (
+                        <Button 
+                          variant="outline" 
+                          size="sm" 
+                          className="h-8 border-slate-200 text-slate-500 font-black text-[10px] uppercase tracking-widest hover:bg-slate-50 hover:text-blue-600"
+                          onClick={() => {
+                            const input = document.createElement('input');
+                            input.type = 'file';
+                            input.onchange = async (e: any) => {
+                              const file = e.target.files[0];
+                              if (!file) return;
+                              try {
+                                setIsUploading(true);
+                                const formData = new FormData();
+                                formData.append('file', file);
+                                formData.append('documentType', docType.type);
+                                formData.append('stage', 'FDD');
+                                formData.append('applicationId', application.id);
+                                await onboardingService.uploadDocument(application.id, formData);
+                                toast.success(`${docType.label} uploaded successfully`);
+                                refreshDocuments();
+                              } catch (err) {
+                                toast.error('Upload failed');
+                              } finally {
+                                setIsUploading(false);
+                              }
+                            };
+                            input.click();
+                          }}
+                        >
+                          <Upload className="w-4 h-4 mr-1 text-slate-300" />
+                          Upload
+                        </Button>
                       )}
                     </div>
                   );
@@ -1964,13 +2119,13 @@ export const ApplicationDetails = () => {
                                 <Label className="text-[10px] text-slate-400 uppercase tracking-widest font-black mb-2 block">Auditor Recommendation</Label>
                                 <div className={cn(
                                   "inline-flex items-center gap-2 px-3 py-1.5 rounded-full border text-xs font-black shadow-sm",
-                                  report.recommendation === 'Green' ? "bg-green-50 border-green-200 text-green-700" :
-                                    report.recommendation === 'Amber' ? "bg-amber-50 border-amber-200 text-amber-700" :
+                                  report.recommendation === 'Recommended' || report.recommendation === 'Green' ? "bg-green-50 border-green-200 text-green-700" :
+                                    report.recommendation === 'Qualified with Observations' || report.recommendation === 'Amber' ? "bg-amber-50 border-amber-200 text-amber-700" :
                                       "bg-red-50 border-red-200 text-red-700"
                                 )}>
                                   <div className={cn("w-2 h-2 rounded-full",
-                                    report.recommendation === 'Green' ? "bg-green-500" :
-                                      report.recommendation === 'Amber' ? "bg-amber-500" : "bg-red-500"
+                                    report.recommendation === 'Recommended' || report.recommendation === 'Green' ? "bg-green-500" :
+                                      report.recommendation === 'Qualified with Observations' || report.recommendation === 'Amber' ? "bg-amber-500" : "bg-red-500"
                                   )} />
                                   {report.recommendation?.toUpperCase()}
                                 </div>
@@ -2051,6 +2206,86 @@ export const ApplicationDetails = () => {
                 </CardContent>
               </Card>
             ))}
+
+            {/* FDD Supporting Documents Section */}
+            <div className="space-y-4">
+              <div className="flex items-center justify-between">
+                <h3 className="text-lg font-semibold text-slate-900">Supporting Audit Documents</h3>
+                <Badge variant="outline" className="bg-slate-50 text-slate-500 border-slate-200">
+                  {documents.filter(d => {
+                    const type = (d.documentType || '').toLowerCase();
+                    const stage = (d.stage || '').toLowerCase();
+                    return stage === 'fdd' || 
+                           type.includes('report') || 
+                           type.includes('itr') || 
+                           type.includes('bank') || 
+                           type.includes('cibil') || 
+                           type.includes('valuation');
+                  }).length} Document(s)
+                </Badge>
+              </div>
+
+              <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+                {documents.filter(d => {
+                  const type = (d.documentType || '').toLowerCase();
+                  const stage = (d.stage || '').toLowerCase();
+                  return stage === 'fdd' || 
+                         type.includes('report') || 
+                         type.includes('itr') || 
+                         type.includes('bank') || 
+                         type.includes('cibil') || 
+                         type.includes('valuation');
+                }).map((doc) => (
+                  <div key={doc.id} className="group bg-white border border-slate-200 rounded-xl p-4 flex items-center justify-between hover:border-amber-400 transition-all hover:shadow-md">
+                    <div className="flex items-center gap-3">
+                      <div className="w-10 h-10 rounded-lg bg-slate-50 flex items-center justify-center">
+                        <FileText className="w-5 h-5 text-slate-400" />
+                      </div>
+                      <div className="overflow-hidden">
+                        <p className="text-slate-900 font-bold text-sm truncate max-w-[150px]" title={doc.fileName}>{doc.fileName}</p>
+                        <p className="text-slate-500 text-[10px] font-medium uppercase">{doc.documentType}</p>
+                      </div>
+                    </div>
+                    <div className="flex gap-1">
+                      <Button
+                        variant="ghost"
+                        size="icon"
+                        className="h-8 w-8 text-slate-400 hover:text-amber-600 hover:bg-amber-50"
+                        onClick={() => window.open(`http://localhost:5000/${doc.filePath}`, '_blank')}
+                      >
+                        <Download className="w-4 h-4" />
+                      </Button>
+                      <Button
+                        variant="ghost"
+                        size="icon"
+                        className="h-8 w-8 text-slate-400 hover:text-amber-600 hover:bg-amber-50"
+                        onClick={() => {
+                          setPreviewDoc(doc);
+                          setShowPreviewModal(true);
+                        }}
+                      >
+                        <Eye className="w-4 h-4" />
+                      </Button>
+                    </div>
+                  </div>
+                ))}
+
+                {documents.filter(d => {
+                  const type = (d.documentType || '').toLowerCase();
+                  const stage = (d.stage || '').toLowerCase();
+                  return stage === 'fdd' || 
+                         type.includes('report') || 
+                         type.includes('itr') || 
+                         type.includes('bank') || 
+                         type.includes('cibil') || 
+                         type.includes('valuation');
+                }).length === 0 && (
+                  <div className="col-span-full p-8 text-center bg-slate-50 rounded-xl border border-dashed border-slate-200">
+                    <p className="text-slate-400 text-sm">No supporting audit documents uploaded yet.</p>
+                  </div>
+                )}
+              </div>
+            </div>
           </div>
         </div>
       );
@@ -2425,7 +2660,7 @@ export const ApplicationDetails = () => {
                                       4: 2, // L1 Interview (ZM + RBM)
                                       5: 2, // L2 Interview (ZBH + DD Lead)
                                       6: 2, // L3 Interview (NBH + DD Head)
-                                      8: 3, // LOI Approval (Finance + DD Head + NBH)
+                                      8: 2, // LOI Approval (DD Head + NBH)
                                       12: 2 // LOA Approval (DD Head + NBH)
                                     };
                                     const stageId = Number(stage.id);
@@ -2544,56 +2779,60 @@ export const ApplicationDetails = () => {
                                             {branch.stages.map((branchStage) => (
                                               <div key={branchStage.id} className="relative">
                                                 <div className="flex gap-4 text-xs">
-                                                  <div className="relative">
-                                                    <div className={`w-8 h-8 rounded-full flex items-center justify-center border-2 ${branchStage.status === 'completed'
-                                                      ? `${branchColor === 'blue' ? 'bg-blue-500 border-blue-500' : 'bg-green-500 border-green-500'}`
-                                                      : branchStage.status === 'active'
-                                                        ? 'bg-amber-500 border-amber-500'
-                                                        : 'bg-slate-200 border-slate-300'
-                                                      }`}>
-                                                      {branchStage.status === 'completed' ? (
-                                                        <Check className="w-4 h-4 text-white" />
-                                                      ) : branchStage.status === 'active' ? (
-                                                        <Clock className="w-4 h-4 text-white" />
-                                                      ) : (
-                                                        <div className="w-2 h-2 bg-slate-400 rounded-full"></div>
-                                                      )}
-                                                    </div>
-                                                  </div>
-                                                  <div className="flex-1">
-                                                    <p className="font-semibold text-slate-800">{branchStage.name}</p>
-                                                    {branchStage.description && (
-                                                      <p className="text-slate-500 text-xs mt-0.5">{branchStage.description}</p>
-                                                    )}
-
-                                                    {(() => {
-                                                      const branchDocsCount = documents.filter(doc =>
-                                                        doc.documentType?.toLowerCase().includes(branchStage.name.toLowerCase().split(' ')[0]) ||
-                                                        doc.stage === branchStage.name
-                                                      ).length;
-
-                                                      return (
-                                                        <div className="flex items-center gap-2 mt-1">
-                                                          <button
-                                                            onClick={() => {
-                                                              setSelectedStage(branchStage.name);
-                                                              setShowDocumentsModal(true);
-                                                              if (branchDocsCount === 0) setShowUploadForm(true);
-                                                            }}
-                                                            className="text-[10px] font-medium text-blue-700 hover:text-blue-800 flex items-center gap-1 bg-blue-50 px-1.5 py-0.5 rounded border border-blue-100"
-                                                          >
-                                                            <FileText className="w-2.5 h-2.5" />
-                                                            {branchDocsCount > 0 ? `${branchDocsCount} Docs` : 'Upload'}
-                                                          </button>
+                                                  {(() => {
+                                                    const stageDocs = documents.filter(doc =>
+                                                      doc.documentType?.toLowerCase().includes(branchStage.name.toLowerCase().split(' ')[0]) ||
+                                                      doc.stage === branchStage.name
+                                                    );
+                                                    const isDone = branchStage.status === 'completed' || stageDocs.length > 0;
+                                                    
+                                                    return (
+                                                      <>
+                                                        <div className="relative">
+                                                          <div className={`w-8 h-8 rounded-full flex items-center justify-center border-2 ${isDone
+                                                            ? `${branchColor === 'blue' ? 'bg-blue-500 border-blue-500' : 'bg-green-500 border-green-500'}`
+                                                            : branchStage.status === 'active'
+                                                              ? 'bg-amber-500 border-amber-500 text-white shadow-sm'
+                                                              : 'bg-white border-slate-300 text-slate-400'
+                                                            }`}>
+                                                            {isDone ? (
+                                                              <Check className="w-4 h-4 text-white" strokeWidth={3} />
+                                                            ) : branchStage.status === 'active' ? (
+                                                              <Clock className="w-4 h-4 text-white" />
+                                                            ) : (
+                                                              <div className="w-2 h-2 bg-slate-300 rounded-full"></div>
+                                                            )}
+                                                          </div>
                                                         </div>
-                                                      );
-                                                    })()}
-                                                    <p className="text-slate-400 text-[10px] mt-1">
-                                                      {branchStage.status === 'completed' && branchStage.date && `Done: ${formatDateTime(branchStage.date)}`}
-                                                      {branchStage.status === 'active' && 'Evaluating'}
-                                                      {branchStage.status === 'pending' && 'Pending'}
-                                                    </p>
-                                                  </div>
+                                                        <div className="flex-1">
+                                                          <p className="font-semibold text-slate-800">{branchStage.name}</p>
+                                                          {branchStage.description && (
+                                                            <p className="text-slate-500 text-xs mt-0.5">{branchStage.description}</p>
+                                                          )}
+
+                                                          <div className="flex items-center gap-2 mt-1">
+                                                            <button
+                                                              onClick={() => {
+                                                                setSelectedStage(branchStage.name);
+                                                                setShowDocumentsModal(true);
+                                                                if (stageDocs.length === 0) setShowUploadForm(true);
+                                                              }}
+                                                              className={`text-[10px] font-medium flex items-center gap-1 px-1.5 py-0.5 rounded border ${branchColor === 'blue'
+                                                                ? 'text-blue-700 bg-blue-50 border-blue-100 hover:bg-blue-100'
+                                                                : 'text-green-700 bg-green-50 border-green-100 hover:bg-green-100'
+                                                                }`}
+                                                            >
+                                                              <FileText className="w-2.5 h-2.5" />
+                                                              {stageDocs.length > 0 ? `${stageDocs.length} Docs` : 'Upload'}
+                                                            </button>
+                                                          </div>
+                                                          <p className="text-slate-400 text-[10px] mt-1">
+                                                            {isDone && branchStage.date ? `Done: ${formatDateTime(branchStage.date)}` : isDone && stageDocs.length > 0 ? `Uploaded: ${formatDateTime(stageDocs[0].updatedAt || stageDocs[0].createdAt)}` : branchStage.status === 'active' ? 'Evaluating' : 'Pending'}
+                                                          </p>
+                                                        </div>
+                                                      </>
+                                                    );
+                                                  })()}
                                                 </div>
                                               </div>
                                             ))}
@@ -2990,7 +3229,7 @@ export const ApplicationDetails = () => {
                         {/* Initial Security Deposit */}
                         {(() => {
                           const deposit = getDeposit('INITIAL');
-                          const config = paymentConfigs.INITIAL_SECURITY_DEPOSIT;
+                          const config = paymentConfigs.SECURITY_DEPOSIT;
                           const expectedAmount = config?.amount || 500000;
 
                           return (
@@ -3005,7 +3244,7 @@ export const ApplicationDetails = () => {
                                     <div className="w-8 h-8 rounded bg-amber-50 flex items-center justify-center text-amber-600">
                                       <ClipboardList className="w-4 h-4" />
                                     </div>
-                                    <span className="font-semibold text-slate-700">Advance Payment</span>
+                                    <span className="font-semibold text-slate-700">Security Deposit</span>
                                   </div>
                                   <Badge className={cn(
                                     deposit?.status === 'Verified' ? "bg-green-100 text-green-700 hover:bg-green-100" :
@@ -3038,6 +3277,32 @@ export const ApplicationDetails = () => {
                                       "{deposit.remarks}"
                                     </div>
                                   )}
+
+                                  {/* Respective Documents */}
+                                  <div className="pt-4 mt-2 border-t border-slate-100">
+                                    <p className="text-[10px] font-bold text-slate-400 uppercase tracking-wider mb-2">Verification Documents</p>
+                                    <div className="space-y-2">
+                                      {documents.filter((d: any) => d.documentType?.toLowerCase().includes('security') && d.documentType?.toLowerCase().includes('deposit')).map((doc: any, idx: number) => (
+                                        <div key={idx} className="flex items-center justify-between p-2 rounded bg-slate-50/50 border border-slate-100">
+                                          <div className="flex items-center gap-2 overflow-hidden">
+                                            <FileText className="w-3 h-3 text-slate-400" />
+                                            <span className="text-[10px] font-medium text-slate-700 truncate">{doc.fileName || doc.name}</span>
+                                          </div>
+                                          <Button 
+                                            variant="ghost" 
+                                            size="sm" 
+                                            className="h-6 px-2 text-[10px] text-amber-600 hover:text-amber-700 hover:bg-amber-50"
+                                            onClick={() => { setPreviewDoc(doc); setShowPreviewModal(true); }}
+                                          >
+                                            View
+                                          </Button>
+                                        </div>
+                                      ))}
+                                      {documents.filter((d: any) => d.documentType?.toLowerCase().includes('security') && d.documentType?.toLowerCase().includes('deposit')).length === 0 && (
+                                        <p className="text-[10px] text-slate-400 italic">No proof uploaded</p>
+                                      )}
+                                    </div>
+                                  </div>
                                 </div>
                               </CardContent>
                             </Card>
@@ -3047,7 +3312,7 @@ export const ApplicationDetails = () => {
                         {/* Final Security Deposit */}
                         {(() => {
                           const deposit = getDeposit('FINAL');
-                          const config = paymentConfigs.FINAL_SECURITY_DEPOSIT;
+                          const config = paymentConfigs.FIRST_FILL;
                           const expectedAmount = config?.amount || 1500000;
 
                           return (
@@ -3062,7 +3327,7 @@ export const ApplicationDetails = () => {
                                     <div className="w-8 h-8 rounded bg-blue-50 flex items-center justify-center text-blue-600">
                                       <ShieldCheck className="w-4 h-4" />
                                     </div>
-                                    <span className="font-semibold text-slate-700">Final Security Deposit</span>
+                                    <span className="font-semibold text-slate-700">First Fill</span>
                                   </div>
                                   <Badge className={cn(
                                     deposit?.status === 'Verified' ? "bg-green-100 text-green-700 hover:bg-green-100" :
@@ -3095,56 +3360,38 @@ export const ApplicationDetails = () => {
                                       "{deposit.remarks}"
                                     </div>
                                   )}
+
+                                  {/* Respective Documents */}
+                                  <div className="pt-4 mt-2 border-t border-slate-100">
+                                    <p className="text-[10px] font-bold text-slate-400 uppercase tracking-wider mb-2">Verification Documents</p>
+                                    <div className="space-y-2">
+                                      {documents.filter((d: any) => d.documentType?.toLowerCase().includes('first') && d.documentType?.toLowerCase().includes('fill')).map((doc: any, idx: number) => (
+                                        <div key={idx} className="flex items-center justify-between p-2 rounded bg-slate-50/50 border border-slate-100">
+                                          <div className="flex items-center gap-2 overflow-hidden">
+                                            <FileText className="w-3 h-3 text-slate-400" />
+                                            <span className="text-[10px] font-medium text-slate-700 truncate">{doc.fileName || doc.name}</span>
+                                          </div>
+                                          <Button 
+                                            variant="ghost" 
+                                            size="sm" 
+                                            className="h-6 px-2 text-[10px] text-blue-600 hover:text-blue-700 hover:bg-blue-50"
+                                            onClick={() => { setPreviewDoc(doc); setShowPreviewModal(true); }}
+                                          >
+                                            View
+                                          </Button>
+                                        </div>
+                                      ))}
+                                      {documents.filter((d: any) => d.documentType?.toLowerCase().includes('first') && d.documentType?.toLowerCase().includes('fill')).length === 0 && (
+                                        <p className="text-[10px] text-slate-400 italic">No proof uploaded</p>
+                                      )}
+                                    </div>
+                                  </div>
                                 </div>
                               </CardContent>
                             </Card>
                           );
                         })()}
                       </div>
-
-                      {/* Payment Proof Documents */}
-                      <Card className="mt-6">
-                        <CardHeader className="pb-3">
-                          <CardTitle className="text-sm font-medium flex items-center gap-2">
-                            <FileText className="w-4 h-4 text-amber-600" />
-                            Verification Documents
-                          </CardTitle>
-                        </CardHeader>
-                        <CardContent>
-                          {documents.filter((d: any) => d.documentType?.toLowerCase().includes('deposit')).length > 0 ? (
-                            <div className="grid grid-cols-1 sm:grid-cols-2 gap-3">
-                              {documents.filter((d: any) => d.documentType?.toLowerCase().includes('deposit')).map((doc: any, index: number) => (
-                                <div key={index} className="flex items-center justify-between p-3 border border-slate-100 rounded-lg bg-slate-50/50 hover:bg-slate-50 transition-colors">
-                                  <div className="flex items-center gap-3 overflow-hidden">
-                                    <div className="flex-shrink-0 w-8 h-8 rounded bg-white flex items-center justify-center border border-slate-200">
-                                      <FileText className="w-4 h-4 text-slate-400" />
-                                    </div>
-                                    <div className="overflow-hidden">
-                                      <p className="text-xs font-medium text-slate-900 truncate">{doc.fileName || doc.name}</p>
-                                      <p className="text-[10px] text-slate-500 uppercase">{doc.documentType}</p>
-                                    </div>
-                                  </div>
-                                  <Button
-                                    variant="ghost"
-                                    size="sm"
-                                    className="h-7 text-amber-600 hover:text-amber-700 hover:bg-amber-50"
-                                    onClick={() => {
-                                      setPreviewDoc(doc);
-                                      setShowPreviewModal(true);
-                                    }}
-                                  >
-                                    View
-                                  </Button>
-                                </div>
-                              ))}
-                            </div>
-                          ) : (
-                            <div className="text-center py-6 border-2 border-dashed border-slate-100 rounded-lg">
-                              <p className="text-sm text-slate-400 font-medium italic">No payment proofs uploaded yet.</p>
-                            </div>
-                          )}
-                        </CardContent>
-                      </Card>
                     </TabsContent>
 
 
@@ -3256,7 +3503,7 @@ export const ApplicationDetails = () => {
                       <Lock className="w-4 h-4 text-amber-600" />
                       <AlertTitle className="text-amber-900 font-semibold">Stage Locked</AlertTitle>
                       <AlertDescription className="text-amber-800">
-                        Final Security Deposit (₹15L) must be verified by Finance before LOA Approval can proceed.
+                        First Fill (₹15L) must be verified by Finance before LOA Approval can proceed.
                       </AlertDescription>
                     </Alert>
                   )}
@@ -4671,15 +4918,15 @@ export const ApplicationDetails = () => {
                 <div className="space-y-2">
                   <Label className="text-[10px] font-black uppercase tracking-widest text-slate-400">Auditor Recommendation</Label>
                   <div className="flex gap-2">
-                    {['Green', 'Amber', 'Red'].map((rec) => (
+                    {['Recommended', 'Qualified with Observations', 'Not Recommended'].map((rec) => (
                       <Button
                         key={rec}
                         variant={fddAuditRecommendation === rec ? 'default' : 'outline'}
                         className={cn(
-                          "flex-1 h-10 font-bold text-[10px] uppercase tracking-wider rounded-xl transition-all",
-                          fddAuditRecommendation === rec && rec === 'Green' && "bg-emerald-600 hover:bg-emerald-700",
-                          fddAuditRecommendation === rec && rec === 'Amber' && "bg-amber-500 hover:bg-amber-600",
-                          fddAuditRecommendation === rec && rec === 'Red' && "bg-red-600 hover:bg-red-700"
+                          "flex-1 h-10 font-bold text-[9px] uppercase tracking-wider rounded-xl transition-all",
+                          fddAuditRecommendation === rec && rec === 'Recommended' && "bg-emerald-600 hover:bg-emerald-700",
+                          fddAuditRecommendation === rec && rec === 'Qualified with Observations' && "bg-amber-500 hover:bg-amber-600",
+                          fddAuditRecommendation === rec && rec === 'Not Recommended' && "bg-red-600 hover:bg-red-700"
                         )}
                         onClick={() => setFddAuditRecommendation(rec)}
                       >
@@ -4726,8 +4973,7 @@ export const ApplicationDetails = () => {
                         applicationId: application!.id,
                         stageCode: 'FDD_VERIFICATION',
                         decision: 'Approved',
-                        remarks: fddAuditFindings,
-                        recommendation: fddAuditRecommendation,
+                        remarks: `[RECOMMENDATION: ${fddAuditRecommendation}] \nFindings: ${fddAuditFindings}`,
                         nextStatus: 'LOI In Progress',
                         nextProgress: 65
                       });
diff --git a/src/components/applications/FDDApplicationDetails.tsx b/src/components/applications/FDDApplicationDetails.tsx
index c271c65..1fa42bd 100644
--- a/src/components/applications/FDDApplicationDetails.tsx
+++ b/src/components/applications/FDDApplicationDetails.tsx
@@ -15,6 +15,7 @@ import {
 import { WorkNotesPage } from './WorkNotesPage';
 import { toast } from 'sonner';
 import { DocumentPreviewModal } from '../ui/DocumentPreviewModal';
+import { formatDateTime, cn } from '@/components/ui/utils';
 import { 
     Dialog, 
     DialogContent, 
@@ -25,11 +26,15 @@ import {
 } from '../ui/dialog';
 import { Button } from '../ui/button';
 import { AlertTriangle, Info, ShieldCheck } from 'lucide-react';
+import { Label } from '../ui/label';
+import { Textarea } from '../ui/textarea';
+
 
 export function FDDApplicationDetails() {
     const { id } = useParams<{ id: string }>();
     const navigate = useNavigate();
     const [application, setApplication] = useState<any>(null);
+    const [assignment, setAssignment] = useState<any>(null);
     const [loading, setLoading] = useState(true);
     const [uploading, setUploading] = useState(false);
     const [selectedDocType, setSelectedDocType] = useState('');
@@ -38,6 +43,8 @@ export function FDDApplicationDetails() {
     const [selectedPreviewDoc, setSelectedPreviewDoc] = useState<any>(null);
     const [showFinalizeModal, setShowFinalizeModal] = useState(false);
     const [showFlagModal, setShowFlagModal] = useState(false);
+    const [fddAuditRecommendation, setFddAuditRecommendation] = useState<string>('Recommended');
+    const [fddAuditFindings, setFddAuditFindings] = useState<string>('');
 
     useEffect(() => {
         if (id) fetchApplication();
@@ -46,12 +53,16 @@ export function FDDApplicationDetails() {
     const fetchApplication = async () => {
         setLoading(true);
         try {
-            const response: any = await API.getApplicationById(id!);
-            if (response.data?.success) {
-                setApplication(response.data.data);
-            } else {
-                toast.error(response.data?.message || 'Failed to authorize access');
-                navigate('/fdd-dashboard');
+            const [appRes, assRes]: any = await Promise.all([
+                API.getApplicationById(id!),
+                API.getFddAssignment(id!)
+            ]);
+
+            if (appRes.data?.success) {
+                setApplication(appRes.data.data);
+            }
+            if (assRes.data?.success) {
+                setAssignment(assRes.data.data);
             }
         } catch (error) {
             console.error('Error fetching application:', error);
@@ -74,7 +85,8 @@ export function FDDApplicationDetails() {
         const formData = new FormData();
         formData.append('file', file);
         formData.append('documentType', selectedDocType);
-        formData.append('requestId', id!);
+        formData.append('stage', 'FDD');
+        formData.append('applicationId', id!);
         formData.append('requestType', 'application');
 
         try {
@@ -120,11 +132,14 @@ export function FDDApplicationDetails() {
 
     const isFDDStageActive = application.currentStage === 'FDD_VERIFICATION' || application.currentStage === 'FDD';
     
+    // Check if report is already submitted in assignment
+    const isReportSubmitted = assignment?.status === 'Report Submitted';
+    
     // Check if the application has already passed the FDD stage
-    const isCompleted = !isFDDStageActive && (application.overallStatus !== 'Active' || application.currentProgress >= 75);
+    const isCompleted = !isFDDStageActive && (application.overallStatus !== 'Active' || application.currentProgress >= 75) || isReportSubmitted;
     
     // Check if the application has not yet arrived at the FDD stage
-    const isNotReachedYet = !isFDDStageActive && application.currentProgress < 70 && !isCompleted;
+    const isNotReachedYet = !isFDDStageActive && application.currentProgress < 70 && !isReportSubmitted;
 
     return (
         <div className="flex flex-col gap-6 max-w-7xl mx-auto mb-10">
@@ -159,12 +174,15 @@ export function FDDApplicationDetails() {
                                             setUploading(true);
                                             const formData = new FormData();
                                             formData.append('file', file);
-                                            formData.append('documentType', 'FDD Audit Report');
+                                            formData.append('documentType', 'FDD Final Audit Report');
+                                            formData.append('stage', 'FDD');
                                             formData.append('applicationId', application.id);
                                             
-                                            await API.uploadDocument(application.id, formData);
-                                            toast.success('FDD Audit Report uploaded successfully');
-                                            fetchApplication(); // Refresh to show the new doc
+                                            const res: any = await API.uploadDocument(application.id, formData);
+                                            if (res.data?.success) {
+                                                toast.success('FDD Final Audit Report uploaded successfully');
+                                                fetchApplication(); 
+                                            }
                                         } catch (err) {
                                             toast.error('Upload failed');
                                         } finally {
@@ -253,7 +271,6 @@ export function FDDApplicationDetails() {
                 >
                     <div className="flex items-center gap-2">
                         Work Notes
-                        <span className="bg-slate-100 text-slate-500 px-1.5 py-0.5 rounded text-[10px]">0</span>
                     </div>
                     {activeTab === 'worknotes' && <div className="absolute bottom-[-1px] left-0 right-0 h-0.5 bg-blue-600" />}
                 </button>
@@ -309,11 +326,12 @@ export function FDDApplicationDetails() {
                                                 className="w-full px-3 py-2 bg-slate-50 border border-slate-200 rounded text-sm font-medium text-slate-700 outline-none focus:ring-1 focus:ring-blue-500 transition-all"
                                             >
                                                 <option value="">Select Document Category...</option>
-                                                <option value="Final FDD Audit Report">Final FDD Audit Report</option>
-                                                <option value="Bank Statement Analysis">Bank Statement Analysis</option>
-                                                <option value="Credit Compliance Report">Credit Compliance Report</option>
+                                                <option value="FDD Final Audit Report">FDD Final Audit Report</option>
+                                                <option value="Bank Statement">Bank Statement</option>
+                                                <option value="Income Tax Returns (ITR)">Income Tax Returns (ITR)</option>
+                                                <option value="CIBIL Report">CIBIL Report</option>
                                                 <option value="Business Valuation Report">Business Valuation Report</option>
-                                                <option value="Property Verification Report">Property Verification Report</option>
+                                                <option value="Property Documents">Property Documents</option>
                                             </select>
 
                                             <div className="relative">
@@ -365,7 +383,7 @@ export function FDDApplicationDetails() {
                                                                     <span className="text-[8px] bg-slate-100 text-slate-500 px-1 py-0.5 rounded uppercase font-bold tracking-tighter">APPLICANT</span>
                                                                 </div>
                                                                 <p className="text-[10px] text-slate-400 font-medium">
-                                                                    {doc.documentType} • {new Date(doc.createdAt).toLocaleDateString()}
+                                                                    {doc.documentType} • {formatDateTime(doc.createdAt)}
                                                                     {doc.uploader?.fullName && ` • by ${doc.uploader.fullName}`}
                                                                 </p>
                                                             </div>
@@ -378,9 +396,6 @@ export function FDDApplicationDetails() {
                                                             >
                                                                 <Eye className="w-4 h-4" />
                                                             </button>
-                                                            <a href={`http://localhost:5000${doc.filePath?.startsWith('/') ? '' : '/'}${doc.filePath}`} target="_blank" className="p-1.5 hover:bg-white rounded text-blue-600 transition-all">
-                                                                <Upload className="w-3.5 h-3.5 rotate-180" />
-                                                            </a>
                                                         </div>
                                                     </div>
                                                 ))}
@@ -409,7 +424,7 @@ export function FDDApplicationDetails() {
                                                                     <span className="text-[8px] bg-amber-500 text-white px-1 py-0.5 rounded uppercase font-bold tracking-tighter">YOUR AUDIT REPORT</span>
                                                                 </div>
                                                                 <p className="text-[10px] text-slate-400 font-medium">
-                                                                    {doc.documentType} • {new Date(doc.createdAt).toLocaleDateString()}
+                                                                    {doc.documentType} • {formatDateTime(doc.createdAt)}
                                                                     {doc.uploader?.fullName && ` • by ${doc.uploader.fullName}`}
                                                                 </p>
                                                             </div>
@@ -422,9 +437,6 @@ export function FDDApplicationDetails() {
                                                             >
                                                                 <Eye className="w-4 h-4" />
                                                             </button>
-                                                            <a href={`http://localhost:5000${doc.filePath?.startsWith('/') ? '' : '/'}${doc.filePath}`} target="_blank" className="p-1.5 hover:bg-white rounded text-blue-600 transition-all">
-                                                                <Upload className="w-3.5 h-3.5 rotate-180" />
-                                                            </a>
                                                         </div>
                                                     </div>
                                                 ))}
@@ -476,10 +488,6 @@ export function FDDApplicationDetails() {
                                     <p className="font-bold text-slate-800">{application.email}</p>
                                     <p className="text-slate-500 font-medium">{application.phone}</p>
                                 </div>
-                                <div className="space-y-1 pt-4 border-t border-slate-50 text-xs">
-                                    <p className="text-[10px] font-bold text-slate-400 uppercase tracking-wider">FDD Due Date</p>
-                                    <p className="font-bold text-slate-800">April 25, 2026</p>
-                                </div>
                             </CardContent>
                         </Card>
 
@@ -516,19 +524,52 @@ export function FDDApplicationDetails() {
                     </div>
                     <div className="p-8 space-y-4">
                         <DialogHeader>
-                            <DialogTitle className="text-2xl font-bold text-slate-900 text-center">Finalize Audit Report</DialogTitle>
+                            <DialogTitle className="text-2xl font-bold text-slate-900 text-center">Submit Audit Report</DialogTitle>
                             <DialogDescription className="text-slate-500 text-center pt-2 leading-relaxed text-base">
-                                You are about to submit your final findings. This action will <span className="font-bold text-slate-800 underline decoration-amber-500 decoration-2">lock the report</span> and move the application to the next stage.
+                                You are about to submit your final findings. This action will <span className="font-bold text-slate-800 underline decoration-amber-500 decoration-2">notify the Admin</span> for review and approval.
                             </DialogDescription>
                         </DialogHeader>
                         
                         <div className="bg-amber-50 p-4 rounded-xl flex gap-3 border border-amber-100 italic">
                             <Info className="w-5 h-5 text-amber-600 shrink-0 mt-0.5" />
                             <p className="text-xs text-amber-800 leading-normal">
-                                Ensure all required financial documents are uploaded and verified before proceeding.
+                                Once submitted, you cannot edit the findings. Ensure all documents are uploaded.
                             </p>
                         </div>
 
+                        <div className="space-y-4 pt-2">
+                            <div className="space-y-2">
+                                <Label className="text-[10px] font-black uppercase tracking-widest text-slate-400">Auditor Recommendation</Label>
+                                <div className="flex gap-2">
+                                    {['Recommended', 'Qualified with Observations', 'Not Recommended'].map((rec) => (
+                                        <Button
+                                            key={rec}
+                                            variant={fddAuditRecommendation === rec ? 'default' : 'outline'}
+                                            className={cn(
+                                                "flex-1 h-10 font-bold text-[9px] uppercase tracking-wider rounded-xl transition-all",
+                                                fddAuditRecommendation === rec && rec === 'Recommended' && "bg-emerald-600 hover:bg-emerald-700",
+                                                fddAuditRecommendation === rec && rec === 'Qualified with Observations' && "bg-amber-500 hover:bg-amber-600",
+                                                fddAuditRecommendation === rec && rec === 'Not Recommended' && "bg-red-600 hover:bg-red-700"
+                                            )}
+                                            onClick={() => setFddAuditRecommendation(rec)}
+                                        >
+                                            {rec}
+                                        </Button>
+                                    ))}
+                                </div>
+                            </div>
+
+                            <div className="space-y-2">
+                                <Label className="text-[10px] font-black uppercase tracking-widest text-slate-400">Detailed Audit Findings & Remarks</Label>
+                                <Textarea
+                                    placeholder="Enter detailed financial observations..."
+                                    className="min-h-[120px] bg-slate-50 border-slate-200 rounded-xl focus:ring-amber-500 text-sm resize-none"
+                                    value={fddAuditFindings}
+                                    onChange={(e) => setFddAuditFindings(e.target.value)}
+                                />
+                            </div>
+                        </div>
+
                         <DialogFooter className="flex flex-col sm:flex-row gap-3 pt-4 sm:pt-6">
                             <Button 
                                 variant="outline" 
@@ -542,19 +583,26 @@ export function FDDApplicationDetails() {
                                 className="w-full sm:flex-1 h-12 rounded-xl font-bold bg-slate-950 hover:bg-slate-900 text-white shadow-lg shadow-slate-200 transition-all active:scale-95 border-b-2 border-amber-600"
                                 onClick={async () => {
                                     try {
+                                        if (!fddAuditFindings.trim()) {
+                                            toast.error('Please provide findings.');
+                                            return;
+                                        }
+                                        if (!assignment?.id) {
+                                            toast.error('Assignment not found.');
+                                            return;
+                                        }
+
                                         setUploading(true);
-                                        const res: any = await API.submitStageDecision({
-                                            applicationId: application.id,
-                                            stageCode: 'FDD_VERIFICATION',
-                                            decision: 'Approved',
-                                            remarks: 'FDD Verification completed and report uploaded.',
-                                            nextStatus: 'LOI In Progress',
-                                            nextProgress: 65
+                                        const res: any = await API.submitFddReport({
+                                            assignmentId: assignment.id,
+                                            findings: fddAuditFindings,
+                                            recommendation: fddAuditRecommendation
                                         });
+
                                         if (res.data?.success) {
                                             toast.success('FDD Report submitted successfully.');
                                             setShowFinalizeModal(false);
-                                            navigate('/fdd-dashboard');
+                                            fetchApplication();
                                         }
                                     } catch (e) { 
                                         toast.error('Failed to submit report'); 
@@ -608,15 +656,14 @@ export function FDDApplicationDetails() {
                                 onClick={async () => {
                                     try {
                                         setUploading(true);
-                                        await API.submitStageDecision({
-                                            applicationId: application.id,
-                                            stageCode: 'FDD_VERIFICATION',
-                                            decision: 'Rejected',
-                                            remarks: 'Applicant is non-responsive to FDD queries.'
+                                        await API.addWorknote({
+                                            requestId: id,
+                                            requestType: 'application',
+                                            content: 'FLAGGED: Applicant is non-responsive to FDD queries.'
                                         });
-                                        toast.error('Application flagged and returned to admin.');
+                                        toast.error('Application flagged for non-responsiveness.');
                                         setShowFlagModal(false);
-                                        navigate('/fdd-dashboard');
+                                        fetchApplication();
                                     } catch (e) { 
                                         toast.error('Action failed'); 
                                     } finally { 
diff --git a/src/components/applications/FinanceFnFDetailsPage.tsx b/src/components/applications/FinanceFnFDetailsPage.tsx
index c3bddc5..313a129 100644
--- a/src/components/applications/FinanceFnFDetailsPage.tsx
+++ b/src/components/applications/FinanceFnFDetailsPage.tsx
@@ -12,7 +12,7 @@ import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '.
 import { Progress } from '../ui/progress';
 import { 
   ArrowLeft,
-  DollarSign, 
+  IndianRupee, 
   CheckCircle, 
   XCircle, 
   Upload,
@@ -461,7 +461,7 @@ export function FinanceFnFDetailsPage({ fnfId, onBack }: FinanceFnFDetailsPagePr
           <div className="flex items-center justify-between">
             <div className="flex items-center gap-3">
               <div className="w-12 h-12 rounded-full bg-amber-100 flex items-center justify-center">
-                <DollarSign className="w-6 h-6 text-amber-600" />
+                    <IndianRupee className="w-5 h-5" />
               </div>
               <div>
                 <p className="text-slate-900">Settlement Pending Finance Approval</p>
@@ -624,7 +624,7 @@ export function FinanceFnFDetailsPage({ fnfId, onBack }: FinanceFnFDetailsPagePr
               <Card>
                 <CardHeader>
                   <CardTitle className="flex items-center gap-2">
-                    <DollarSign className="w-5 h-5" />
+                    <IndianRupee className="w-5 h-5" />
                     Settlement Calculation Summary
                   </CardTitle>
                 </CardHeader>
diff --git a/src/components/applications/FinanceOnboardingPage.tsx b/src/components/applications/FinanceOnboardingPage.tsx
index 19d8a35..a54fdde 100644
--- a/src/components/applications/FinanceOnboardingPage.tsx
+++ b/src/components/applications/FinanceOnboardingPage.tsx
@@ -1,5 +1,5 @@
 import { useState, useEffect } from 'react';
-import { Card, CardContent, CardDescription } from '../ui/card';
+import { Card, CardContent } from '../ui/card';
 import { Badge } from '../ui/badge';
 import { Button } from '../ui/button';
 import {
@@ -11,13 +11,10 @@ import {
   TableRow,
 } from '../ui/table';
 import { 
-  DollarSign, 
+  IndianRupee, 
   CheckCircle, 
   Clock, 
-  FileText,
-  Calendar,
   CreditCard,
-  ShieldCheck
 } from 'lucide-react';
 import { toast } from 'sonner';
 import { onboardingService } from '../../services/onboarding.service';
@@ -27,10 +24,9 @@ interface FinanceOnboardingPageProps {
   onViewAuditDetails?: (applicationId: string) => void;
 }
 
-export function FinanceOnboardingPage({ onViewPaymentDetails, onViewAuditDetails }: FinanceOnboardingPageProps = {}) {
+export function FinanceOnboardingPage({ onViewPaymentDetails }: FinanceOnboardingPageProps = {}) {
   const [applications, setApplications] = useState<any[]>([]);
   const [loading, setLoading] = useState(true);
-  const [activeTab, setActiveTab] = useState<'payments' | 'audits'>('payments');
   const [filterStatus, setFilterStatus] = useState<'all' | 'pending' | 'verified'>('pending');
 
   useEffect(() => {
@@ -58,12 +54,6 @@ export function FinanceOnboardingPage({ onViewPaymentDetails, onViewAuditDetails
     return deposit ? deposit.status : 'Awaiting Payment';
   };
 
-  const getFddApprovalStatus = (app: any) => {
-    // Check for Finance approval record specifically in LOI_APPROVAL stage
-    const financeApproval = app.stageApprovals?.find((a: any) => a.stageCode === 'LOI_APPROVAL' && a.actorRole === 'Finance');
-    return financeApproval ? financeApproval.decision : 'Pending Review';
-  };
-
   // Filter for Payment Mode
   const paymentApps = applications.filter((app: any) => {
     const s = app.overallStatus || app.status;
@@ -73,41 +63,20 @@ export function FinanceOnboardingPage({ onViewPaymentDetails, onViewAuditDetails
     ].includes(s);
   });
 
-  // Filter for FDD Audit Mode
-  const auditApps = applications.filter((app: any) => {
-    const s = app.overallStatus || app.status;
-    return s === 'LOI In Progress' || s === 'FDD Verification' || s === 'LOI_APPROVAL';
+  const displayApps = paymentApps.filter(app => {
+    const status = getRelevantPaymentStatus(app);
+    if (filterStatus === 'all') return true;
+    if (filterStatus === 'pending') return status !== 'Verified';
+    if (filterStatus === 'verified') return status === 'Verified';
+    return true;
   });
 
-  const displayApps = activeTab === 'payments' 
-    ? paymentApps.filter(app => {
-        const status = getRelevantPaymentStatus(app);
-        if (filterStatus === 'all') return true;
-        if (filterStatus === 'pending') return status !== 'Verified';
-        if (filterStatus === 'verified') return status === 'Verified';
-        return true;
-      })
-    : auditApps.filter(app => {
-        const status = getFddApprovalStatus(app);
-        if (filterStatus === 'all') return true;
-        if (filterStatus === 'pending') return status !== 'Approved';
-        if (filterStatus === 'verified') return status === 'Approved';
-        return true;
-      });
-
   const handleAction = (appId: string) => {
-    if (activeTab === 'audits') {
-      if (onViewAuditDetails) {
-        onViewAuditDetails(appId);
-      }
-    } else if (onViewPaymentDetails) {
+    if (onViewPaymentDetails) {
       onViewPaymentDetails(appId);
     }
   };
 
-  const pendingPayments = paymentApps.filter(app => getRelevantPaymentStatus(app) !== 'Verified').length;
-  const pendingAudits = auditApps.filter(app => getFddApprovalStatus(app) !== 'Approved').length;
-
   if (loading) {
     return (
       <div className="flex items-center justify-center p-20 text-blue-600">
@@ -122,8 +91,8 @@ export function FinanceOnboardingPage({ onViewPaymentDetails, onViewAuditDetails
       {/* Header */}
       <div className="flex items-center justify-between bg-white p-6 rounded-2xl border border-slate-100 shadow-sm">
         <div>
-          <h1 className="text-3xl font-bold text-slate-900 tracking-tight mb-1">Financial Operations</h1>
-          <p className="text-slate-500">Manage payment verifications and FDD audit report reviews</p>
+          <h1 className="text-3xl font-bold text-slate-900 tracking-tight mb-1">Payment Verification</h1>
+          <p className="text-slate-500">Review and verify dealer security deposits and first fill payments</p>
         </div>
         <div className="flex items-center gap-3">
            <Button onClick={fetchApplications} variant="outline" size="sm" className="bg-white hover:bg-slate-50">
@@ -133,25 +102,13 @@ export function FinanceOnboardingPage({ onViewPaymentDetails, onViewAuditDetails
         </div>
       </div>
 
-      {/* Mode Switcher */}
+      {/* Mode Switcher - Simplified */}
       <div className="flex flex-col sm:flex-row items-start sm:items-center justify-between gap-4">
         <div className="inline-flex p-1 bg-slate-100 rounded-xl">
-          <Button
-            variant={activeTab === 'payments' ? 'default' : 'ghost'}
-            className={activeTab === 'payments' ? 'rounded-lg bg-white text-slate-900 shadow-sm hover:bg-white' : 'rounded-lg text-slate-600'}
-            onClick={() => { setActiveTab('payments'); setFilterStatus('pending'); }}
-          >
-            <DollarSign className="w-4 h-4 mr-2" />
-            Payments ({pendingPayments})
-          </Button>
-          <Button
-            variant={activeTab === 'audits' ? 'default' : 'ghost'}
-            className={activeTab === 'audits' ? 'rounded-lg bg-white text-slate-900 shadow-sm hover:bg-white' : 'rounded-lg text-slate-600'}
-            onClick={() => { setActiveTab('audits'); setFilterStatus('pending'); }}
-          >
-            <FileText className="w-4 h-4 mr-2" />
-            FDD Audit Reviews ({pendingAudits})
-          </Button>
+          <div className="flex items-center px-4 py-2 bg-white rounded-lg text-slate-900 shadow-sm font-medium text-sm">
+            <IndianRupee className="w-4 h-4 mr-2 text-blue-600" />
+            Pending Payments ({paymentApps.filter(a => getRelevantPaymentStatus(a) !== 'Verified').length})
+          </div>
         </div>
 
         <div className="flex gap-2">
@@ -190,7 +147,7 @@ export function FinanceOnboardingPage({ onViewPaymentDetails, onViewAuditDetails
               <TableRow className="border-b border-slate-100 uppercase text-[10px] tracking-wider font-bold text-slate-400">
                 <TableHead className="py-4 pl-6">Application Details</TableHead>
                 <TableHead>Location</TableHead>
-                <TableHead>{activeTab === 'payments' ? 'Payment Stage' : 'Audit Stage'}</TableHead>
+                <TableHead>Payment Stage</TableHead>
                 <TableHead>Current Status</TableHead>
                 <TableHead className="text-right pr-6">Workflow Action</TableHead>
               </TableRow>
@@ -198,7 +155,7 @@ export function FinanceOnboardingPage({ onViewPaymentDetails, onViewAuditDetails
             <TableBody>
               {displayApps.length > 0 ? (
                 displayApps.map((app) => {
-                  const statusLabel = activeTab === 'payments' ? getRelevantPaymentStatus(app) : getFddApprovalStatus(app);
+                  const statusLabel = getRelevantPaymentStatus(app);
                   return (
                     <TableRow key={app.id} className="hover:bg-blue-50/20 group transition-all">
                       <TableCell className="py-4 pl-6">
@@ -217,25 +174,16 @@ export function FinanceOnboardingPage({ onViewPaymentDetails, onViewAuditDetails
                       </TableCell>
                       <TableCell>
                          <div className="flex items-center gap-2">
-                          {activeTab === 'payments' ? (
-                            <>
-                              <CreditCard className="w-4 h-4 text-slate-400" />
-                              <span className="text-sm font-medium">
-                                {app.overallStatus === 'LOI Issued' || app.overallStatus === 'Security Details' ? 'Initial (₹2L)' : 'Final (₹15L)'}
-                              </span>
-                            </>
-                          ) : (
-                            <>
-                              <ShieldCheck className="w-4 h-4 text-slate-400" />
-                              <span className="text-sm font-medium">FDD Report Approval</span>
-                            </>
-                          )}
+                           <CreditCard className="w-4 h-4 text-slate-400" />
+                           <span className="text-sm font-medium">
+                             { (app.overallStatus === 'LOI Issued' || app.overallStatus === 'Security Details' || app.overallStatus === 'LOI In Progress') ? 'Security Deposit (₹5L)' : 'First Fill (₹15L)'}
+                           </span>
                         </div>
                       </TableCell>
                       <TableCell>
                         <Badge
                           className={
-                            statusLabel === 'Verified' || statusLabel === 'Approved' ? 'bg-emerald-50 text-emerald-700 border-emerald-100 px-3 py-1 rounded-full' :
+                            statusLabel === 'Verified' ? 'bg-emerald-50 text-emerald-700 border-emerald-100 px-3 py-1 rounded-full' :
                             statusLabel === 'Rejected' ? 'bg-rose-50 text-rose-700 border-rose-100 px-3 py-1 rounded-full' :
                             'bg-amber-50 text-amber-700 border-amber-100 px-3 py-1 rounded-full'
                           }
@@ -247,23 +195,16 @@ export function FinanceOnboardingPage({ onViewPaymentDetails, onViewAuditDetails
                       <TableCell className="text-right pr-6">
                         <Button 
                           size="sm" 
-                          variant={statusLabel === 'Verified' || statusLabel === 'Approved' ? 'outline' : 'default'}
-                          className={statusLabel !== 'Verified' && statusLabel !== 'Approved' 
-                            ? (activeTab === 'payments' ? 'bg-blue-600 hover:bg-blue-700' : 'bg-indigo-600 hover:bg-indigo-700 shadow-md') 
+                          variant={statusLabel === 'Verified' ? 'outline' : 'default'}
+                          className={statusLabel !== 'Verified' 
+                            ? 'bg-blue-600 hover:bg-blue-700 shadow-md' 
                             : 'bg-white text-slate-600 border-slate-200'}
                           onClick={() => handleAction(app.applicationId || app.id)}
                         >
-                          {activeTab === 'payments' ? (
                             <>
-                              <DollarSign className="w-4 h-4 mr-2" />
+                                                <IndianRupee className="w-4 h-4 mr-2" />
                               {statusLabel === 'Verified' ? 'View Receipt' : 'Record Payment'}
                             </>
-                          ) : (
-                            <>
-                              <ShieldCheck className="w-4 h-4 mr-2" />
-                              {statusLabel === 'Approved' ? 'View Decision' : 'Review Audit'}
-                            </>
-                          )}
                         </Button>
                       </TableCell>
                     </TableRow>
@@ -271,12 +212,12 @@ export function FinanceOnboardingPage({ onViewPaymentDetails, onViewAuditDetails
                 })
               ) : (
                 <TableRow>
-                  <TableCell colSpan={6} className="h-48 text-center text-slate-400">
+                  <TableCell colSpan={5} className="h-48 text-center text-slate-400">
                     <div className="flex flex-col items-center gap-3">
                       <div className="w-12 h-12 bg-slate-50 rounded-full flex items-center justify-center">
                         <CheckCircle className="w-6 h-6 text-slate-200" />
                       </div>
-                      <p className="text-sm">No applications pending in the {activeTab} queue</p>
+                      <p className="text-sm">No applications pending in the queue</p>
                     </div>
                   </TableCell>
                 </TableRow>
diff --git a/src/components/applications/FinancePaymentDetailsPage.tsx b/src/components/applications/FinancePaymentDetailsPage.tsx
index fb909de..6218ccc 100644
--- a/src/components/applications/FinancePaymentDetailsPage.tsx
+++ b/src/components/applications/FinancePaymentDetailsPage.tsx
@@ -7,7 +7,7 @@ import { Label } from '../ui/label';
 import { Textarea } from '../ui/textarea';
 import {
   ArrowLeft,
-  DollarSign,
+  IndianRupee,
   CheckCircle,
   XCircle,
   FileText,
@@ -63,8 +63,8 @@ export function FinancePaymentDetailsPage({ applicationId, onBack }: FinancePaym
         verificationRemarks: activeDeposit.remarks || ''
       });
     } else {
-      const initialDefault = configs.INITIAL_SECURITY_DEPOSIT?.amount || 500000;
-      const finalDefault = configs.FINAL_SECURITY_DEPOSIT?.amount || 1500000;
+      const initialDefault = configs.SECURITY_DEPOSIT?.amount || 500000;
+      const finalDefault = configs.FIRST_FILL?.amount || 1500000;
 
       setPaymentDetails({
         verificationTransactionId: '',
@@ -110,7 +110,7 @@ export function FinancePaymentDetailsPage({ applicationId, onBack }: FinancePaym
         status: 'Verified'
       });
 
-      toast.success(`${activeType === 'INITIAL' ? 'Advance' : 'Final'} payment verified and approved`);
+      toast.success(`${activeType === 'INITIAL' ? 'Security Deposit' : 'First Fill'} verified and approved`);
       await fetchData();
     } catch (error) {
       toast.error('Failed to verify payment');
@@ -134,7 +134,7 @@ export function FinancePaymentDetailsPage({ applicationId, onBack }: FinancePaym
         remarks: paymentDetails.verificationRemarks
       });
 
-      toast.error(`${activeType === 'INITIAL' ? 'Advance' : 'Final'} payment rejected`);
+      toast.error(`${activeType === 'INITIAL' ? 'Security Deposit' : 'First Fill'} rejected`);
       await fetchData();
     } catch (error) {
       toast.error('Failed to reject payment');
@@ -171,7 +171,7 @@ export function FinancePaymentDetailsPage({ applicationId, onBack }: FinancePaym
               className={activeType === 'INITIAL' ? 'bg-amber-600 hover:bg-amber-700' : ''}
               onClick={() => setActiveType('INITIAL')}
             >
-              Advance Payment
+              Security Deposit
             </Button>
             <Button
               size="sm"
@@ -179,7 +179,7 @@ export function FinancePaymentDetailsPage({ applicationId, onBack }: FinancePaym
               className={activeType === 'FINAL' ? 'bg-amber-600 hover:bg-amber-700' : ''}
               onClick={() => setActiveType('FINAL')}
             >
-              Final Security Deposit
+              First Fill
             </Button>
           </div>
         </div>
@@ -201,7 +201,7 @@ export function FinancePaymentDetailsPage({ applicationId, onBack }: FinancePaym
                   activeDeposit?.status === 'Rejected' ? "bg-red-100" :
                     "bg-amber-100"
               )}>
-                <DollarSign className={cn(
+                <IndianRupee className={cn(
                   "w-6 h-6",
                   activeDeposit?.status === 'Verified' ? "text-green-600" :
                     activeDeposit?.status === 'Rejected' ? "text-red-600" :
@@ -210,7 +210,7 @@ export function FinancePaymentDetailsPage({ applicationId, onBack }: FinancePaym
               </div>
               <div>
                 <p className="text-slate-900 font-bold">
-                  {activeType === 'INITIAL' ? 'Advance Payment' : 'Final Security Deposit'}
+                  {activeType === 'INITIAL' ? 'Security Deposit' : 'First Fill'}
                 </p>
                 <p className="text-sm text-slate-600">
                   {activeDeposit?.status === 'Verified'
@@ -275,8 +275,8 @@ export function FinancePaymentDetailsPage({ applicationId, onBack }: FinancePaym
                   <Label className="text-slate-500 block mb-1">Expected Amount</Label>
                   <p className="text-2xl font-bold text-amber-900">
                     ₹{(activeType === 'INITIAL'
-                      ? (configs.INITIAL_SECURITY_DEPOSIT?.amount || 500000)
-                      : (configs.FINAL_SECURITY_DEPOSIT?.amount || 1500000)
+                      ? (configs.SECURITY_DEPOSIT?.amount || 500000)
+                      : (configs.FIRST_FILL?.amount || 1500000)
                     ).toLocaleString()}
                   </p>
                 </div>
@@ -320,14 +320,14 @@ export function FinancePaymentDetailsPage({ applicationId, onBack }: FinancePaym
             <CardContent>
               {application.uploadedDocuments?.filter((d: any) =>
                 activeType === 'INITIAL'
-                  ? d.documentType?.toLowerCase().includes('initial') && d.documentType?.toLowerCase().includes('deposit')
-                  : d.documentType?.toLowerCase().includes('final') && d.documentType?.toLowerCase().includes('deposit')
+                  ? d.documentType?.toLowerCase().includes('security') && d.documentType?.toLowerCase().includes('deposit')
+                  : d.documentType?.toLowerCase().includes('first') && d.documentType?.toLowerCase().includes('fill')
               ).length > 0 ? (
                 <div className="space-y-3">
                   {application.uploadedDocuments.filter((d: any) =>
                     activeType === 'INITIAL'
-                      ? d.documentType?.toLowerCase().includes('initial') && d.documentType?.toLowerCase().includes('deposit')
-                      : d.documentType?.toLowerCase().includes('final') && d.documentType?.toLowerCase().includes('deposit')
+                      ? d.documentType?.toLowerCase().includes('security') && d.documentType?.toLowerCase().includes('deposit')
+                      : d.documentType?.toLowerCase().includes('first') && d.documentType?.toLowerCase().includes('fill')
                   ).map((doc: any, index: number) => (
                     <div key={index} className="flex items-center justify-between p-3 bg-white rounded-lg border border-slate-200 hover:shadow-sm transition-shadow">
                       <div className="flex items-center gap-3">
@@ -471,6 +471,7 @@ export function FinancePaymentDetailsPage({ applicationId, onBack }: FinancePaym
                 <li>Applicant status will advance to {activeType === 'INITIAL' ? 'LOI Issuance' : 'LOA Approval'}</li>
                 <li>Email notification will be sent to Applicant</li>
                 <li>Digital {activeType === 'INITIAL' ? 'LOI' : 'LOA'} generation will be unlocked</li>
+                <li>This payment confirms the {activeType === 'INITIAL' ? 'Security Deposit' : 'First Fill'}</li>
               </ul>
             </CardContent>
           </Card>
diff --git a/src/components/applications/FnFPage.tsx b/src/components/applications/FnFPage.tsx
index b508177..e71dcd0 100644
--- a/src/components/applications/FnFPage.tsx
+++ b/src/components/applications/FnFPage.tsx
@@ -1,5 +1,5 @@
 import { useState, useEffect } from 'react';
-import { DollarSign, Calendar, Eye, Send, FileCheck, Loader2 } from 'lucide-react';
+import { IndianRupee, Calendar, Eye, Send, FileCheck, Loader2 } from 'lucide-react';
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '../ui/card';
 import { Badge } from '../ui/badge';
 import { Button } from '../ui/button';
@@ -279,15 +279,15 @@ export function FnFPage({ currentUser, onViewDetails }: FnFPageProps) {
                         <div className="flex items-start gap-4 flex-1">
                           <div className={`p-3 rounded-lg ${
                             fnfCase.status === 'New' ? 'bg-blue-100' :
-                            fnfCase.status === 'In Progress' ? 'bg-yellow-100' :
-                            fnfCase.status === 'Under Review' ? 'bg-orange-100' :
-                            'bg-green-100'
+                              fnfCase.status === 'In Progress' ? 'bg-yellow-100' :
+                                fnfCase.status === 'Under Review' ? 'bg-orange-100' :
+                                  'bg-green-100'
                           }`}>
-                            <DollarSign className={`w-6 h-6 ${
+                            <IndianRupee className={`w-6 h-6 ${
                               fnfCase.status === 'New' ? 'text-blue-600' :
-                              fnfCase.status === 'In Progress' ? 'text-yellow-600' :
-                              fnfCase.status === 'Under Review' ? 'text-orange-600' :
-                              'text-green-600'
+                                fnfCase.status === 'In Progress' ? 'text-yellow-600' :
+                                  fnfCase.status === 'Under Review' ? 'text-orange-600' :
+                                    'text-green-600'
                             }`} />
                           </div>
                           <div className="flex-1">
@@ -359,7 +359,7 @@ export function FnFPage({ currentUser, onViewDetails }: FnFPageProps) {
                         <div className="flex items-start justify-between">
                           <div className="flex items-start gap-4 flex-1">
                             <div className="p-3 bg-yellow-100 rounded-lg">
-                              <DollarSign className="w-6 h-6 text-yellow-600" />
+                              <IndianRupee className="w-6 h-6 text-yellow-600" />
                             </div>
                             <div className="flex-1">
                               <div className="flex items-center gap-3 mb-2">
@@ -404,7 +404,7 @@ export function FnFPage({ currentUser, onViewDetails }: FnFPageProps) {
                   ))}
                 {displaySettlements.filter((c: any) => c.status === 'In Progress').length === 0 && (
                   <div className="text-center py-12 text-slate-500">
-                    <DollarSign className="w-12 h-12 mx-auto mb-4 text-slate-400" />
+                    <IndianRupee className="w-12 h-12 mx-auto mb-4 text-slate-400" />
                     <p>No cases in progress</p>
                   </div>
                 )}
@@ -422,7 +422,7 @@ export function FnFPage({ currentUser, onViewDetails }: FnFPageProps) {
                         <div className="flex items-start justify-between">
                           <div className="flex items-start gap-4 flex-1">
                             <div className="p-3 bg-orange-100 rounded-lg">
-                              <DollarSign className="w-6 h-6 text-orange-600" />
+                              <IndianRupee className="w-6 h-6 text-orange-600" />
                             </div>
                             <div className="flex-1">
                               <div className="flex items-center gap-3 mb-2">
@@ -469,7 +469,7 @@ export function FnFPage({ currentUser, onViewDetails }: FnFPageProps) {
                   ))}
                 {displaySettlements.filter(c => c.status === 'Under Review' || c.status === 'Calculated').length === 0 && (
                   <div className="text-center py-12 text-slate-500">
-                    <DollarSign className="w-12 h-12 mx-auto mb-4 text-slate-400" />
+                    <IndianRupee className="w-12 h-12 mx-auto mb-4 text-slate-400" />
                     <p>No cases under review</p>
                   </div>
                 )}
diff --git a/src/components/applications/ProspectiveApplicationDetails.tsx b/src/components/applications/ProspectiveApplicationDetails.tsx
index eb92d00..eff4ef0 100644
--- a/src/components/applications/ProspectiveApplicationDetails.tsx
+++ b/src/components/applications/ProspectiveApplicationDetails.tsx
@@ -195,8 +195,8 @@ export function ProspectiveApplicationDetails({ id, onBack }: Props) {
                                             <option value="PAN Card">PAN Card</option>
                                             <option value="GST Certificate">GST Certificate</option>
                                             <option value="Aadhaar Card">Aadhaar Card</option>
-                                            <option value="Initial Security Deposit Receipt">Initial Security Deposit Receipt</option>
-                                            <option value="Final Security Deposit Receipt">Final Security Deposit Receipt</option>
+                                            <option value="Security Deposit Receipt">Security Deposit Receipt</option>
+                                            <option value="First Fill Receipt">First Fill Receipt</option>
                                             <option value="Partnership Deed">Partnership Deed</option>
                                             <option value="LLP Agreement">LLP Agreement</option>
                                             <option value="Certificate of Incorporation">Certificate of Incorporation</option>
diff --git a/src/components/dashboard/FDDDashboardPage.tsx b/src/components/dashboard/FDDDashboardPage.tsx
index 1aae74f..bedefaf 100644
--- a/src/components/dashboard/FDDDashboardPage.tsx
+++ b/src/components/dashboard/FDDDashboardPage.tsx
@@ -162,7 +162,7 @@ export function FDDDashboardPage() {
                                         <tr 
                                             key={app.id} 
                                             className="hover:bg-slate-50 transition-colors cursor-pointer group"
-                                            onClick={() => navigate(`/applications/${app.id}`)}
+                                            onClick={() => navigate(`/fdd-details/${app.id}`)}
                                         >
                                             <td className="px-6 py-4">
                                                 <div className="flex items-center gap-3">
diff --git a/src/components/dashboard/FinanceDashboard.tsx b/src/components/dashboard/FinanceDashboard.tsx
index 6f0d7b1..1a8d1e8 100644
--- a/src/components/dashboard/FinanceDashboard.tsx
+++ b/src/components/dashboard/FinanceDashboard.tsx
@@ -1,4 +1,4 @@
-import { DollarSign, FileText, CheckCircle, Plus, Trash2, Save, Calculator, Clock, TrendingUp, TrendingDown, ShieldCheck } from 'lucide-react';
+import { IndianRupee, FileText, CheckCircle, Plus, Trash2, Save, Calculator, Clock, TrendingUp, TrendingDown } from 'lucide-react';
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '../ui/card';
 import { Badge } from '../ui/badge';
 import { Button } from '../ui/button';
@@ -78,7 +78,7 @@ export function FinanceDashboard({ onNavigate, onViewPaymentDetails, onViewAudit
         const stage = app.currentStage;
         return [
           'LOI In Progress', 'LOI Issued', 'LOA Pending', 'Dealer Code Generation',
-          'LOI_APPROVAL', 'LOA_APPROVAL', 'PAYMENT_VERIFICATION', 'SECURITY_DEPOSIT',
+          'LOA_APPROVAL', 'PAYMENT_VERIFICATION', 'SECURITY_DEPOSIT',
           'EOR Complete', 'Inauguration', 'Approved', 'Onboarded'
         ].includes(s) || stage === 'Finance';
       });
@@ -171,7 +171,7 @@ export function FinanceDashboard({ onNavigate, onViewPaymentDetails, onViewAudit
 
   const pendingOnboarding = applications.filter(app => getRelevantPaymentStatus(app) !== 'Verified');
   const verifiedOnboarding = applications.filter(app => getRelevantPaymentStatus(app) === 'Verified');
-  const pendingAudits = applications.filter(app => app.status === 'LOI_APPROVAL' || app.overallStatus === 'LOI In Progress');
+  const pendingAudits = applications.filter(app => app.status === 'FDD_VERIFICATION' || app.overallStatus === 'FDD Verification');
   const pendingFnF = mockFnFCases.filter(f => !f.hasFinanceSummary);
   const completedFnF = mockFnFCases.filter(f => f.hasFinanceSummary);
 
@@ -289,7 +289,7 @@ export function FinanceDashboard({ onNavigate, onViewPaymentDetails, onViewAudit
       <Tabs defaultValue="onboarding" className="w-full">
         <TabsList className="grid w-full grid-cols-2">
           <TabsTrigger value="onboarding">
-            <DollarSign className="w-4 h-4 mr-2" />
+            <IndianRupee className="w-4 h-4 mr-2" />
             Onboarding
           </TabsTrigger>
           <TabsTrigger value="fnf">
@@ -343,7 +343,7 @@ export function FinanceDashboard({ onNavigate, onViewPaymentDetails, onViewAudit
                                 <div>
                                   <p className="text-slate-600">Stage</p>
                                   <p className="text-amber-700 font-bold">
-                                     {app.status === 'LOI_APPROVAL' || app.status === 'PAYMENT_VERIFICATION' ? 'Initial Deposit' : 'Final Deposit'}
+                                     {app.status === 'PAYMENT_VERIFICATION' ? 'Security Deposit' : 'First Fill'}
                                   </p>
                                 </div>
                                 <div>
@@ -365,33 +365,18 @@ export function FinanceDashboard({ onNavigate, onViewPaymentDetails, onViewAudit
                                 <FileText className="w-4 h-4 mr-2" />
                                 View Details
                               </Button>
-                              {app.status === 'LOI_APPROVAL' || app.overallStatus === 'LOI In Progress' ? (
-                                <Button 
-                                  size="sm"
-                                  className="bg-amber-600 hover:bg-amber-700 font-bold"
-                                  onClick={() => {
-                                    if (onViewAuditDetails) {
-                                      onViewAuditDetails(app.applicationId || app.id);
-                                    }
-                                  }}
-                                >
-                                  <ShieldCheck className="w-4 h-4 mr-2" />
-                                  Review Audit
-                                </Button>
-                              ) : (
-                                <Button 
-                                  size="sm"
-                                  className="bg-green-600 hover:bg-green-700 font-bold"
-                                  onClick={() => {
-                                    if (onViewPaymentDetails) {
-                                      onViewPaymentDetails(app.applicationId || app.id);
-                                    }
-                                  }}
-                                >
-                                  <CheckCircle className="w-4 h-4 mr-2" />
-                                  Verify Payment
-                                </Button>
-                              )}
+                              <Button 
+                                size="sm"
+                                className="bg-green-600 hover:bg-green-700 font-bold"
+                                onClick={() => {
+                                  if (onViewPaymentDetails) {
+                                    onViewPaymentDetails(app.applicationId || app.id);
+                                  }
+                                }}
+                              >
+                                <CheckCircle className="w-4 h-4 mr-2" />
+                                Verify Payment
+                              </Button>
                             </div>
                           </div>
                         </CardContent>
diff --git a/src/components/ui/DocumentPreviewModal.tsx b/src/components/ui/DocumentPreviewModal.tsx
index f6632f9..7946c1e 100644
--- a/src/components/ui/DocumentPreviewModal.tsx
+++ b/src/components/ui/DocumentPreviewModal.tsx
@@ -42,7 +42,7 @@ export const DocumentPreviewModal: React.FC<DocumentPreviewModalProps> = ({
 
   return (
     <Dialog open={isOpen} onOpenChange={onClose}>
-      <DialogContent className="max-w-4xl h-[85vh] flex flex-col p-0 overflow-hidden bg-white shadow-2xl border-none">
+      <DialogContent className="max-w-[80vw] w-[80vw] h-[85vh] flex flex-col p-0 overflow-hidden bg-white shadow-2xl border-none">
         {document ? (
           <>
             <div className="flex items-center justify-between p-4 border-b bg-slate-50">
diff --git a/src/services/onboarding.service.ts b/src/services/onboarding.service.ts
index 542ad23..ab251a9 100644
--- a/src/services/onboarding.service.ts
+++ b/src/services/onboarding.service.ts
@@ -160,5 +160,20 @@ export const onboardingService = {
         const response: any = await API.updateApplication(id, data);
         if (!response.ok) throw new Error(response.data?.message || 'Failed to update application');
         return response.data;
+    },
+    submitFddReport: async (data: any) => {
+        const response: any = await API.submitFddReport(data);
+        if (!response.ok) throw new Error(response.data?.message || 'Failed to submit FDD report');
+        return response.data;
+    },
+    getFddAssignment: async (applicationId: string) => {
+        const response: any = await API.getFddAssignment(applicationId);
+        if (!response.ok) throw new Error(response.data?.message || 'Failed to fetch FDD assignment');
+        return response.data;
+    },
+    assignFddAgency: async (data: any) => {
+        const response: any = await API.assignFddAgency(data);
+        if (!response.ok) throw new Error(response.data?.message || 'Failed to assign FDD agency');
+        return response.data;
     }
 };