diff --git a/apps/api/src/assistance-applications/assistance-applications.controller.ts b/apps/api/src/assistance-applications/assistance-applications.controller.ts
index c08a1a0c..e1c1a88d 100644
--- a/apps/api/src/assistance-applications/assistance-applications.controller.ts
+++ b/apps/api/src/assistance-applications/assistance-applications.controller.ts
@@ -71,7 +71,7 @@ export class AssistanceApplicationsController {
 
   @Get(':id/document')
   findOneDocument(@Param('id') id: string) {
-    return this.assistanceApplicationsService.findOne(id, true);
+    return this.assistanceApplicationsService.findOneDocument(id);
   }
 
   @Patch(':id')
diff --git a/apps/api/src/assistance-applications/assistance-applications.service.ts b/apps/api/src/assistance-applications/assistance-applications.service.ts
index baa376da..860e71a2 100644
--- a/apps/api/src/assistance-applications/assistance-applications.service.ts
+++ b/apps/api/src/assistance-applications/assistance-applications.service.ts
@@ -69,7 +69,7 @@ export class AssistanceApplicationsService {
     return results;
   }
 
-  async findOne(id: string, withDocument: boolean = false) {
+  async findOne(id: string) {
     const application = await this.assistanceApplicationRepository.findOne({
       where: { id },
       relations: {
@@ -77,7 +77,7 @@ export class AssistanceApplicationsService {
           professor: true,
         },
         student: true,
-        document: withDocument,
+        document: true,
       },
     });
     if (!application) {
@@ -88,6 +88,37 @@ export class AssistanceApplicationsService {
     return application;
   }
 
+  async findOneDocument(id: string) {
+    const application = await this.findOne(id);
+    const graduatedAssistanceId = application.graduatedAssistance.id;
+
+    const applications = await this.assistanceApplicationRepository
+      .createQueryBuilder('app')
+      .select(['app.id'])
+      .where('app.graduatedAssistanceId = :graduatedAssistanceId', {
+        graduatedAssistanceId,
+      })
+      .orderBy('app.createdAt', 'ASC')
+      .addOrderBy('app.id', 'ASC')
+      .getMany();
+
+    const applicationIds = applications.map((app) => app.id);
+    const currentIndex = applicationIds.indexOf(application.id);
+
+    const previousId =
+      currentIndex > 0 ? applicationIds[currentIndex - 1] : null;
+    const nextId =
+      currentIndex < applicationIds.length - 1
+        ? applicationIds[currentIndex + 1]
+        : null;
+
+    return {
+      application,
+      previousId,
+      nextId,
+    };
+  }
+
   async update(
     id: string,
     updateAssistanceApplicationDto: UpdateAssistanceApplicationDto,
diff --git a/apps/api/src/assistance-applications/entities/assistance-application.entity.ts b/apps/api/src/assistance-applications/entities/assistance-application.entity.ts
index 4dd91518..8ce6b026 100644
--- a/apps/api/src/assistance-applications/entities/assistance-application.entity.ts
+++ b/apps/api/src/assistance-applications/entities/assistance-application.entity.ts
@@ -17,6 +17,9 @@ export class AssistanceApplication extends Base {
   @ManyToOne(() => Student, (student) => student.assistanceApplications)
   student: Student;
 
+  @Column({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' })
+  createdAt: Date;
+
   @ManyToOne(
     () => GraduatedAssistance,
     (graduatedAssistance) => graduatedAssistance.assistanceApplications,
diff --git a/apps/api/src/users/users.service.ts b/apps/api/src/users/users.service.ts
index 08e49583..51aeded8 100644
--- a/apps/api/src/users/users.service.ts
+++ b/apps/api/src/users/users.service.ts
@@ -64,13 +64,11 @@ export class UsersService {
 
   getUserRoles(user: User) {
     const roles: string[] = [];
-    if (user.administrator && user.administrator.isActive)
-      roles.push('administrador');
-    if (user.coordinator && user.coordinator.isActive)
-      roles.push('coordinador');
-    if (user.professor && user.professor.isActive) roles.push('profesor');
-    if (user.student && user.student.isActive) {
-      if (user.administrator && user.administrator.isActive) {
+    if (user.administrator?.isActive) roles.push('administrador');
+    if (user.coordinator?.isActive) roles.push('coordinador');
+    if (user.professor?.isActive) roles.push('profesor');
+    if (user.student?.isActive) {
+      if (user.administrator?.isActive) {
         roles.push('estudiante');
         roles.push('estudiante_maestria');
       } else if (user.student.isUndergraduate) {
diff --git a/apps/web/src/app/inicio/administrador/incidencia/page.tsx b/apps/web/src/app/inicio/administrador/incidencia/page.tsx
index 3dc0a2d6..70680a4a 100644
--- a/apps/web/src/app/inicio/administrador/incidencia/page.tsx
+++ b/apps/web/src/app/inicio/administrador/incidencia/page.tsx
@@ -48,7 +48,8 @@ const columns: ColumnDef<Incidence>[] = [
     sortingFn: (rowA, rowB, columnId) => {
       const a = rowA.getValue<boolean>(columnId);
       const b = rowB.getValue<boolean>(columnId);
-      return a === b ? 0 : a ? 1 : -1;
+      if (a === b) return 0;
+      return a ? 1 : -1;
     }
   },
   {
@@ -107,9 +108,10 @@ function ActionCell({ incidence }: { readonly incidence: Incidence }) {
   const completed = incidence.isClosed? true: isClosing;
 
   const handleClose = async () => {
+    if (!incidence.id) return;
     setIsClosing(true);
     try {
-      await closeIncidence(incidence.id!);
+      await closeIncidence(incidence.id);
       await queryClient.invalidateQueries({ queryKey: ['incidences'] });
     } catch (error) {
       console.error("Error al cerrar la incidencia:", error);
diff --git a/apps/web/src/app/inicio/administrador/lider/page.tsx b/apps/web/src/app/inicio/administrador/lider/page.tsx
index f153bc64..b1b60046 100644
--- a/apps/web/src/app/inicio/administrador/lider/page.tsx
+++ b/apps/web/src/app/inicio/administrador/lider/page.tsx
@@ -2,7 +2,7 @@
 
 import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { DataTable } from "@/components/data-table";
-import { ColumnDef } from "@tanstack/react-table";
+import { ColumnDef, Row } from "@tanstack/react-table";
 import SpinnerPage from "@/components/shared/spinner-page";
 import ErrorPage from "@/components/shared/error-page";
 import { Button } from "@/components/ui/button";
@@ -20,59 +20,38 @@ import {
 import { LeaderPerCourse } from "@/app/types/leader-per-course.type";
 import { User } from "@/app/types/entities/user.type";
 
+const columns: ColumnDef<LeaderPerCourse>[] = [
+  {
+    accessorKey: "code",
+    header: "Código",
+  },
+  {
+    accessorKey: "courseName",
+    header: "Nombre curso",
+  },
+  {
+    accessorKey: "professorName",
+    header: "Nombre profesor",
+  },
+  {
+    accessorKey: "email",
+    header: "Email",
+  },
+  {
+    id: "assign",
+    header: "Asignar",
+    enableSorting: false,
+    cell: ({ row }: { row: Row<LeaderPerCourse> }) => <PopoverPerCourse row={row} />
+  },
+];
+
 export default function CourseList() {
-  const queryClient = useQueryClient();
 
   const { data, isFetching, isError } = useQuery({
     queryKey: ["courses-leaders"],
     queryFn: () => findAllWithMainProfessor(),
   });
 
-  const columns: ColumnDef<LeaderPerCourse>[] = [
-    {
-      accessorKey: "code",
-      header: "Código",
-    },
-    {
-      accessorKey: "courseName",
-      header: "Nombre curso",
-    },
-    {
-      accessorKey: "professorName",
-      header: "Nombre profesor",
-    },
-    {
-      accessorKey: "email",
-      header: "Email",
-    },
-    {
-      id: "assign",
-      header: "Asignar",
-      enableSorting: false,
-      cell: ({ row }) => (
-        <ProfessorListPopover
-          courseId={row.original.courseId}
-          onAssigned={(newProfessor) => {
-            queryClient.setQueryData<LeaderPerCourse[]>(
-              ["courses-leaders"],
-              (oldData) =>
-                oldData?.map((course) =>
-                  course.courseId === row.original.courseId
-                    ? {
-                      ...course,
-                      professorId: newProfessor.id,
-                      professorName: newProfessor.name,
-                      email: newProfessor.email,
-                    }
-                    : course
-                ) ?? []
-            );
-          }}
-        />
-      ),
-    },
-  ];
-
   if (isFetching) return <SpinnerPage />;
   if (isError) return <ErrorPage />;
   return (
@@ -87,6 +66,31 @@ export default function CourseList() {
   );
 }
 
+function PopoverPerCourse({ row }: { readonly row: Row<LeaderPerCourse> }) {
+  const queryClient = useQueryClient();
+  return (
+    <ProfessorListPopover
+      courseId={row.original.courseId}
+      onAssigned={(newProfessor) => {
+        queryClient.setQueryData<LeaderPerCourse[]>(
+          ["courses-leaders"],
+          (oldData) =>
+            oldData?.map((course) =>
+              course.courseId === row.original.courseId
+                ? {
+                  ...course,
+                  professorId: newProfessor.id,
+                  professorName: newProfessor.name,
+                  email: newProfessor.email,
+                }
+                : course
+            ) ?? []
+        );
+      }}
+    />
+  )
+}
+
 function ProfessorListPopover({
   courseId,
   onAssigned,
@@ -96,7 +100,6 @@ function ProfessorListPopover({
 }) {
   const [open, setOpen] = useState(false);
   const [search, setSearch] = useState("");
-  const [selected, setSelected] = useState<User | null>(null);
 
   const { data } = useQuery({
     queryKey: ["professors-by-course", courseId],
@@ -111,7 +114,6 @@ function ProfessorListPopover({
   const handleAssign = async (professor: User) => {
     try {
       await assignProfessorAsCourseLeader(professor.id, courseId);
-      setSelected(professor);
       setOpen(false);
       onAssigned?.(professor);
     } catch (error) {
@@ -123,7 +125,7 @@ function ProfessorListPopover({
     <Popover open={open} onOpenChange={setOpen}>
       <PopoverTrigger asChild>
         <Button className="w-full">
-          {selected?.name ?? "Asignar"}
+          Asignar
         </Button>
       </PopoverTrigger>
       <PopoverContent className="w-[300px]">
@@ -155,4 +157,4 @@ function ProfessorListPopover({
       </PopoverContent>
     </Popover>
   );
-}
+}
\ No newline at end of file
diff --git a/apps/web/src/app/inicio/coordinador/cartelera/page.tsx b/apps/web/src/app/inicio/coordinador/cartelera/page.tsx
index e00c6667..375a0367 100644
--- a/apps/web/src/app/inicio/coordinador/cartelera/page.tsx
+++ b/apps/web/src/app/inicio/coordinador/cartelera/page.tsx
@@ -69,16 +69,49 @@ export default function UploadBillboard() {
             handleUploadXlsm(file);
           }
         }}
-      dialogText={dialogText}
+        dialogText={dialogText}
       >
-      <UploadedBillboard classesData={coursesData} loadError={loadError} />
-    </UploadFilePage >
+        <UploadedBillboard classesData={coursesData} loadError={loadError} />
+      </UploadFilePage >
 
       <AlertDialogError open={loadError} onOpenChange={setLoadError} />
     </>
   );
 }
 
+const columns: ColumnDef<Course>[] = [
+  {
+    accessorKey: "name",
+    header: "Clase",
+  },
+  {
+    accessorKey: "code",
+    header: "Código",
+  },
+  {
+    accessorFn: (row) => row.sections.length,
+    header: "Secciones",
+  },
+  {
+    accessorKey: "credits",
+    header: "Créditos",
+  },
+  {
+    id: "professors",
+    header: "Profesores",
+    cell: ({ row }) => {
+      const professors = row.original.sections.flatMap((section) =>
+        section.professors.map((p) => p.user.name)
+      );
+      return (
+        <span>
+          {professors.length > 0 ? professors.join(", ") : "No asignados"}
+        </span>
+      );
+    },
+  },
+];
+
 function UploadedBillboard({
   classesData,
   loadError,
@@ -86,43 +119,7 @@ function UploadedBillboard({
   readonly classesData: Course[];
   readonly loadError: boolean;
 }) {
-  const columns: ColumnDef<Course>[] = [
-    {
-      accessorKey: "name",
-      header: "Clase",
-    },
-    {
-      accessorKey: "code",
-      header: "Código",
-    },
-    {
-      accessorFn: (row) => row.sections.length,
-      header: "Secciones",
-    },
-    {
-      accessorKey: "credits",
-      header: "Créditos",
-    },
-    {
-      id: "professors",
-      header: "Profesores",
-      cell: ({ row }) => {
-        const professors = row.original.sections.flatMap((section) =>
-          section.professors.map((p) => p.user.name)
-        );
-        return (
-          <span>
-            {professors.length > 0 ? professors.join(", ") : "No asignados"}
-          </span>
-        );
-      },
-    },
-  ];
-
   if (loadError) return <BillboardNotFound />;
-
-
-  
   return (
     <div className="min-h-full min-w-full">
       <div className="bg-card rounded-lg shadow-lg p-6 space-y-6">
diff --git a/apps/web/src/app/inicio/coordinador/programas/lista/ProgramColumns.tsx b/apps/web/src/app/inicio/coordinador/programas/lista/ProgramColumns.tsx
index 330a6dd3..94e02a84 100644
--- a/apps/web/src/app/inicio/coordinador/programas/lista/ProgramColumns.tsx
+++ b/apps/web/src/app/inicio/coordinador/programas/lista/ProgramColumns.tsx
@@ -34,7 +34,7 @@ export const getProgramColumns = (handleDetail: (id: string) => void): ColumnDef
     header: "Profesor",
     cell: ({ row }) => (
       <span className="text-primary">
-        {row.original.mainProfessor?.user?.name || "No professor assigned"}
+        {row.original.mainProfessor?.user?.name || "Profesor no asignado"}
       </span>
     ),
   },
diff --git a/apps/web/src/app/inicio/coordinador/programas/lista/[id]/page.tsx b/apps/web/src/app/inicio/coordinador/programas/lista/[id]/page.tsx
index a824262d..0fa7a4a1 100644
--- a/apps/web/src/app/inicio/coordinador/programas/lista/[id]/page.tsx
+++ b/apps/web/src/app/inicio/coordinador/programas/lista/[id]/page.tsx
@@ -37,7 +37,7 @@ export default function ApplicationDetail() {
   const [pdfUrl, setPdfUrl] = useState<string | null>(null); // Blob URL for the PDF document
 
   // Fetch course data using React Query
-  const { data: course, isFetching, error } = useQuery({
+  const { data: course, isFetching, isError } = useQuery({
     queryKey: ["course-program", id],
     queryFn: () => getCourseWithDocument(String(id)),
   });
@@ -59,6 +59,7 @@ export default function ApplicationDetail() {
 
   // Show loading spinner while data is being fetched
   if (isFetching) return <SpinnerPage />;
+  if (isError) return <p className="text-red-500 p-4">Error al cargar el documento</p>
 
   return (
     <div className="flex flex-col h-full w-full">
@@ -66,19 +67,18 @@ export default function ApplicationDetail() {
         {/* Left section: PDF document or error/loading message */}
         <section className="lg:col-span-2 flex flex-col">
           <div className="flex-1 border rounded-lg overflow-hidden">
-            {error ? (
-              <p className="text-red-500 p-4">Error al cargar el documento</p>
-            ) : pdfUrl ? (
-              <iframe
-                src={pdfUrl}
-                width="100%"
-                height="100%"
-                title="Documento PDF"
-                className="min-h-[400px] md:min-h-[600px]"
-              />
-            ) : (
-              <p className="text-center py-4 text-gray-500">Cargando documento…</p>
-            )}
+            {
+              pdfUrl ? (
+                <iframe
+                  src={pdfUrl}
+                  width="100%"
+                  height="100%"
+                  title="Documento PDF"
+                  className="min-h-[400px] md:min-h-[600px]"
+                />
+              ) : (
+                <p className="text-center py-4 text-gray-500">Cargando documento…</p>
+              )}
           </div>
         </section>
 
diff --git a/apps/web/src/app/inicio/estudiante/asistencia/lista/[id]/page.tsx b/apps/web/src/app/inicio/estudiante/asistencia/lista/[id]/page.tsx
index 332dd37c..f28f4aba 100644
--- a/apps/web/src/app/inicio/estudiante/asistencia/lista/[id]/page.tsx
+++ b/apps/web/src/app/inicio/estudiante/asistencia/lista/[id]/page.tsx
@@ -156,7 +156,6 @@ function AssistanceInscription({
           </div>
         </div>
         <Button
-          className="w-40 mx-auto block"
           onClick={() => setIsApplying(true)}
         >
           Aplicar
@@ -413,7 +412,7 @@ function AssistanceApplying({ assistance, setIsApplying }: AssistanceProps) {
       </CardHeader>
       <CardContent>
         <form className="space-y-6">
-          <UploadCV assistance={assistance} file={file} setFile={setFile} />
+          <UploadCV file={file} setFile={setFile} />
           {error && (
             <div className="text-red-600 text-center font-semibold">
               {error}
@@ -423,7 +422,6 @@ function AssistanceApplying({ assistance, setIsApplying }: AssistanceProps) {
             <Button
               type="button"
               onClick={handleApplyClick}
-              className="bg-core hover:bg-core-highlight text-card px-10 py-5 rounded-xl text-lg font-semibold transition-colors shadow-lg hover:shadow-core-soft"
             >
               Aplicar
             </Button>
@@ -498,7 +496,6 @@ function UploadCV({
   setFile,
   file,
 }: {
-  readonly assistance: GraduatedAssistance;
   readonly file: File | null;
   readonly setFile: (file: File | null) => void;
 }) {
@@ -509,7 +506,7 @@ function UploadCV({
     }
   };
 
-  const handleDrop = (event: React.DragEvent) => {
+  const handleDrop = (event: React.DragEvent<HTMLButtonElement>) => {
     event.preventDefault();
     const droppedFile = event.dataTransfer.files[0];
     if (droppedFile && droppedFile.type === "application/pdf") {
@@ -517,13 +514,12 @@ function UploadCV({
     }
   };
 
-  const handleDragOver = (event: React.DragEvent) => {
+  const handleDragOver = (event: React.DragEvent<HTMLButtonElement>) => {
     event.preventDefault();
   };
 
   const handleActivateInput = () => {
-    const fileInput = document.getElementById("cv");
-    if (fileInput) fileInput.click();
+    document.getElementById("cv")?.click();
   };
 
   return (
@@ -534,24 +530,22 @@ function UploadCV({
           Adjunta tu hoja de vida en formato PDF para aplicar a esta asistencia
         </p>
       </div>
-
-      <button
-        type="button"
-        onClick={handleActivateInput}
-        onKeyDown={(event) => {
-          if (event.key === "Enter" || event.key === " ") {
-            event.preventDefault(); // opcional con <button>
-            handleActivateInput();
-          }
-        }}
-        onDrop={handleDrop}
-        onDragOver={handleDragOver}
-        className="w-full border-2 border-dashed rounded-lg p-6 text-center cursor-pointer"
-      >
+      <div className="w-full border-2 border-dashed rounded-lg text-center">
         {!file ? (
-          <div>
+          <button
+            className="p-6 w-full cursor-pointer"
+            type="button"
+            onClick={handleActivateInput}
+            onKeyDown={(event) => {
+              if (event.key === "Enter" || event.key === " ") {
+                handleActivateInput();
+              }
+            }}
+            onDrop={handleDrop}
+            onDragOver={handleDragOver}
+          >
             <Upload className="mx-auto h-12 w-12 text-ring" />
-            <Label htmlFor="cv" className="mt-4 block text-sm font-medium">
+            <Label htmlFor="cv" className="mt-4 block text-sm font-medium cursor-pointer">
               <span className="text-core-highlight">Click para subir</span> o
               arrastra y suelta
             </Label>
@@ -564,26 +558,23 @@ function UploadCV({
               name="cv"
             />
             <p className="text-xs text-ring mt-2">Solo archivos PDF</p>
-          </div>
+          </button>
         ) : (
-          <div className="flex items-center justify-between">
+          <div className="flex items-center justify-between p-6 w-full">
             <div className="flex items-center">
               <FileText className="h-6 w-6 text-core-highlight mr-2" />
               <span>{file.name}</span>
             </div>
-            <Button
-              variant="ghost"
-              size="sm"
-              className="text-destructive"
-              onClick={() => {
-                setFile(null);
-              }}
+            <button
+              type="button"
+              className="text-destructive cursor-pointer"
+              onClick={() => setFile(null)}
             >
               <X className="h-4 w-4" />
-            </Button>
+            </button>
           </div>
         )}
-      </button>
+      </div>
     </div>
   );
-}
+}
\ No newline at end of file
diff --git a/apps/web/src/app/inicio/estudiante/asistencia/lista_aplicadas/[id]/page.tsx b/apps/web/src/app/inicio/estudiante/asistencia/lista_aplicadas/[id]/page.tsx
index 432556c9..8102ec48 100644
--- a/apps/web/src/app/inicio/estudiante/asistencia/lista_aplicadas/[id]/page.tsx
+++ b/apps/web/src/app/inicio/estudiante/asistencia/lista_aplicadas/[id]/page.tsx
@@ -5,7 +5,7 @@ import { StatusInformation } from "@/app/types/entities/graduated-assistance.typ
 import TabStatus, { SectionProps } from "@/components/shared/tab-status";
 import { useRouter } from "next/navigation";
 import SpinnerPage from "@/components/shared/spinner-page";
-import { getAssistanceStatusByIdWithDocument } from "@/app/services/assistance.service";
+import { getAssistanceStatusById } from "@/app/services/assistance.service";
 
 /**
  * AssistanceStatus Component
@@ -78,7 +78,7 @@ export default function AssistanceStatus({
     const fetchData = async () => {
       if (!id) return router.push("/404");
       try {
-        const data = await getAssistanceStatusByIdWithDocument(id);
+        const data = await getAssistanceStatusById(id);
         setStatusInformation(data);
         setIsLoading(false);
       } catch {
diff --git a/apps/web/src/app/inicio/page.tsx b/apps/web/src/app/inicio/page.tsx
index 62005da4..1060ac83 100644
--- a/apps/web/src/app/inicio/page.tsx
+++ b/apps/web/src/app/inicio/page.tsx
@@ -28,8 +28,7 @@ import {
   getPendingTasksForProfessor,
   getPendingTasksForCoordinator,
 } from "@/app/services/project-application.service";
-import { flows } from "./tareas/flows";
-import { Task } from "../types/entities/task.type";
+import { mapTasksToTaskTable } from "../mappers/task.mapper";
 
 /**
  * Maps each user role to the corresponding dashboard component.
@@ -80,19 +79,7 @@ export default function Home() {
           getPendingTasksForCoordinator()
         ]).then(([studentTasks, professorTasks, coordinatorTasks]) => {
           const allTasks = [...studentTasks, ...professorTasks, ...coordinatorTasks];
-          const parsedTasks = allTasks.map((task: Task) => {
-            const stepNumber =
-              typeof task.step === "number" ? task.step : Number(task.step);
-            const stepInfo = flows.proyectoPregrado[stepNumber];
-            return {
-              ...task,
-              step: stepNumber,
-              title: stepInfo?.title ?? "Sin título",
-              description: stepInfo?.description ?? "Sin descripción",
-              date: task.date ? new Date(task.date) : new Date(),
-            };
-          });
-
+          const parsedTasks = mapTasksToTaskTable(allTasks);
           setTasks(parsedTasks);
         });
       });
diff --git a/apps/web/src/app/inicio/posgrado/tesis/lista/[id]/page.tsx b/apps/web/src/app/inicio/posgrado/tesis/lista/[id]/page.tsx
index c0562c7e..f34b7ea4 100644
--- a/apps/web/src/app/inicio/posgrado/tesis/lista/[id]/page.tsx
+++ b/apps/web/src/app/inicio/posgrado/tesis/lista/[id]/page.tsx
@@ -193,7 +193,7 @@ function ThesisApplying({ thesis }: { readonly thesis: Thesis }) {
           />
 
           <div className="flex justify-center pt-3.5">
-            <Button type="button" onClick={() => setIsConfirmed(true)}>
+            <Button onClick={() => setIsConfirmed(true)}>
               Aplicar
             </Button>
             <ConfirmationModal
diff --git a/apps/web/src/app/inicio/posgrado/tesis/lista/page.tsx b/apps/web/src/app/inicio/posgrado/tesis/lista/page.tsx
index 055519f6..c2530e42 100644
--- a/apps/web/src/app/inicio/posgrado/tesis/lista/page.tsx
+++ b/apps/web/src/app/inicio/posgrado/tesis/lista/page.tsx
@@ -6,7 +6,7 @@ import {
   AccordionTrigger,
 } from "@/components/ui/accordion";
 import { Button } from "@/components/ui/button";
-import { File, User, Search } from "lucide-react";
+import { File, Search } from "lucide-react";
 import { useEffect } from "react";
 import { useRouter } from "next/navigation";
 import { getPostgraduateThesis } from "@/app/services/thesis.service";
@@ -21,7 +21,6 @@ import {
   SelectValue,
 } from "@/components/ui/select";
 import SpinnerPage from "@/components/shared/spinner-page";
-import { Skeleton } from "@/components/ui/skeleton";
 import { useQuery } from "@tanstack/react-query";
 import { useThesisListStore } from "./store";
 import { cn } from "@/lib/utils";
@@ -30,8 +29,10 @@ import AlphabeticSortButton from "@/components/shared/alphabetic-sort-button";
 import { getPeriods } from "@/app/services/period.service";
 import { DataTable } from "@/components/data-table";
 import { ThesesStudentTable } from "@/app/types/theses-by-professor.type";
-import { ColumnDef } from "@tanstack/react-table";
+import { ColumnDef, Row } from "@tanstack/react-table";
 import { Thesis } from "@/app/types/entities/thesis.type";
+import SkeletonAccordion from "@/components/shared/skeleton-accordion";
+
 
 /**
  * ThesisList Component
@@ -58,7 +59,7 @@ export default function ThesisList() {
 
   const { data: thesisList, isFetching: isFetchingThesis } = useQuery({
     queryKey: ["postgraduate-thesis-projects", searchCategory, searchTerm],
-    queryFn: () => getPostgraduateThesis({category: searchCategory, period: searchTerm}),
+    queryFn: () => getPostgraduateThesis({ category: searchCategory, period: searchTerm }),
   });
 
   const { data: semesters, isLoading: isLoadingSemesters } = useQuery({
@@ -99,9 +100,9 @@ export default function ThesisList() {
             sortDirection={sortDirection}
           />
         </div>
-        {isFetchingThesis ? 
+        {isFetchingThesis ?
           <SkeletonAccordion />
-         : <AccordionList thesisList={thesisList ?? {}} />
+          : <AccordionList thesisList={thesisList ?? {}} />
         }
       </Accordion>
     </div>
@@ -228,6 +229,8 @@ function AccordionList({
   );
 }
 
+
+
 /**
  * ThesisTable Component
  *
@@ -237,33 +240,37 @@ function AccordionList({
 function ThesisTable({ data }: { readonly data: Thesis[] }) {
   const router = useRouter();
 
+  const rowToName = ({ row }: { row: Row<Thesis> }) => <ThesisSpan text={row.original.title} />
+  const rowToSubarea = ({ row }: { row: Row<Thesis> }) => <ThesisSpan text={row.original.investigationSubarea} />
+  const rowToButton = ({ row }: { row: Row<Thesis> }) => (
+    <Button
+      variant="ghost"
+      size="icon"
+      onClick={() =>
+        router.push(
+          `${ROUTES.HOME}/${ROUTES.POSTGRADUATE_THESIS_LIST}/${row.original.id}`
+        )
+      }
+    >
+      <Search className="w-4 h-4" />
+    </Button>
+  )
+
   const columns: ColumnDef<Thesis>[] = [
     {
       accessorKey: "title",
       header: "Nombre del proyecto",
-      cell: ({ row }) => <ThesisSpan text={row.original.title} />,
+      cell: rowToName,
     },
     {
       accessorKey: "investigationSubarea",
       header: "Subarea de investigación",
-      cell: ({ row }) => <ThesisSpan text={row.original.investigationSubarea} />,
+      cell: rowToSubarea,
     },
     {
       id: "actions",
       header: "Ver",
-      cell: ({ row }) => (
-        <Button
-          variant="ghost"
-          size="icon"
-          onClick={() =>
-            router.push(
-              `${ROUTES.HOME}/${ROUTES.POSTGRADUATE_THESIS_LIST}/${row.original.id}`
-            )
-          }
-        >
-          <Search className="w-4 h-4" />
-        </Button>
-      ),
+      cell: rowToButton
     },
   ];
 
@@ -272,26 +279,4 @@ function ThesisTable({ data }: { readonly data: Thesis[] }) {
 
 function ThesisSpan({ text }: { readonly text: string }) {
   return <span className="text-primary font-medium">{text}</span>;
-}
-
-/**
- * SkeletonAccordion Component
- *
- * Displays loading skeleton while thesis data is being fetched.
- */
-function SkeletonAccordion() {
-  return (
-    <>
-      {Array.from({ length: 8 }).map((_, i) => (
-        <AccordionItem key={i} value="loading">
-          <AccordionTrigger>
-            <div className="flex items-center w-full">
-              <User className="mr-2 h-5 w-5 text-core-highlight" />
-              <Skeleton className="w-40 h-4" />
-            </div>
-          </AccordionTrigger>
-        </AccordionItem>
-      ))}
-    </>
-  );
-}
+}
\ No newline at end of file
diff --git a/apps/web/src/app/inicio/pregrado/tesis/estado/page.tsx b/apps/web/src/app/inicio/pregrado/tesis/estado/page.tsx
index c82bfa35..17f15c33 100644
--- a/apps/web/src/app/inicio/pregrado/tesis/estado/page.tsx
+++ b/apps/web/src/app/inicio/pregrado/tesis/estado/page.tsx
@@ -28,7 +28,7 @@ export default function ProjectStatus() {
     isFetching,
     error,
   } = useQuery({
-    queryKey: ["student-thesis-status"],
+    queryKey: ["student-project-status"],
     queryFn: async () => {
       const userData = await getUserInfo();
       const thesisStatus = await getUndergraduateThesisStatusInformation(userData.user.id);
diff --git a/apps/web/src/app/inicio/pregrado/tesis/lista/page.tsx b/apps/web/src/app/inicio/pregrado/tesis/lista/page.tsx
index ac97888c..e6d2b035 100644
--- a/apps/web/src/app/inicio/pregrado/tesis/lista/page.tsx
+++ b/apps/web/src/app/inicio/pregrado/tesis/lista/page.tsx
@@ -16,7 +16,6 @@ import {
   SelectTrigger,
   SelectValue,
 } from "@/components/ui/select";
-import { Skeleton } from "@/components/ui/skeleton";
 import SpinnerPage from "@/components/shared/spinner-page";
 import AlphabeticSortButton from "@/components/shared/alphabetic-sort-button";
 import { getPeriods } from "@/app/services/period.service";
@@ -33,7 +32,8 @@ import { cn } from "@/lib/utils";
 import { ROUTES } from "@/app/routes";
 import { DataTable } from "@/components/data-table";
 import { ColumnDef } from "@tanstack/react-table";
-import { File, Search, User } from "lucide-react";
+import { File, Search } from "lucide-react";
+import SkeletonAccordion from "@/components/shared/skeleton-accordion";
 
 /**
  * ThesisList Component
@@ -264,26 +264,4 @@ function ThesisTable({ data }: { readonly data: ProjectsStudentTableRow[] }) {
 
 function ThesisSpan({ text }: { readonly text: string }) {
   return <span className="text-primary font-medium">{text}</span>;
-}
-
-/**
- * SkeletonAccordion Component
- *
- * Displays loading skeleton while thesis data is being fetched.
- */
-function SkeletonAccordion() {
-  return (
-    <>
-      {Array.from({ length: 8 }).map((_, i) => (
-        <AccordionItem key={i} value="loading">
-          <AccordionTrigger>
-            <div className="flex items-center w-full">
-              <User className="mr-2 h-5 w-5 text-core-highlight" />
-              <Skeleton className="w-40 h-4" />
-            </div>
-          </AccordionTrigger>
-        </AccordionItem>
-      ))}
-    </>
-  );
-}
+}
\ No newline at end of file
diff --git a/apps/web/src/app/inicio/profesor/asistencias/lista/manejar/[id]/[applicationId]/page.tsx b/apps/web/src/app/inicio/profesor/asistencias/lista/manejar/[id]/[applicationId]/page.tsx
index cf98b5c6..c8a7ac65 100644
--- a/apps/web/src/app/inicio/profesor/asistencias/lista/manejar/[id]/[applicationId]/page.tsx
+++ b/apps/web/src/app/inicio/profesor/asistencias/lista/manejar/[id]/[applicationId]/page.tsx
@@ -3,10 +3,10 @@
 import { getAssistanceStatusByIdWithDocument, updateAssistanceApplication } from "@/app/services/assistance.service";
 import { useQuery } from "@tanstack/react-query";
 import { use, useEffect, useState } from "react";
-/* import { ArrowLeft, ArrowRight, FileText } from "lucide-react"; */
-import { FileText } from "lucide-react";
+import { ArrowLeft, ArrowRight, FileText } from "lucide-react";
 import SpinnerPage from "@/components/shared/spinner-page";
 import { Button } from "@/components/ui/button";
+import { usePathname, useRouter } from "next/navigation";
 
 /**
  * ApplicationDetail Component
@@ -39,9 +39,11 @@ export default function ApplicationDetail({
   const { applicationId } = use(params);
   const [pdfUrl, setPdfUrl] = useState<string | null>(null);
   const [status, setStatus] = useState<string | null>(null);
+  const router = useRouter();
+  const pathname = usePathname();
 
   const {
-    data: application,
+    data,
     isFetching,
     error,
   } = useQuery({
@@ -49,6 +51,7 @@ export default function ApplicationDetail({
     queryFn: () => getAssistanceStatusByIdWithDocument(applicationId),
   });
 
+  const { application, previousId, nextId } = data ?? {};
 
   useEffect(() => {
     if (application?.document?.file?.data) {
@@ -59,16 +62,36 @@ export default function ApplicationDetail({
       return () => URL.revokeObjectURL(url);
     }
   }, [application]);
-  if (isFetching) return <SpinnerPage />
+
+  if (isFetching) return <SpinnerPage />;
+
   const onAccept = () => {
-    setStatus('Aceptado');
+    setStatus("Aceptado");
     updateAssistanceApplication(applicationId, { status: "Aceptado" });
-  }
+  };
   const onReject = () => {
-    setStatus('Rechazado');
+    setStatus("Rechazado");
     updateAssistanceApplication(applicationId, { status: "Rechazado" });
-  }
+  };
+
+  const navigateTo = (targetId: string) => {
+    const pathSegments = pathname.split("/");
+    pathSegments[pathSegments.length - 1] = targetId;
+    const newPath = pathSegments.join("/");
+    router.push(newPath);
+  };
+
+  const onPrevious = () => {
+    if (previousId) {
+      navigateTo(previousId);
+    }
+  };
 
+  const onNext = () => {
+    if (nextId) {
+      navigateTo(nextId);
+    }
+  };
   return (
     <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4 min-h-full p-6 w-full">
       <div className="col-span-1 lg:col-span-2 flex flex-col">
@@ -79,11 +102,15 @@ export default function ApplicationDetail({
         {!error && (
           <StudentProfileCard
             pdfUrl={pdfUrl ?? "#"}
-            name={application?.student?.name}
-            email={application?.student?.email}
+            name={application?.student?.user?.name}
+            email={application?.student?.user?.email}
             onAccept={onAccept}
             onReject={onReject}
             status={status ?? application.status}
+            onPrevious={onPrevious}
+            onNext={onNext}
+            disablePrevious={!previousId}
+            disableNext={!nextId}
           />
         )}
       </div>
@@ -117,6 +144,8 @@ interface StudentProfileProps {
   readonly onReject?: () => void;
   readonly onPrevious?: () => void;
   readonly onNext?: () => void;
+  readonly disablePrevious?: boolean;
+  readonly disableNext?: boolean;
 }
 
 function StudentProfileCard({
@@ -125,28 +154,30 @@ function StudentProfileCard({
   pdfUrl = "#",
   onAccept = () => console.log("Accepted"),
   onReject = () => console.log("Rejected"),
-  status = '',
-  /*   onPrevious = () => console.log("Previous applicant"),
-    onNext = () => console.log("Next applicant"), */
+  status = "",
+  onPrevious = () => console.log("Previous applicant"),
+  onNext = () => console.log("Next applicant"),
+  disablePrevious = false,
+  disableNext = false,
 }: StudentProfileProps) {
   return (
     <div className="w-full">
-      <div className="bg-white rounded-3xl shadow-lg p-6 mb-4">
+      <div className="bg-card rounded-3xl shadow-lg p-6 mb-4">
         <div className="mb-6">
-          <p className="text-lg font-medium mb-1">Nombre estudiante:</p>
+          <p className="text-lg font-medium mb-1 text-foreground">Nombre estudiante:</p>
           <p className="text-xl mb-4 font-semibold text-foreground">{name}</p>
 
-          <p className="text-lg font-medium mb-1">Correo:</p>
+          <p className="text-lg font-medium mb-1 text-foreground">Correo:</p>
           <p className="text-xl mb-4 font-semibold text-foreground">{email}</p>
 
-          <p className="text-lg font-medium mb-1">Estado:</p>
+          <p className="text-lg font-medium mb-1 text-foreground">Estado:</p>
           <p className="text-xl mb-4 font-semibold text-foreground">{status}</p>
 
           <a
             href={pdfUrl}
             target="_blank"
             rel="noopener noreferrer"
-            className="flex items-center justify-center gap-2 w-full py-3 bg-gray-100 text-foreground font-medium rounded-lg hover:bg-gray-200 transition-colors mb-4"
+            className="flex items-center justify-center gap-2 w-full py-3 bg-gray-100 text-black font-medium rounded-lg hover:bg-gray-200 transition-colors mb-4"
           >
             <FileText className="w-5 h-5" />
             Ver PDF en nueva pestaña
@@ -155,15 +186,12 @@ function StudentProfileCard({
           <div className="border-b border-gray-300 mb-6"></div>
 
           <div className="space-y-3">
-            <Button
-              onClick={onAccept}
-              className="w-full py-3 text-white font-medium rounded-lg transition-colors"
-            >
+            <Button onClick={onAccept} className="w-full py-3 font-medium rounded-lg transition-colors">
               Aceptar solicitud
             </Button>
             <Button
               onClick={onReject}
-              className="w-full py-3 bg-[#e56b6b] text-white font-medium rounded-lg hover:bg-[#d45c5c] transition-colors"
+              className="w-full py-3 bg-[#e56b6b] font-medium rounded-lg hover:bg-[#d45c5c] transition-colors"
             >
               Rechazar solicitud
             </Button>
@@ -171,10 +199,13 @@ function StudentProfileCard({
         </div>
       </div>
 
-      {/*       <div className="flex justify-between gap-2">
+      <div className="flex gap-2">
         <button
           onClick={onPrevious}
-          className="flex items-center gap-2 bg-core text-white px-4 py-2 rounded-lg hover:bg-core-highlight transition-colors flex-1"
+          disabled={disablePrevious}
+          className={`flex items-center gap-2 px-4 py-2 rounded-lg flex-1 ${
+            disablePrevious ? "bg-gray-300 cursor-not-allowed" : "bg-core text-white hover:bg-core-highlight"
+          }`}
         >
           <ArrowLeft className="w-5 h-5" />
           <span className="text-left">
@@ -186,7 +217,10 @@ function StudentProfileCard({
 
         <button
           onClick={onNext}
-          className="flex items-center gap-2 bg-core text-white px-4 py-2 rounded-lg hover:bg-core-highlight transition-colors flex-1"
+          disabled={disableNext}
+          className={`flex items-center gap-2 px-4 py-2 rounded-lg flex-1 ${
+            disableNext ? "bg-gray-300 cursor-not-allowed" : "bg-core text-white hover:bg-core-highlight"
+          }`}
         >
           <span className="text-right">
             Siguiente
@@ -195,7 +229,7 @@ function StudentProfileCard({
           </span>
           <ArrowRight className="w-5 h-5" />
         </button>
-      </div> */}
+      </div>
     </div>
   );
-}
+}
\ No newline at end of file
diff --git a/apps/web/src/app/inicio/profesor/monitores/page.tsx b/apps/web/src/app/inicio/profesor/monitores/page.tsx
index 4b1edcca..7b7541b2 100644
--- a/apps/web/src/app/inicio/profesor/monitores/page.tsx
+++ b/apps/web/src/app/inicio/profesor/monitores/page.tsx
@@ -32,7 +32,6 @@ import {
   SelectValue,
 } from "@/components/ui/select";
 import SpinnerPage from "@/components/shared/spinner-page";
-import { Skeleton } from "@/components/ui/skeleton";
 import { useQuery } from "@tanstack/react-query";
 import { useTeachingAssistantListStore } from "./store";
 import { cn } from "@/lib/utils";
@@ -42,6 +41,7 @@ import { getTeachingAssistants } from "@/app/services/professor.service";
 import { mapSectionsToProfessorTable } from "@/app/mappers/section.mapper";
 import { ProfessorTA, TeachingAssistantshipProfessorSection } from "@/app/types/teachingAssistantshipProfessorSection";
 import { toast } from "sonner";
+import SkeletonAccordion from "@/components/shared/skeleton-accordion";
 
 
 
@@ -388,33 +388,4 @@ function TeachingAssistantTable({ teachingAssistantList }: { readonly teachingAs
       )}
     </>
   );
-}
-
-
-
-
-
-/**
- * SkeletonAccordion Component
- *
- * Renders loading placeholder UI for accordion items.
- * Displays 8 skeleton items with animated loading effects.
- *
- * @returns {JSX.Element} Loading skeleton UI component
- */
-function SkeletonAccordion() {
-  return (
-    <>
-      {Array.from({ length: 8 }).map((_, index) => (
-        <AccordionItem key={index} value="loading">
-          <AccordionTrigger>
-            <div className="flex items-center w-full">
-              <User className="mr-2 h-5 w-5 text-core-highlight" />
-              <Skeleton className="w-40 h-4" />
-            </div>
-          </AccordionTrigger>
-        </AccordionItem>
-      ))}
-    </>
-  );
-}
+}
\ No newline at end of file
diff --git a/apps/web/src/app/mappers/task.mapper.ts b/apps/web/src/app/mappers/task.mapper.ts
new file mode 100644
index 00000000..1a47dc69
--- /dev/null
+++ b/apps/web/src/app/mappers/task.mapper.ts
@@ -0,0 +1,19 @@
+import { flows } from "../inicio/tareas/flows";
+import { Task } from "../types/entities/task.type";
+
+          
+export function mapTasksToTaskTable(tasks: Task[]) {
+  return tasks.map((task: Task) => {
+    const stepNumber =
+        typeof task.step === "number" ? task.step : Number(task.step);
+    const stepInfo = flows.proyectoPregrado[stepNumber];
+    return {
+      ...task,
+      step: stepNumber,
+      title: stepInfo?.title ?? "Sin título",
+      description: stepInfo?.description ?? "Sin descripción",
+      date: task.date ? new Date(task.date) : new Date(),
+    };
+  });
+}
+
diff --git a/apps/web/src/app/services/thesis.service.ts b/apps/web/src/app/services/thesis.service.ts
index e1546265..1cf55f3e 100644
--- a/apps/web/src/app/services/thesis.service.ts
+++ b/apps/web/src/app/services/thesis.service.ts
@@ -73,8 +73,6 @@ export async function postThesisApplication(
         }),
       }
     );
-
-    // TODO: Return response for modal
   } catch (error) {
     console.error("Error:", error);
     alert("Error al enviar la aplicación");
diff --git a/apps/web/src/components/shared/assistance-list.tsx b/apps/web/src/components/shared/assistance-list.tsx
index e925bc41..4abf2384 100644
--- a/apps/web/src/components/shared/assistance-list.tsx
+++ b/apps/web/src/components/shared/assistance-list.tsx
@@ -24,8 +24,6 @@ interface AssistanceListProps {
 interface FilterBarProps {
   readonly selectedSemester: string;
   readonly setSelectedSemester: (value: string) => void;
-  readonly nameFilter: string;
-  readonly setNameFilter: (value: string) => void;
   readonly showOnlyMyAssistance: boolean;
   readonly setShowOnlyMyAssistance: (value: boolean) => void;
   readonly role: "estudiante" | "profesor";
@@ -85,7 +83,6 @@ export function AssistanceList({
   const [isLoading, setIsLoading] = useState(true);
   const [selectedSemester, setSelectedSemester] = useState("");
   const [showOnlyMyAssistance, setShowOnlyMyAssistance] = useState(false);
-  const [nameFilter, setNameFilter] = useState("");
   const router = useRouter();
 
   const handleClick = React.useCallback(
@@ -173,19 +170,12 @@ export function AssistanceList({
         return `${year}${semester}` === selectedSemester;
       });
     }
-
-    if (nameFilter) {
-      result = result.filter((item) =>
-        item.title.toLowerCase().includes(nameFilter.toLowerCase())
-      );
-    }
-
     if (role === "profesor" && showOnlyMyAssistance && professorName) {
       result = result.filter((item) => item.professor?.user.name === professorName);
     }
 
     return result;
-  }, [data, nameFilter, professorName, role, selectedSemester, showOnlyMyAssistance]);
+  }, [data, professorName, role, selectedSemester, showOnlyMyAssistance]);
 
   if (isLoading) return <SpinnerPage />;
 
@@ -195,8 +185,6 @@ export function AssistanceList({
         <FilterBar
           selectedSemester={selectedSemester}
           setSelectedSemester={setSelectedSemester}
-          nameFilter={nameFilter}
-          setNameFilter={setNameFilter}
           showOnlyMyAssistance={showOnlyMyAssistance}
           setShowOnlyMyAssistance={setShowOnlyMyAssistance}
           role={role}
diff --git a/apps/web/src/components/shared/breadcrumb-detail.tsx b/apps/web/src/components/shared/breadcrumb-detail.tsx
index a1edc25d..bc5855a8 100644
--- a/apps/web/src/components/shared/breadcrumb-detail.tsx
+++ b/apps/web/src/components/shared/breadcrumb-detail.tsx
@@ -36,6 +36,7 @@ const EXCLUDED_ROUTES = undergraduateData
     "aplicantes",
     "manejar",
     "programas",
+    "asistencias"
   ]);
 
 function getBreadcrumbText(pathname: string) {
diff --git a/apps/web/src/components/shared/datepicker.tsx b/apps/web/src/components/shared/datepicker.tsx
index d143a8ad..731851da 100644
--- a/apps/web/src/components/shared/datepicker.tsx
+++ b/apps/web/src/components/shared/datepicker.tsx
@@ -9,54 +9,60 @@ import { CalendarIcon } from "lucide-react";
 import React from "react";
 
 export default function DateRangePicker({
-    value,
-    onChange,
-    className,
-  }: {
-    readonly value: { from: Date; to: Date } | undefined;
-    readonly onChange: (value: { from: Date; to: Date } | undefined) => void;
-    readonly className?: string;
-  }) {
-    return (
-      <div className={cn("grid gap-2", className)}>
-        <Popover>
-          <PopoverTrigger asChild>
-            <Button
-              id="date"
-              variant={"outline"}
-              className={cn(
-                "w-[300px] justify-start text-left font-normal",
-                !value && "text-muted-foreground"
-              )}
-            >
-              <CalendarIcon className="mr-2 h-4 w-4" />
-              {value?.from ? (
-                value.to ? (
-                  <>
-                    {format(value.from, "LLL dd, y")} - {format(value.to, "LLL dd, y")}
-                  </>
-                ) : (
-                  format(value.from, "LLL dd, y")
-                )
-              ) : (
-                <span>Selecciona un rango de fechas</span>
-              )}
-            </Button>
-          </PopoverTrigger>
-          <PopoverContent className="w-auto p-0" align="start">
-            <Calendar
-              initialFocus
-              mode="range"
-              selected={value}
-              onSelect={(range) => onChange(range ? { from: range.from ?? new Date(), to: range.to ?? new Date() } : undefined)}
-              numberOfMonths={2}
-            />
-          </PopoverContent>
-        </Popover>
-      </div>
-    );
+  value,
+  onChange,
+  className,
+}: {
+  readonly value: { from: Date; to: Date } | undefined;
+  readonly onChange: (value: { from: Date; to: Date } | undefined) => void;
+  readonly className?: string;
+}) {
+  const formatValue = (value: {
+    from: Date;
+    to: Date;
+  } | undefined) => {
+    if (value?.from) {
+      return value.to ? (
+        <>
+          {format(value.from, "LLL dd, y")} - {format(value.to, "LLL dd, y")}
+        </>
+      ) : (
+        format(value.from, "LLL dd, y")
+      )
+    }
+    return <span>Selecciona un rango de fechas</span>
   }
 
+  return (
+    <div className={cn("grid gap-2", className)}>
+      <Popover>
+        <PopoverTrigger asChild>
+          <Button
+            id="date"
+            variant={"outline"}
+            className={cn(
+              "w-[300px] justify-start text-left font-normal",
+              !value && "text-muted-foreground"
+            )}
+          >
+            <CalendarIcon className="mr-2 h-4 w-4" />
+            {formatValue(value)}
+          </Button>
+        </PopoverTrigger>
+        <PopoverContent className="w-auto p-0" align="start">
+          <Calendar
+            initialFocus
+            mode="range"
+            selected={value}
+            onSelect={(range) => onChange(range ? { from: range.from ?? new Date(), to: range.to ?? new Date() } : undefined)}
+            numberOfMonths={2}
+          />
+        </PopoverContent>
+      </Popover>
+    </div>
+  );
+}
+
 export function DatePicker() {
   const [date, setDate] = React.useState<Date>()
 
diff --git a/apps/web/src/components/shared/skeleton-accordion.tsx b/apps/web/src/components/shared/skeleton-accordion.tsx
new file mode 100644
index 00000000..6e166bdf
--- /dev/null
+++ b/apps/web/src/components/shared/skeleton-accordion.tsx
@@ -0,0 +1,31 @@
+import { v4 as uuidv4 } from 'uuid';
+import { AccordionItem, AccordionTrigger } from '../ui/accordion';
+import { User } from 'lucide-react';
+import { Skeleton } from '../ui/skeleton';
+
+/**
+ * SkeletonAccordion Component
+ *
+ * Renders loading placeholder UI for accordion items.
+ * Displays 8 skeleton items with animated loading effects.
+ *
+ * @returns {JSX.Element} Loading skeleton UI component
+ */
+
+export default function SkeletonAccordion() {
+  const skeletonIds = Array.from({ length: 8 }).map(() => uuidv4());
+  return (
+    <>
+      {skeletonIds.map((id) => (
+        <AccordionItem key={id} value="loading">
+          <AccordionTrigger>
+            <div className="flex items-center w-full">
+              <User className="mr-2 h-5 w-5 text-core-highlight" />
+              <Skeleton className="w-40 h-4" />
+            </div>
+          </AccordionTrigger>
+        </AccordionItem>
+      ))}
+    </>
+  );
+}
\ No newline at end of file
diff --git a/apps/web/src/components/shared/tab-applicants.tsx b/apps/web/src/components/shared/tab-applicants.tsx
index d7ad5f10..2fd58885 100644
--- a/apps/web/src/components/shared/tab-applicants.tsx
+++ b/apps/web/src/components/shared/tab-applicants.tsx
@@ -189,7 +189,7 @@ function ApplicantsTable({ applicants, handleDetails }: { readonly applicants: G
               className="h-9 px-3 bg-core text-card hover:bg-core-highlight"
               onClick={() => setSortAscending(!sortAscending)}
             >
-              <span className="mr-1">A - Z</span>
+              <span className="mr-1 text-foreground">A - Z</span>
               <ChevronDown
                 className={`h-4 w-4 transform ${sortAscending ? "" : "rotate-180"}`}
               />
diff --git a/apps/web/src/components/shared/tab-status.tsx b/apps/web/src/components/shared/tab-status.tsx
index 0a0ab630..dfbea28b 100644
--- a/apps/web/src/components/shared/tab-status.tsx
+++ b/apps/web/src/components/shared/tab-status.tsx
@@ -160,17 +160,22 @@ interface StepSphereProps {
 }
 
 function StepSphere({ name, completed, current }: StepSphereProps) {
+  const getDivStyles = (completed: boolean, current: boolean) => {
+    if (completed) return "bg-core text-primary-foreground";
+    return current ? "bg-core-soft dark:bg-core text-primary border-2 border-core" : "bg-gray-100 text-gray-400 dark:bg-gray-800"
+  }
+  const getTextStyles = (completed: boolean, current: boolean) => {
+    if (current) return "";
+    return completed ? "text-foreground" : "text-muted-foreground"
+  }
+
   return (
     <div className="flex md:flex-col flex-row md:items-center items-start gap-3">
       <div className="relative">
         <div
           className={cn(
             "w-10 h-10 rounded-full flex items-center justify-center z-10 relative",
-            completed
-              ? "bg-core text-primary-foreground"
-              : current
-                ? "bg-core-soft dark:bg-core text-primary border-2 border-core"
-                : "bg-gray-100 text-gray-400 dark:bg-gray-800",
+            getDivStyles(completed, current)
           )}
         >
           {completed ? (<Check/>) : (<span>{name.charAt(0)}</span>)}
@@ -180,7 +185,7 @@ function StepSphere({ name, completed, current }: StepSphereProps) {
         <p
           className={cn(
             "font-medium",
-            current ? "text-primary" : completed ? "text-foreground" : "text-muted-foreground",
+            getTextStyles(completed, current)
           )}
         >
           {name}
diff --git a/apps/web/src/components/shared/upload-files.tsx b/apps/web/src/components/shared/upload-files.tsx
index 7b8099e0..cb1a39b7 100644
--- a/apps/web/src/components/shared/upload-files.tsx
+++ b/apps/web/src/components/shared/upload-files.tsx
@@ -30,20 +30,24 @@ export default function UploadFiles({
     setIsModalOpen(true)
   }
 
+  const isNonNull = (row: CsvRow) => {
+    return Object.values(row).some(
+      (value) => typeof value === "string" && value.trim() !== ""
+    )
+  }
+
   const onConfirmUpload = () => {
     if (!file) return setIsModalOpen(false);
 
     const extension = file.name.split(".").pop()?.toLowerCase();
 
     if (extension === "csv") {
-      Papa.parse<Record<string, string | number | boolean | null>>(file, {
+      Papa.parse<CsvRow>(file, {
         header: true,
         skipEmptyLines: true,
         complete: (results) => {
           const filteredData = results.data.filter((row) =>
-            Object.values(row).some(
-              (value) => typeof value === "string" && value.trim() !== ""
-            )
+            isNonNull(row)
           );
           handleUploadCsv(filteredData);
           setIsModalOpen(false);
diff --git a/sonar-project.properties b/sonar-project.properties
index 1a652ebc..744ffbe9 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -5,5 +5,5 @@ sonar.sources=src
 sonar.sourceEncoding=UTF-8
 sonar.test=src
 sonar.test.inclusions=**/*.spec.ts,**/*.spec.tsx,**/*.test.ts,**/*.test.tsx
-sonar.exclusions=**/seed/**, **/components/ui/*.tsx, apps/web/src/app/globals.css, test/*.ts
+sonar.exclusions=**/seed/**, **/components/ui/*.tsx, apps/web/src/app/globals.css, test/*.ts, packages/**/*.ts, cucumber.js
 sonar.javascript.lcov.reportPaths=coverage/api/lcov.info,coverage/web/lcov.info
\ No newline at end of file