diff --git a/packages/esm-report-app/src/registers/MOH-405/MOH_405_component.tsx b/packages/esm-report-app/src/registers/MOH-405/MOH_405_component.tsx
index fc8d6f83..b0b5a1b0 100644
--- a/packages/esm-report-app/src/registers/MOH-405/MOH_405_component.tsx
+++ b/packages/esm-report-app/src/registers/MOH-405/MOH_405_component.tsx
@@ -307,88 +307,97 @@ const RenderMOH405: React.FC<{ reportData: any }> = ({ reportData }) => (
           </TableRow>
         </TableHead>
         <TableBody>
-          {Array.from({ length: 2 }, (_, i) => (
-            <React.Fragment key={i}>
-              <TableRow>
-                <TableCell rowSpan={2}></TableCell>
-                {/* a */}
-                <TableCell className={styles['dotted-border']} rowSpan={1}></TableCell> {/* b */}
-                <TableCell rowSpan={2}></TableCell>
-                {/* c */}
-                <TableCell rowSpan={2}></TableCell>
-                {/* d */}
-                <TableCell rowSpan={2}></TableCell>
-                {/* e */}
-                <TableCell rowSpan={1}></TableCell>
-                {/* f */}
-                <TableCell rowSpan={2}></TableCell>
-                {/* g */}
-                <TableCell rowSpan={1}></TableCell>
-                {/* h */}
-                <TableCell rowSpan={2}></TableCell>
-                {/* i */}
-                <TableCell rowSpan={2}></TableCell>
-                {/* j */}
-                <TableCell rowSpan={2}></TableCell>
-                {/* k */}
-                <TableCell rowSpan={2}></TableCell>
-                {/* l */}
-                <TableCell rowSpan={2}></TableCell>
-                {/* m */}
-                <TableCell rowSpan={2}></TableCell>
-                {/* n */}
-                <TableCell rowSpan={2}></TableCell>
-                {/* o */}
-                <TableCell rowSpan={2}></TableCell>
-                {/* p */}
-                <TableCell rowSpan={2}></TableCell>
-                {/* q */}
-                <TableCell rowSpan={2}></TableCell>
-                {/* r */}
-                <TableCell rowSpan={2}></TableCell>
-                {/* s */}
-                <TableCell rowSpan={1}></TableCell>
-                {/* t */}
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={1}></TableCell>
-                <TableCell rowSpan={1}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={1}></TableCell>
-                <TableCell rowSpan={1}></TableCell>
-                <TableCell rowSpan={1}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={1}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-              </TableRow>
-              <TableRow>
-                <TableCell rowSpan={1}></TableCell>
-                <TableCell rowSpan={1}></TableCell>
-                <TableCell rowSpan={1}></TableCell>
-                <TableCell rowSpan={1}></TableCell>
-                <TableCell rowSpan={1}></TableCell>
-                <TableCell rowSpan={1}></TableCell>
-                <TableCell rowSpan={1}></TableCell>
-                <TableCell rowSpan={1}></TableCell>
-                <TableCell rowSpan={1}></TableCell>
-                <TableCell rowSpan={1}></TableCell>
-              </TableRow>
-            </React.Fragment>
-          ))}
+          {reportData && reportData.length > 0 ? (
+            reportData.map((item, i) => (
+              <React.Fragment key={i}>
+                <TableRow>
+                  <TableCell rowSpan={2}>{item.visit_date}</TableCell>
+                  {/* a */}
+                  <TableCell className={styles['dotted-border']} rowSpan={1}>
+                    {item.marital_status}
+                  </TableCell>{' '}
+                  {/* b */}
+                  <TableCell rowSpan={2}>{item.anc_number_nupi_revisit}</TableCell>
+                  {/* c */}
+                  <TableCell rowSpan={2}>{item.visit_date}</TableCell>
+                  {/* d */}
+                  <TableCell rowSpan={2}>{item.visit_date}</TableCell>
+                  {/* e */}
+                  <TableCell rowSpan={1}>{item.visit_date}</TableCell>
+                  {/* f */}
+                  <TableCell rowSpan={2}>{item.visit_date}</TableCell>
+                  {/* g */}
+                  <TableCell rowSpan={1}>{item.visit_date}</TableCell>
+                  {/* h */}
+                  <TableCell rowSpan={2}>{item.visit_date}</TableCell>
+                  {/* i */}
+                  <TableCell rowSpan={2}>{item.visit_date}</TableCell>
+                  {/* j */}
+                  <TableCell rowSpan={2}>{item.visit_date}</TableCell>
+                  {/* k */}
+                  <TableCell rowSpan={2}>{item.visit_date}</TableCell>
+                  {/* l */}
+                  <TableCell rowSpan={2}>{item.visit_date}</TableCell>
+                  {/* m */}
+                  <TableCell rowSpan={2}>{item.visit_date}</TableCell>
+                  {/* n */}
+                  <TableCell rowSpan={2}>{item.visit_date}</TableCell>
+                  {/* o */}
+                  <TableCell rowSpan={2}>{item.visit_date}</TableCell>
+                  {/* p */}
+                  <TableCell rowSpan={2}>{item.visit_date}</TableCell>
+                  {/* q */}
+                  <TableCell rowSpan={2}>{item.visit_date}</TableCell>
+                  {/* r */}
+                  <TableCell rowSpan={2}>{item.visit_date}</TableCell>
+                  {/* s */}
+                  <TableCell rowSpan={1}>{item.visit_date}</TableCell>
+                  {/* t */}
+                  <TableCell rowSpan={2}>{item.visit_date}</TableCell>
+                  <TableCell rowSpan={2}>{item.visit_date}</TableCell>
+                  <TableCell rowSpan={2}>{item.visit_date}</TableCell>
+                  <TableCell rowSpan={2}>{item.visit_date}</TableCell>
+                  <TableCell rowSpan={1}>{item.visit_date}</TableCell>
+                  <TableCell rowSpan={1}>{item.visit_date}</TableCell>
+                  <TableCell rowSpan={2}>{item.visit_date}</TableCell>
+                  <TableCell rowSpan={2}>{item.visit_date}</TableCell>
+                  <TableCell rowSpan={1}>{item.visit_date}</TableCell>
+                  <TableCell rowSpan={1}>{item.visit_date}</TableCell>
+                  <TableCell rowSpan={1}>{item.visit_date}</TableCell>
+                  <TableCell rowSpan={2}>{item.visit_date}</TableCell>
+                  <TableCell rowSpan={2}>{item.visit_date}</TableCell>
+                  <TableCell rowSpan={2}>{item.visit_date}</TableCell>
+                  <TableCell rowSpan={2}>{item.visit_date}</TableCell>
+                  <TableCell rowSpan={1}>{item.visit_date}</TableCell>
+                  <TableCell rowSpan={2}>{item.visit_date}</TableCell>
+                  <TableCell rowSpan={2}>{item.visit_date}</TableCell>
+                  <TableCell rowSpan={2}>{item.visit_date}</TableCell>
+                  <TableCell rowSpan={2}>{item.visit_date}</TableCell>
+                  <TableCell rowSpan={2}>{item.visit_date}</TableCell>
+                  <TableCell rowSpan={2}>{item.visit_date}</TableCell>
+                  <TableCell rowSpan={2}>{item.visit_date}</TableCell>
+                  <TableCell rowSpan={2}>{item.visit_date}</TableCell>
+                  <TableCell rowSpan={2}>{item.visit_date}</TableCell>
+                </TableRow>
+                <TableRow>
+                  <TableCell rowSpan={1}></TableCell>
+                  <TableCell rowSpan={1}></TableCell>
+                  <TableCell rowSpan={1}></TableCell>
+                  <TableCell rowSpan={1}></TableCell>
+                  <TableCell rowSpan={1}></TableCell>
+                  <TableCell rowSpan={1}></TableCell>
+                  <TableCell rowSpan={1}></TableCell>
+                  <TableCell rowSpan={1}></TableCell>
+                  <TableCell rowSpan={1}></TableCell>
+                  <TableCell rowSpan={1}></TableCell>
+                </TableRow>
+              </React.Fragment>
+            ))
+          ) : (
+            <TableRow>
+              <TableCell colSpan={19}>No data available</TableCell>
+            </TableRow>
+          )}
         </TableBody>
       </Table>
     </div>
diff --git a/packages/esm-report-app/src/registers/MOH-406/MOH_406_component.tsx b/packages/esm-report-app/src/registers/MOH-406/MOH_406_component.tsx
index 6c641c83..e6c7a62c 100644
--- a/packages/esm-report-app/src/registers/MOH-406/MOH_406_component.tsx
+++ b/packages/esm-report-app/src/registers/MOH-406/MOH_406_component.tsx
@@ -331,62 +331,72 @@ const RenderMOH406: React.FC<{ reportData: any }> = ({ reportData }) => (
           </TableRow>
         </TableHead>
         <TableBody>
-          {Array.from({ length: 2 }, (_, i) => (
-            <React.Fragment key={i}>
-              <TableRow>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell className={styles['dotted-border']} rowSpan={1}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={1}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={1}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell className={styles['dotted-border']} rowSpan={2}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={1}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={1}></TableCell>
-                <TableCell rowSpan={1}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-                <TableCell rowSpan={2}></TableCell>
-              </TableRow>
-              <TableRow>
-                <TableCell className={styles['dotted-border']} rowSpan={1}></TableCell>
-                <TableCell className={styles['dotted-border']} rowSpan={1}></TableCell>
-                <TableCell className={styles['dotted-border']} rowSpan={1}></TableCell>
-                <TableCell className={styles['dotted-border']} rowSpan={1}></TableCell>
-                <TableCell className={styles['dotted-border']} rowSpan={1}></TableCell>
-                <TableCell className={styles['dotted-border']} rowSpan={1}></TableCell>
-              </TableRow>
-            </React.Fragment>
-          ))}
+          {reportData && reportData.length > 0 ? (
+            reportData.map((item, i) => (
+              <React.Fragment key={i}>
+                <TableRow>
+                  <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                  <TableCell className={styles['dotted-border']} rowSpan={1}>
+                    {item.patient_id}
+                  </TableCell>
+                  <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                  <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                  <TableCell rowSpan={1}>{item.patient_id}</TableCell>
+                  <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                  <TableCell rowSpan={1}>{item.patient_id}</TableCell>
+                  <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                  <TableCell className={styles['dotted-border']} rowSpan={2}>
+                    {item.patient_id}
+                  </TableCell>
+                  <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                  <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                  <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                  <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                  <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                  <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                  <TableCell rowSpan={1}>{item.patient_id}</TableCell>
+                  <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                  <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                  <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                  <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                  <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                  <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                  <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                  <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                  <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                  <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                  <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                  <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                  <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                  <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                  <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                  <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                  <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                  <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                  <TableCell rowSpan={1}>{item.patient_id}</TableCell>
+                  <TableCell rowSpan={1}>{item.patient_id}</TableCell>
+                  <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                  <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                  <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                  <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                  <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                  <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                </TableRow>
+                <TableRow>
+                  <TableCell className={styles['dotted-border']} rowSpan={1}></TableCell>
+                  <TableCell className={styles['dotted-border']} rowSpan={1}></TableCell>
+                  <TableCell className={styles['dotted-border']} rowSpan={1}></TableCell>
+                  <TableCell className={styles['dotted-border']} rowSpan={1}></TableCell>
+                  <TableCell className={styles['dotted-border']} rowSpan={1}></TableCell>
+                  <TableCell className={styles['dotted-border']} rowSpan={1}></TableCell>
+                </TableRow>
+              </React.Fragment>
+            ))
+          ) : (
+            <TableRow>
+              <TableCell colSpan={19}>No data available</TableCell>
+            </TableRow>
+          )}
         </TableBody>
       </Table>
     </div>
diff --git a/packages/esm-report-app/src/registers/MOH-407/clientFollowUp/ClientFollowUp_component.tsx b/packages/esm-report-app/src/registers/MOH-407/clientFollowUp/ClientFollowUp_component.tsx
index 3d1a1795..80bb89e4 100644
--- a/packages/esm-report-app/src/registers/MOH-407/clientFollowUp/ClientFollowUp_component.tsx
+++ b/packages/esm-report-app/src/registers/MOH-407/clientFollowUp/ClientFollowUp_component.tsx
@@ -202,89 +202,95 @@ const ClientFollowUpRegister: React.FC<{ reportData: any }> = ({ reportData }) =
           </TableRow>
         </TableHead>
         <TableBody>
-          {Array.from({ length: 2 }, (_, i) => (
-            <React.Fragment key={i}>
-              <TableRow>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-                <TableCell></TableCell>
-              </TableRow>
-            </React.Fragment>
-          ))}
+          {reportData && reportData.length > 0 ? (
+            reportData.map((item, i) => (
+              <React.Fragment key={i}>
+                <TableRow>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                  <TableCell>{item.patient_id}</TableCell>
+                </TableRow>
+              </React.Fragment>
+            ))
+          ) : (
+            <TableRow>
+              <TableCell colSpan={19}>No data available</TableCell>
+            </TableRow>
+          )}
         </TableBody>
       </Table>
     </div>
diff --git a/packages/esm-report-app/src/registers/MOH-407/nutrition/Nutrition_component.tsx b/packages/esm-report-app/src/registers/MOH-407/nutrition/Nutrition_component.tsx
index 8d88e959..c7c58b8c 100644
--- a/packages/esm-report-app/src/registers/MOH-407/nutrition/Nutrition_component.tsx
+++ b/packages/esm-report-app/src/registers/MOH-407/nutrition/Nutrition_component.tsx
@@ -124,33 +124,43 @@ const NutritionRegister: React.FC<{ reportData: any }> = ({ reportData }) => (
         </TableRow>
       </TableHead>
       <TableBody>
-        {Array.from({ length: 2 }, (_, i) => (
-          <React.Fragment key={i}>
-            <TableRow>
-              <TableCell rowSpan={2}></TableCell>
-              <TableCell rowSpan={2}></TableCell>
-              <TableCell className={styles['dotted-border']} rowSpan={1}></TableCell>
-              <TableCell rowSpan={2}></TableCell>
-              <TableCell rowSpan={2}></TableCell>
-              <TableCell rowSpan={2}></TableCell>
-              <TableCell rowSpan={2}></TableCell>
-              <TableCell rowSpan={2}></TableCell>
-              <TableCell rowSpan={2}></TableCell>
-              <TableCell rowSpan={2}></TableCell>
-              <TableCell className={styles['dotted-border']} rowSpan={1}></TableCell>
-              <TableCell rowSpan={2}></TableCell>
-              <TableCell rowSpan={2}></TableCell>
-              <TableCell rowSpan={2}></TableCell>
-              <TableCell rowSpan={2}></TableCell>
-              <TableCell rowSpan={2}></TableCell>
-              <TableCell rowSpan={2}></TableCell>
-            </TableRow>
-            <TableRow>
-              <TableCell className={styles['dotted-border']} rowSpan={1}></TableCell>
-              <TableCell className={styles['dotted-border']} rowSpan={1}></TableCell>
-            </TableRow>
-          </React.Fragment>
-        ))}
+        {reportData && reportData.length > 0 ? (
+          reportData.map((item, i) => (
+            <React.Fragment key={i}>
+              <TableRow>
+                <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                <TableCell className={styles['dotted-border']} rowSpan={1}>
+                  {item.patient_id}
+                </TableCell>
+                <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                <TableCell className={styles['dotted-border']} rowSpan={1}>
+                  {item.patient_id}
+                </TableCell>
+                <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+              </TableRow>
+              <TableRow>
+                <TableCell className={styles['dotted-border']} rowSpan={1}></TableCell>
+                <TableCell className={styles['dotted-border']} rowSpan={1}></TableCell>
+              </TableRow>
+            </React.Fragment>
+          ))
+        ) : (
+          <TableRow>
+            <TableCell colSpan={19}>No data available</TableCell>
+          </TableRow>
+        )}
       </TableBody>
     </Table>
   </TableContainer>
diff --git a/packages/esm-report-app/src/registers/MOH-408/MOH-408-component.tsx b/packages/esm-report-app/src/registers/MOH-408/MOH-408-component.tsx
index 83d4ecfa..84e4a56a 100644
--- a/packages/esm-report-app/src/registers/MOH-408/MOH-408-component.tsx
+++ b/packages/esm-report-app/src/registers/MOH-408/MOH-408-component.tsx
@@ -214,70 +214,76 @@ const RenderMOH408: React.FC<{ reportData: any }> = ({ reportData }) => {
             </TableRow>
           </TableHead>
           <TableBody>
-            {Array.from({ length: 2 }, (_, i) => (
-              <React.Fragment key={i}>
-                <TableRow>
-                  <TableCell rowSpan={2}></TableCell>
-                  {/* a */}
-                  <TableCell rowSpan={2}></TableCell> {/* b */}
-                  <TableCell className={styles['dotted-border']} rowSpan={1}></TableCell>
-                  {/* c */}
-                  <TableCell rowSpan={2}></TableCell>
-                  {/* d */}
-                  <TableCell rowSpan={2}></TableCell>
-                  {/* e */}
-                  <TableCell rowSpan={2}></TableCell>
-                  {/* f */}
-                  <TableCell rowSpan={1}></TableCell>
-                  {/* g */}
-                  <TableCell rowSpan={2}></TableCell>
-                  {/* h */}
-                  <TableCell className={styles['dotted-border']} rowSpan={1}></TableCell>
-                  {/* i */}
-                  <TableCell rowSpan={2}></TableCell>
-                  {/* j */}
-                  <TableCell rowSpan={2}></TableCell>
-                  {/* k */}
-                  <TableCell rowSpan={1}></TableCell>
-                  {/* l */}
-                  <TableCell rowSpan={2}></TableCell>
-                  {/* m */}
-                  <TableCell rowSpan={1}></TableCell>
-                  {/* n */}
-                  <TableCell rowSpan={2}></TableCell>
-                  {/* o */}
-                  <TableCell rowSpan={1}></TableCell>
-                  {/* p */}
-                  <TableCell rowSpan={1}></TableCell>
-                  {/* q */}
-                  <TableCell rowSpan={2}></TableCell>
-                  {/* r */}
-                  <TableCell rowSpan={2}></TableCell>
-                  {/* s */}
-                  <TableCell className={styles['dotted-border']} rowSpan={1}></TableCell>
-                  {/* t */}
-                  <TableCell rowSpan={2}></TableCell>
-                  <TableCell className={styles['dotted-border']} rowSpan={1}></TableCell>
-                  <TableCell className={styles['dotted-border']} rowSpan={1}></TableCell>
-                  <TableCell rowSpan={1}></TableCell>
-                  <TableCell rowSpan={2}></TableCell>
-                  {/* <TableCell rowSpan={2}></TableCell> */}
-                </TableRow>
-                <TableRow>
-                  <TableCell rowSpan={1}></TableCell>
-                  <TableCell rowSpan={1}></TableCell>
-                  <TableCell rowSpan={1}></TableCell>
-                  <TableCell rowSpan={1}></TableCell>
-                  <TableCell rowSpan={1}></TableCell>
-                  <TableCell rowSpan={1}></TableCell>
-                  <TableCell rowSpan={1}></TableCell>
-                  <TableCell rowSpan={1}></TableCell>
-                  <TableCell rowSpan={1}></TableCell>
-                  <TableCell rowSpan={1}></TableCell>
-                  <TableCell rowSpan={1}></TableCell>
-                </TableRow>
-              </React.Fragment>
-            ))}
+            {reportData && reportData.length > 0 ? (
+              reportData.map((item, i) => (
+                <React.Fragment key={i}>
+                  <TableRow>
+                    <TableCell rowSpan={2}>{item.patient_id}</TableCell>
+                    {/* a */}
+                    <TableCell rowSpan={2}></TableCell> {/* b */}
+                    <TableCell className={styles['dotted-border']} rowSpan={1}></TableCell>
+                    {/* c */}
+                    <TableCell rowSpan={2}></TableCell>
+                    {/* d */}
+                    <TableCell rowSpan={2}></TableCell>
+                    {/* e */}
+                    <TableCell rowSpan={2}></TableCell>
+                    {/* f */}
+                    <TableCell rowSpan={1}></TableCell>
+                    {/* g */}
+                    <TableCell rowSpan={2}></TableCell>
+                    {/* h */}
+                    <TableCell className={styles['dotted-border']} rowSpan={1}></TableCell>
+                    {/* i */}
+                    <TableCell rowSpan={2}></TableCell>
+                    {/* j */}
+                    <TableCell rowSpan={2}></TableCell>
+                    {/* k */}
+                    <TableCell rowSpan={1}></TableCell>
+                    {/* l */}
+                    <TableCell rowSpan={2}></TableCell>
+                    {/* m */}
+                    <TableCell rowSpan={1}></TableCell>
+                    {/* n */}
+                    <TableCell rowSpan={2}></TableCell>
+                    {/* o */}
+                    <TableCell rowSpan={1}></TableCell>
+                    {/* p */}
+                    <TableCell rowSpan={1}></TableCell>
+                    {/* q */}
+                    <TableCell rowSpan={2}></TableCell>
+                    {/* r */}
+                    <TableCell rowSpan={2}></TableCell>
+                    {/* s */}
+                    <TableCell className={styles['dotted-border']} rowSpan={1}></TableCell>
+                    {/* t */}
+                    <TableCell rowSpan={2}></TableCell>
+                    <TableCell className={styles['dotted-border']} rowSpan={1}></TableCell>
+                    <TableCell className={styles['dotted-border']} rowSpan={1}></TableCell>
+                    <TableCell rowSpan={1}></TableCell>
+                    <TableCell rowSpan={2}></TableCell>
+                    {/* <TableCell rowSpan={2}></TableCell> */}
+                  </TableRow>
+                  <TableRow>
+                    <TableCell rowSpan={1}></TableCell>
+                    <TableCell rowSpan={1}></TableCell>
+                    <TableCell rowSpan={1}></TableCell>
+                    <TableCell rowSpan={1}></TableCell>
+                    <TableCell rowSpan={1}></TableCell>
+                    <TableCell rowSpan={1}></TableCell>
+                    <TableCell rowSpan={1}></TableCell>
+                    <TableCell rowSpan={1}></TableCell>
+                    <TableCell rowSpan={1}></TableCell>
+                    <TableCell rowSpan={1}></TableCell>
+                    <TableCell rowSpan={1}></TableCell>
+                  </TableRow>
+                </React.Fragment>
+              ))
+            ) : (
+              <TableRow>
+                <TableCell colSpan={19}>No data available</TableCell>
+              </TableRow>
+            )}
           </TableBody>
         </Table>
       </div>
diff --git a/packages/esm-report-app/src/reports-dashboard/report-summary/ReportSummary.css b/packages/esm-report-app/src/reports-dashboard/report-summary/ReportSummary.css
index 24f28aa4..2713df7c 100644
--- a/packages/esm-report-app/src/reports-dashboard/report-summary/ReportSummary.css
+++ b/packages/esm-report-app/src/reports-dashboard/report-summary/ReportSummary.css
@@ -48,3 +48,13 @@
   overflow: auto;
   max-height: 300px;
 }
+
+.buttonContainer {
+  display: flex;
+  align-items: center;
+  margin-bottom: 1rem;
+}
+
+.buttonContainer > button {
+  margin-right: 1rem;
+}
diff --git a/packages/esm-report-app/src/reports-dashboard/report-summary/ReportSummary.tsx b/packages/esm-report-app/src/reports-dashboard/report-summary/ReportSummary.tsx
index 7baad0c1..a93a94b1 100644
--- a/packages/esm-report-app/src/reports-dashboard/report-summary/ReportSummary.tsx
+++ b/packages/esm-report-app/src/reports-dashboard/report-summary/ReportSummary.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import {
   DataTable,
   TableContainer,
@@ -11,14 +11,18 @@ import {
   TableSelectAll,
   TableSelectRow,
   Loading,
+  Button,
 } from '@carbon/react';
 import { useNavigate } from 'react-router-dom';
 import styles from './ReportSummary.css';
 import reportMapping from '../report-loader/reportMapping.json';
-import { generateReportData } from '../../api/api';
+import { generateReportData, getSPReports } from '../../api/api';
 
 const ReportSummary: React.FC<any> = ({ rows }) => {
   const [loading, setLoading] = useState(false);
+  const [refreshLoading, setRefreshLoading] = useState(false);
+  const [currentRows, setCurrentRows] = useState([]);
+  const navigate = useNavigate();
 
   const headers = [
     { key: 'status', header: 'Status' },
@@ -30,7 +34,23 @@ const ReportSummary: React.FC<any> = ({ rows }) => {
     { key: 'download', header: 'Download' },
   ];
 
-  const navigate = useNavigate();
+  useEffect(() => {
+    const rowsWithButtons = rows.map((row) => {
+      const reportMappingEntry = reportMapping.find((entry) => entry.report_uuid === row.uuid);
+      return {
+        ...row,
+        view: reportMappingEntry ? (
+          <button
+            className={styles.view_button}
+            onClick={() => handleViewClick(reportMappingEntry.report_uuid, Number(row.log_id))}>
+            View
+          </button>
+        ) : null,
+        download: <button className={styles.download_button}>Download</button>,
+      };
+    });
+    setCurrentRows(rowsWithButtons);
+  }, [rows]);
 
   const handleViewClick = async (report_uuid, report_id) => {
     setLoading(true);
@@ -46,27 +66,43 @@ const ReportSummary: React.FC<any> = ({ rows }) => {
     }
   };
 
-  const rowsWithButtons = rows.map((row) => {
-    const reportMappingEntry = reportMapping.find((entry) => entry.report_uuid === row.uuid);
-    return {
-      ...row,
-      view: reportMappingEntry ? (
-        <button
-          className={styles.view_button}
-          onClick={() => handleViewClick(reportMappingEntry.report_uuid, Number(row.log_id))}>
-          View
-        </button>
-      ) : null,
-      download: <button className={styles.download_button}>Download</button>,
-    };
-  });
+  const handleRefresh = () => {
+    setRefreshLoading(true);
+    try {
+      const rowsWithButtons = rows.map((row) => {
+        const reportMappingEntry = reportMapping.find((entry) => entry.report_uuid === row.uuid);
+        return {
+          ...row,
+          view: reportMappingEntry ? (
+            <button
+              className={styles.view_button}
+              onClick={() => handleViewClick(reportMappingEntry.report_uuid, Number(row.log_id))}>
+              View
+            </button>
+          ) : null,
+          download: <button className={styles.download_button}>Download</button>,
+        };
+      });
+      window.location.reload();
+      setCurrentRows(rowsWithButtons);
+    } catch (error) {
+      console.error('Error refreshing data:', error);
+    } finally {
+      setRefreshLoading(false);
+    }
+  };
 
   return (
     <div className={styles.wrapper_container}>
       {loading && <Loading description="Loading data..." withOverlay={true} />}
       <TableContainer title="Reports logs">
+        {/* <div className={styles.buttonContainer}>
+          <Button onClick={handleRefresh} style={{ marginRight: '1rem' }} disabled={refreshLoading}>
+            {refreshLoading ? 'Refreshing...' : 'Refresh'}
+          </Button>
+        </div> */}
         <DataTable
-          rows={rowsWithButtons}
+          rows={currentRows}
           headers={headers}
           render={({ rows, headers, getHeaderProps, getRowProps, getTableProps }) => (
             <Table {...getTableProps()}>
diff --git a/packages/esm-report-app/src/reports-dashboard/tab-panel/tab-panel-component.tsx b/packages/esm-report-app/src/reports-dashboard/tab-panel/tab-panel-component.tsx
index e4406328..53ffb86b 100644
--- a/packages/esm-report-app/src/reports-dashboard/tab-panel/tab-panel-component.tsx
+++ b/packages/esm-report-app/src/reports-dashboard/tab-panel/tab-panel-component.tsx
@@ -160,7 +160,7 @@ const RenderTabPanel: React.FC<{ rows: any[] }> = ({ rows }) => {
             />
           </DatePicker>
           <Button kind="ghost" renderIcon={Download} onClick={handleGenerate}>
-            Generate
+            Process
           </Button>
         </div>
         {loading ? (