diff --git a/src/core/components/SortableBox.tsx b/src/core/components/SortableBox.tsx
index 56ced33e..512c4f51 100644
--- a/src/core/components/SortableBox.tsx
+++ b/src/core/components/SortableBox.tsx
@@ -1,5 +1,4 @@
-// @ts-nocheck
-// dont need size in the second one will fix later
+// dont need size in the second one will fix later: set to null to avoid the warning
 
 import {
   SortableContext,
@@ -36,6 +35,7 @@ export const SortableProjectBox = ({ boxes }) => {
       <SortableContext items={boxes} strategy={rectSwappingStrategy}>
         {boxes.map((boxes) => (
           <Boxes
+            size={null}
             key={boxes.id}
             id={boxes.id}
             title={boxes.title}
diff --git a/src/core/components/navbar/MainNavbar.tsx b/src/core/components/navbar/MainNavbar.tsx
index 9fe773f2..c571c6ad 100644
--- a/src/core/components/navbar/MainNavbar.tsx
+++ b/src/core/components/navbar/MainNavbar.tsx
@@ -1,4 +1,4 @@
-// @ts-nocheck
+//
 // issue with element versus string
 
 import Link from "next/link"
@@ -13,6 +13,30 @@ import { HomeIcon } from "@heroicons/react/24/outline"
 import NotificationsMenu from "src/core/components/NotificationMenu"
 import Image from "next/image"
 
+type LogoProps = {
+  theme: string
+}
+const StapleLogo = ({ theme }: LogoProps) => {
+  const Themes = [
+    "dark",
+    "dracula",
+    "halloween",
+    "forest",
+    "luxury",
+    "business",
+    "night",
+    "coffee",
+    "dim",
+    "sunset",
+  ]
+
+  return Themes.includes(theme) ? (
+    <Image src="/stapler_white.png" width={25} height={25} alt="Staple Logo" />
+  ) : (
+    <Image src="/stapler_black.png" width={25} height={25} alt="Staple Logo" />
+  )
+}
+
 // MainNavbar
 // Always present on the top of the page
 // Includes non-project specific functionalities
@@ -57,33 +81,12 @@ const Navbar = () => {
     }
   }, [theme])
 
-  var logo = ""
-
-  if (
-    [
-      "dark",
-      "dracula",
-      "halloween",
-      "forest",
-      "luxury",
-      "business",
-      "night",
-      "coffee",
-      "dim",
-      "sunset",
-    ].includes(theme)
-  ) {
-    logo = <Image src="/stapler_white.png" width={25} height={25} alt="Staple Logo" />
-  } else {
-    logo = <Image src="/stapler_black.png" width={25} height={25} alt="Staple Logo" />
-  }
-
   // return pages
   return (
     <div className="flex-0 navbar bg-base-100 sticky z-[1099] top-0 border-b border-gray-300 sm:px-4 md:px-6 lg:px-8 xl:px-10">
       {/* Tabs */}
       {/* On the left */}
-      <div className="flex-1">{logo}</div>
+      <div className="flex-1">{StapleLogo({ theme })}</div>
       {/* On the right */}
       <div className="flex space-x-5">
         {/* Templated tabs tab */}
diff --git a/src/elements/components/ElementDashboard.tsx b/src/elements/components/ElementDashboard.tsx
index 606c92a9..ed97b705 100644
--- a/src/elements/components/ElementDashboard.tsx
+++ b/src/elements/components/ElementDashboard.tsx
@@ -1,4 +1,3 @@
-// @ts-nocheck
 // element dashboard assignees issue
 
 import { useRouter } from "next/router"
@@ -130,7 +129,7 @@ export const PMElement = () => {
       return task.schema !== null
     })
     if (allAssignments.length > 0) {
-      const allForms = allAssignments.flatMap((assignment) => assignment.assignees)
+      const allForms = allAssignments.flatMap((assignment) => assignment["assignees"])
       const completedAssignments = allForms.filter(
         (assignment) => assignment.statusLogs[0].status === "COMPLETED"
       )
@@ -140,7 +139,8 @@ export const PMElement = () => {
     }
 
     const completedLabels = tasks.filter((task) => {
-      return task.labels.length > 0
+      const l = task.hasOwnProperty("labels") ? task["labels"].length : 0
+      return l > 0
     })
     labelPercent = completedLabels.length / tasks.length
   } else {
@@ -171,7 +171,7 @@ export const PMElement = () => {
                   text={`${Math.round(taskPercent * 100)}%`}
                   styles={buildStyles({
                     textSize: "16px",
-                    pathTransitionDuration: "none",
+                    pathTransitionDuration: 0,
                     pathColor: "oklch(var(--p))",
                     textColor: "oklch(var(--s))",
                     trailColor: "oklch(var(--pc))",
@@ -196,7 +196,7 @@ export const PMElement = () => {
                   text={`${Math.round(formPercent * 100)}%`}
                   styles={buildStyles({
                     textSize: "16px",
-                    pathTransitionDuration: "none",
+                    pathTransitionDuration: 0,
                     pathColor: "oklch(var(--p))",
                     textColor: "oklch(var(--s))",
                     trailColor: "oklch(var(--pc))",
@@ -221,7 +221,7 @@ export const PMElement = () => {
                   text={`${Math.round(labelPercent * 100)}%`}
                   styles={buildStyles({
                     textSize: "16px",
-                    pathTransitionDuration: "none",
+                    pathTransitionDuration: 0,
                     pathColor: "oklch(var(--p))",
                     textColor: "oklch(var(--s))",
                     trailColor: "oklch(var(--pc))",
diff --git a/src/forms/components/FormsTable.tsx b/src/forms/components/FormsTable.tsx
index c70aac78..c2ca0ffe 100644
--- a/src/forms/components/FormsTable.tsx
+++ b/src/forms/components/FormsTable.tsx
@@ -1,13 +1,10 @@
-// @ts-nocheck
-// issue with !.title
-
 import React from "react"
 import { Forms } from "db"
-
 import { createColumnHelper } from "@tanstack/react-table"
 import Link from "next/link"
 import { Routes } from "@blitzjs/next"
 import { JsonFormModal } from "src/core/components/JsonFormModal"
+import { getSchemaTitle } from "src/services/getSchemaTitle"
 
 // TODO: Is it better to call the database for column name every time or just one time and pass the value to child components?
 // Column helper
@@ -16,7 +13,7 @@ const columnHelper = createColumnHelper<Forms>()
 // ColumnDefs
 export const formsTableColumns = [
   columnHelper.accessor("schema", {
-    cell: (info) => <span>{info.getValue()!.title}</span>,
+    cell: (info) => <span>{getSchemaTitle(info.getValue())}</span>,
     header: "Name",
   }),
   columnHelper.accessor("updatedAt", {
diff --git a/src/forms/components/ProjectFormsTable.tsx b/src/forms/components/ProjectFormsTable.tsx
index fb320747..1cef000a 100644
--- a/src/forms/components/ProjectFormsTable.tsx
+++ b/src/forms/components/ProjectFormsTable.tsx
@@ -1,9 +1,8 @@
-// @ts-nocheck
 // issue with !.title
 
 import Link from "next/link"
 import { Routes } from "@blitzjs/next"
-import { Prisma } from "@prisma/client"
+import { Prisma, Task } from "@prisma/client"
 import Table from "src/core/components/Table"
 import getTasks from "src/tasks/queries/getTasks"
 import { createColumnHelper } from "@tanstack/react-table"
@@ -11,15 +10,16 @@ import { useRouter } from "next/router"
 import { usePaginatedQuery } from "@blitzjs/rpc"
 import { useParam } from "@blitzjs/next"
 import { useState, useEffect } from "react"
+import { getSchemaTitle } from "src/services/getSchemaTitle"
 
-const columnHelper = createColumnHelper<Forms>()
+const columnHelper = createColumnHelper<Task>()
 export const projectFormTableColumns = [
   columnHelper.accessor("name", {
     cell: (info) => <span>{info.getValue()}</span>,
     header: "Task",
   }),
   columnHelper.accessor("schema", {
-    cell: (info) => <span> {info.getValue() ? info.getValue()!.title : ""}</span>,
+    cell: (info) => <span> {info.getValue() ? getSchemaTitle(info.getValue()) : ""}</span>,
     header: "Form Required",
   }),
   columnHelper.accessor("id", {
@@ -31,9 +31,7 @@ export const projectFormTableColumns = [
         className="btn btn-primary"
         href={Routes.ShowFormPage({
           taskId: info.getValue(),
-          // eslint-disable-next-line react-hooks/exhaustive-deps
-          // eslint-disable-next-line react-hooks/rules-of-hooks
-          projectId: useParam("projectId", "number"),
+          projectId: info.row.original.projectId,
         })}
       >
         View
diff --git a/src/forms/mutations/createForm.ts b/src/forms/mutations/createForm.ts
index 4586367a..3afd6603 100644
--- a/src/forms/mutations/createForm.ts
+++ b/src/forms/mutations/createForm.ts
@@ -1,16 +1,15 @@
-// @ts-nocheck
-// issue with schema line?
 import { resolver } from "@blitzjs/rpc"
 import { CreateFormSchema } from "../schemas"
-import db from "db"
+import db, { Prisma } from "db"
 
 export default resolver.pipe(
   resolver.zod(CreateFormSchema),
   resolver.authorize(),
   async ({ userId, schema, uiSchema }) => {
+    const newSchema = schema != null ? schema : Prisma.JsonNull
     const form = await db.forms.create({
       data: {
-        schema,
+        schema: newSchema,
         uiSchema,
         user: {
           connect: { id: userId },
diff --git a/src/forms/mutations/updateForm.ts b/src/forms/mutations/updateForm.ts
index 94aecc27..2dc35f1f 100644
--- a/src/forms/mutations/updateForm.ts
+++ b/src/forms/mutations/updateForm.ts
@@ -1,15 +1,19 @@
-// @ts-nocheck
-// null not assignable to json null
-
 import { resolver } from "@blitzjs/rpc"
-import db from "db"
+import db, { Prisma } from "db"
 import { EditFormSchema } from "../schemas"
 
 export default resolver.pipe(
   resolver.zod(EditFormSchema),
   resolver.authorize(),
   async ({ id, ...data }) => {
-    const forms = await db.forms.update({ where: { id }, data })
+    const newSchema = data.schema != null ? data.schema : Prisma.JsonNull
+    const forms = await db.forms.update({
+      where: { id },
+      data: {
+        uiSchema: data.uiSchema,
+        schema: newSchema,
+      },
+    })
 
     return forms
   }
diff --git a/src/labels/components/ContributorsLabelsList.tsx b/src/labels/components/ContributorsLabelsList.tsx
index 41ecab0d..28c4dfb9 100644
--- a/src/labels/components/ContributorsLabelsList.tsx
+++ b/src/labels/components/ContributorsLabelsList.tsx
@@ -1,10 +1,7 @@
-// @ts-nocheck
-// issue with label.user
-
 import { useQuery } from "@blitzjs/rpc"
 import { useRouter } from "next/router"
 import getLabels from "../queries/getLabels"
-import { LabelInformation, labelTableColumnsSimple } from "./LabelTable"
+import { LabelInformation } from "./LabelTable"
 import Table from "src/core/components/Table"
 
 export const ContributorLabelsList = ({ usersId, projectId, columns }) => {
@@ -26,9 +23,10 @@ export const ContributorLabelsList = ({ usersId, projectId, columns }) => {
     const description = label.description || ""
     const taxonomy = label.taxonomy || ""
 
-    const userName = label.user.firstName
-      ? `${label.user.firstName} ${label.user.lastName}`
-      : label.user.username
+    const user = label["user"]
+    const userName = user["firstName"]
+      ? `${user["firstName"]} ${user["lastName"]}`
+      : user["username"]
 
     let t: LabelInformation = {
       name: name,
@@ -43,12 +41,9 @@ export const ContributorLabelsList = ({ usersId, projectId, columns }) => {
     return t
   })
 
-  //console.log(labels)
-
   return (
     <div>
       <main className="flex flex-col mt-2 mx-auto w-full max-w-7xl">
-        {/* <h1 className="flex justify-center mb-2">All Contributors</h1> */}
         <Table columns={columns} data={contributorLabelInformation} />
       </main>
     </div>
diff --git a/src/labels/components/LabelTable.tsx b/src/labels/components/LabelTable.tsx
index 0584dd2a..4a0affa4 100644
--- a/src/labels/components/LabelTable.tsx
+++ b/src/labels/components/LabelTable.tsx
@@ -1,4 +1,3 @@
-// @ts-nocheck
 import React, { useState } from "react"
 import { createColumnHelper } from "@tanstack/react-table"
 import Modal from "src/core/components/Modal"
@@ -19,6 +18,7 @@ export type LabelInformation = {
   userId: number
   onChangeCallback?: () => void
   taxonomyList: string[]
+  userName?: string
 }
 
 const EditColumn = ({ row }) => {
diff --git a/src/messages/hooks/useNotificationTable.tsx b/src/messages/hooks/useNotificationTable.tsx
index c24e4c43..ed5c28b4 100644
--- a/src/messages/hooks/useNotificationTable.tsx
+++ b/src/messages/hooks/useNotificationTable.tsx
@@ -1,11 +1,14 @@
-// @ts-nocheck
-import { Notification } from "db"
 import { createColumnHelper } from "@tanstack/react-table"
 import ReadToggle from "../components/ReadToggle"
-import { useNotification } from "../components/NotificationContext"
+import { useNotification, ExtendedNotification } from "../components/NotificationContext"
+import { Project } from "db"
 
 // Column helper
-const columnHelper = createColumnHelper<Notification>()
+const columnHelper = createColumnHelper<ExtendedNotification>()
+
+const getProjectName = (project: Project) => {
+  return project ? project.name.substring(0, 20) : "N/A"
+}
 
 // ColumnDefs
 export const useNotificationTableColumns = () => {
@@ -28,7 +31,6 @@ export const useNotificationTableColumns = () => {
       ),
       header: "Date",
     }),
-    // TODO: Define Notification with extended project because of include
     columnHelper.accessor("projectId", {
       id: "projectTitle",
       header: "Project",
diff --git a/src/pages/notifications/index.tsx b/src/pages/notifications/index.tsx
index c274b312..26d1e03c 100644
--- a/src/pages/notifications/index.tsx
+++ b/src/pages/notifications/index.tsx
@@ -8,7 +8,7 @@ import { useNotificationTableColumns } from "src/messages/hooks/useNotificationT
 const NotificationContent = () => {
   // Get notifications
   const { notifications, page, hasMore, goToPreviousPage, goToNextPage } = useNotification()
-  console.log(notifications)
+  // console.log(notifications)
   // Get columns and pass refetch
   const columns = useNotificationTableColumns()
 
@@ -19,7 +19,7 @@ const NotificationContent = () => {
       </Head>
       <main className="flex flex-col mt-2 mx-auto w-full max-w-7xl">
         <h1 className="flex justify-center mb-2 text-3xl">All Notifications</h1>
-        <Table columns={columns} data={notifications} />
+        <Table columns={columns} data={extendeNotifications} />
         <div className="join grid grid-cols-2 my-6">
           <button
             className="join-item btn btn-secondary"
diff --git a/src/pages/projects/[projectId]/contributors/[contributorId].tsx b/src/pages/projects/[projectId]/contributors/[contributorId].tsx
index d0be9f69..564278fc 100644
--- a/src/pages/projects/[projectId]/contributors/[contributorId].tsx
+++ b/src/pages/projects/[projectId]/contributors/[contributorId].tsx
@@ -1,4 +1,3 @@
-// @ts-nocheck
 import { Suspense } from "react"
 import { Routes } from "@blitzjs/next"
 import Head from "next/head"
@@ -42,7 +41,9 @@ export const ContributorPage = () => {
   })
 
   const user = contributor[0].user
-  const teams = currentContributor.teams.map((team) => team.name)
+  const teams = currentContributor.hasOwnProperty("teams")
+    ? currentContributor["teams"].map((team) => team.name)
+    : ""
 
   const handleDelete = async () => {
     if (
diff --git a/src/pages/projects/[projectId]/contributors/[contributorId]/edit.tsx b/src/pages/projects/[projectId]/contributors/[contributorId]/edit.tsx
index 2a0c7bb3..9e311ecc 100644
--- a/src/pages/projects/[projectId]/contributors/[contributorId]/edit.tsx
+++ b/src/pages/projects/[projectId]/contributors/[contributorId]/edit.tsx
@@ -1,4 +1,3 @@
-// @ts-nocheck
 import { Suspense } from "react"
 import { Routes } from "@blitzjs/next"
 import Head from "next/head"
@@ -33,24 +32,25 @@ export const EditContributor = () => {
   return (
     <Layout>
       <Head>
-        <title>Edit Contributor {user[0].username} </title>
+        <title>Edit Contributor {user[0]?.username} </title>
       </Head>
 
       <div>
         <h1 className="text-3xl mb-2">
           Edit Contributor{" "}
-          {user[0].firstName || user[0].lastName
+          {user[0]?.firstName || user[0]?.lastName
             ? `${user[0].firstName} ${user[0].lastName}`
-            : user[0].username}
+            : user[0]?.username}
         </h1>
         <Suspense fallback={<div>Loading...</div>}>
           <ContributorFormEdit
+            projectId={projectId as number}
             cancelText="Cancel"
             onCancel={() =>
               router.push(
                 Routes.ShowContributorPage({
                   projectId: projectId!,
-                  contributorId: contributorId,
+                  contributorId: contributorId as number,
                 })
               )
             }
@@ -60,8 +60,8 @@ export const EditContributor = () => {
             onSubmit={async (values) => {
               try {
                 const updated = await updateContributorMutation({
-                  id: contributor.id,
-                  projectId: projectId,
+                  // id: contributor.id,
+                  // projectId: projectId,
                   ...values,
                 })
                 await toast.promise(Promise.resolve(updated), {
diff --git a/src/pages/projects/[projectId]/credit/LabelsTab.tsx b/src/pages/projects/[projectId]/credit/LabelsTab.tsx
index 17a9090a..4de765f2 100644
--- a/src/pages/projects/[projectId]/credit/LabelsTab.tsx
+++ b/src/pages/projects/[projectId]/credit/LabelsTab.tsx
@@ -1,4 +1,3 @@
-// @ts-nocheck
 import { Suspense, useState } from "react"
 import { useMutation, usePaginatedQuery } from "@blitzjs/rpc"
 import router, { useRouter } from "next/router"
@@ -146,9 +145,9 @@ const LabelsTab = () => {
     return s != -1
   }
 
-  let checkedIds = []
+  let checkedIds: number[] = []
   labels.forEach((label) => {
-    let s = projectInLabel(label.projects, projectId)
+    let s = projectInLabel(label["projects"], projectId)
     if (s) checkedIds.push(label.id)
   })
 
diff --git a/src/pages/projects/[projectId]/notifications/index.tsx b/src/pages/projects/[projectId]/notifications/index.tsx
index d60b5de5..fb362a2c 100644
--- a/src/pages/projects/[projectId]/notifications/index.tsx
+++ b/src/pages/projects/[projectId]/notifications/index.tsx
@@ -12,6 +12,8 @@ const NotificationContent = () => {
   // Get columns and pass refetch
   const columns = useProjectNotificationTableColumns()
 
+  const extendeNotifications = notifications.map((not) => not) as ExtendedNotification[]
+
   return (
     <>
       <Head>
@@ -19,7 +21,7 @@ const NotificationContent = () => {
       </Head>
       <main className="flex flex-col mt-2 mx-auto w-full max-w-7xl">
         <h1 className="flex justify-center mb-2 text-3xl">Project Notifications</h1>
-        <Table columns={columns} data={notifications} />
+        <Table columns={columns} data={extendeNotifications} />
         <div className="join grid grid-cols-2 my-6">
           <button
             className="join-item btn btn-secondary"
diff --git a/src/pages/projects/[projectId]/summary/ByElements.tsx b/src/pages/projects/[projectId]/summary/ByElements.tsx
index b6df2478..5e5d358b 100644
--- a/src/pages/projects/[projectId]/summary/ByElements.tsx
+++ b/src/pages/projects/[projectId]/summary/ByElements.tsx
@@ -1,4 +1,3 @@
-// @ts-nocheck
 import { Suspense, useState } from "react"
 import { useMutation, usePaginatedQuery } from "@blitzjs/rpc"
 import router, { useRouter } from "next/router"
@@ -22,7 +21,7 @@ const ByElements = ({ elements, teams, contributors, tasks }) => {
             <ContributorsView
               contributor={contributor}
               tasks={[]}
-              id={contributor.id}
+              // id={contributor.id}
               key={contributor.id}
               printTask={false}
             ></ContributorsView>
@@ -34,7 +33,7 @@ const ByElements = ({ elements, teams, contributors, tasks }) => {
             <TeamView
               team={teamInfo}
               tasks={[]}
-              id={teamInfo.id}
+              // id={teamInfo.id}
               key={teamInfo.id}
               printTask={false}
             ></TeamView>
diff --git a/src/pages/projects/[projectId]/summary/ByTasks.tsx b/src/pages/projects/[projectId]/summary/ByTasks.tsx
index 3e140632..bfb7ce10 100644
--- a/src/pages/projects/[projectId]/summary/ByTasks.tsx
+++ b/src/pages/projects/[projectId]/summary/ByTasks.tsx
@@ -1,4 +1,3 @@
-// @ts-nocheck
 import router from "next/router"
 
 import React from "react"
@@ -15,7 +14,7 @@ const ByTasks = ({ tasks, contributors, teams }) => {
           <TeamView
             team={teamInfo}
             tasks={[]}
-            id={teamInfo.id}
+            // id={teamInfo.id}
             key={teamInfo.id}
             printTask={false}
           ></TeamView>
@@ -28,7 +27,7 @@ const ByTasks = ({ tasks, contributors, teams }) => {
             contributor={conInfo}
             tasks={[]}
             printTask={false}
-            id={conInfo.id}
+            // id={conInfo.id}
             key={conInfo.id}
             printLabels={true}
           ></ContributorsView>
diff --git a/src/pages/projects/[projectId]/tasks/[taskId]/assignments.tsx b/src/pages/projects/[projectId]/tasks/[taskId]/assignments.tsx
index 391a15f7..1be2c33f 100644
--- a/src/pages/projects/[projectId]/tasks/[taskId]/assignments.tsx
+++ b/src/pages/projects/[projectId]/tasks/[taskId]/assignments.tsx
@@ -1,4 +1,3 @@
-// @ts-nocheck
 import { Suspense } from "react"
 import { useQuery } from "@blitzjs/rpc"
 import { Routes, useParam } from "@blitzjs/next"
@@ -72,7 +71,7 @@ export const AssignmentsPage = () => {
 
   let individualColumns
   let teamColumns
-  if (assignments[0].task.schema) {
+  if (assignments[0]?.task.schema) {
     individualColumns = assignmentTableColumnsSchema
     teamColumns = teamAssignmentTableColumnsSchema
   } else {
@@ -97,19 +96,19 @@ export const AssignmentsPage = () => {
                   <Link
                     className="btn btn-primary"
                     href={Routes.EditTaskPage({
-                      projectId: projectId,
-                      taskId: taskId,
+                      projectId: projectId as number,
+                      taskId: taskId as number,
                     })}
                   >
                     Edit Task
                   </Link>
 
-                  {assignments[0].task.schema ? (
+                  {assignments[0]?.task.schema ? (
                     <Link
                       className="btn btn-secondary mx-2"
                       href={Routes.ShowFormPage({
-                        projectId: projectId,
-                        taskId: taskId,
+                        projectId: projectId as number,
+                        taskId: taskId as number,
                       })}
                     >
                       Download Form Data
diff --git a/src/services/getSchemaTitle.ts b/src/services/getSchemaTitle.ts
new file mode 100644
index 00000000..22ce8538
--- /dev/null
+++ b/src/services/getSchemaTitle.ts
@@ -0,0 +1,3 @@
+export function getSchemaTitle(jsonSchema) {
+  return jsonSchema != null && jsonSchema.hasOwnProperty("title") ? jsonSchema["title"] : ""
+}
diff --git a/src/services/jsonconverter/getDefaultSchemaList.ts b/src/services/jsonconverter/getDefaultSchemaList.ts
index e4ba6ecf..be975143 100644
--- a/src/services/jsonconverter/getDefaultSchemaList.ts
+++ b/src/services/jsonconverter/getDefaultSchemaList.ts
@@ -1,5 +1,3 @@
-// @ts-nocheck
-
 import {
   JsonContributor,
   JsonContributorUI,
@@ -12,7 +10,9 @@ export function getDefaultSchemaLists() {
 
   const restructured = schemas.map((schema, index) => {
     const parsed = JSON.parse(schema)
-    const uiparse = JSON.parse(uis[index])
+    const newUi =
+      uis[index] != null && uis[index] != undefined ? (uis[index] as string) : String("{}")
+    const uiparse = JSON.parse(newUi)
     return {
       name: parsed.title,
       id: -(index + 1),
diff --git a/src/tasks/components/ContributorsTaskListDone.tsx b/src/tasks/components/ContributorsTaskListDone.tsx
index 2ea9e320..2c1b4465 100644
--- a/src/tasks/components/ContributorsTaskListDone.tsx
+++ b/src/tasks/components/ContributorsTaskListDone.tsx
@@ -1,5 +1,3 @@
-// @ts-nocheck
-
 import { useQuery } from "@blitzjs/rpc"
 import Table from "src/core/components/Table"
 import getTasks from "src/tasks/queries/getTasks"
@@ -25,7 +23,7 @@ export const ContributorTaskListDone = ({ contributor, columns }) => {
   const completedTasks = tasks
     .map((task) => ({
       ...task,
-      assignees: task.assignees.filter(
+      assignees: task["assignees"].filter(
         (assignee) =>
           assignee.statusLogs.length > 0 && assignee.statusLogs[0].status === "COMPLETED"
       ),
diff --git a/src/tasks/components/TaskForm.tsx b/src/tasks/components/TaskForm.tsx
index 25a898f3..e35a3471 100644
--- a/src/tasks/components/TaskForm.tsx
+++ b/src/tasks/components/TaskForm.tsx
@@ -1,5 +1,3 @@
-// @ts-nocheck
-
 import { Form, FormProps } from "src/core/components/fields/Form"
 import { LabeledTextField } from "src/core/components/fields/LabeledTextField"
 import { LabeledTextAreaField } from "src/core/components/fields/LabeledTextAreaField"
@@ -14,7 +12,6 @@ import Modal from "src/core/components/Modal"
 import { useEffect, useState } from "react"
 import { getDefaultSchemaLists } from "src/services/jsonconverter/getDefaultSchemaList"
 import getTeams from "src/teams/queries/getTeams"
-import { FORM_ERROR } from "final-form"
 import CheckboxFieldTable from "src/core/components/fields/CheckboxFieldTable"
 import moment from "moment"
 import { ContributorPrivileges } from "db"
@@ -98,10 +95,10 @@ export function TaskForm<S extends z.ZodType<any, any>>(props: TaskFormProps<S>)
 
   const pmSchemas = pmForms.forms
     // Dropping forms that do not have a title added by the user
-    .filter((form) => form.schema && form.schema.title)
+    .filter((form) => form.schema && form.schema["title"])
     .map((form) => ({
       id: form.id,
-      name: form.schema?.title,
+      name: form.schema != null ? form.schema["title"] : null,
       schema: form.schema,
       ui: form.uiSchema,
     }))
diff --git a/src/tasks/components/TaskFormData.tsx b/src/tasks/components/TaskFormData.tsx
index acef6010..e2b06adc 100644
--- a/src/tasks/components/TaskFormData.tsx
+++ b/src/tasks/components/TaskFormData.tsx
@@ -1,5 +1,5 @@
-// @ts-nocheck
-
+//@ts-nocheck
+//The center component is depricate , needs to refactor the layout of required button and download button
 import { useContext, useState } from "react"
 import { Tooltip } from "react-tooltip"
 import JsonForm from "src/assignments/components/JsonForm"
@@ -26,9 +26,9 @@ export const TaskFormData = () => {
   }
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  const taskId = useParam("taskId", "number")
+  const taskId = useParam("taskId", "number") as number
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  const projectId = useParam("projectId", "number")
+  const projectId = useParam("projectId", "number") as number
 
   const uiSchema = task["ui"] || {}
   let extendedUiSchema = {}
diff --git a/src/tasks/mutations/createTask.ts b/src/tasks/mutations/createTask.ts
index cbae1c43..bfa604cb 100644
--- a/src/tasks/mutations/createTask.ts
+++ b/src/tasks/mutations/createTask.ts
@@ -1,5 +1,3 @@
-// @ts-nocheck
-
 import { resolver } from "@blitzjs/rpc"
 import db, { CompletedAs } from "db"
 import { CreateTaskSchema } from "../schemas"
diff --git a/src/tasks/mutations/updateTask.ts b/src/tasks/mutations/updateTask.ts
index f5b45331..3becafc8 100644
--- a/src/tasks/mutations/updateTask.ts
+++ b/src/tasks/mutations/updateTask.ts
@@ -1,5 +1,3 @@
-// @ts-nocheck
-
 import { resolver } from "@blitzjs/rpc"
 import db from "db"
 import { UpdateTaskSchema } from "../schemas"
diff --git a/src/tasks/schemas.ts b/src/tasks/schemas.ts
index 8d77b084..458c51cb 100644
--- a/src/tasks/schemas.ts
+++ b/src/tasks/schemas.ts
@@ -163,7 +163,10 @@ export const CreateTaskSchema = z.object({
       },
       { message: "Invalid JSON format" }
     )
-    .transform((data) => data as Prisma.NullableJsonNullValueInput),
+    .transform((data) => {
+      if (data === null) return Prisma.JsonNull
+      else return data as Prisma.JsonNullValueInput
+    }),
 })
 
 export const UpdateTaskSchema = z.object({
@@ -211,7 +214,10 @@ export const UpdateTaskSchema = z.object({
       },
       { message: "Invalid JSON format" }
     )
-    .transform((data) => data as Prisma.NullableJsonNullValueInput),
+    .transform((data) => {
+      if (data === null) return Prisma.JsonNull
+      else return data as Prisma.JsonNullValueInput
+    }),
 })
 
 export const UpdateTaskStatusSchema = z.object({
diff --git a/src/teams/hooks/useTeamTaskListDone.tsx b/src/teams/hooks/useTeamTaskListDone.tsx
index c64a51d0..814d4747 100644
--- a/src/teams/hooks/useTeamTaskListDone.tsx
+++ b/src/teams/hooks/useTeamTaskListDone.tsx
@@ -1,5 +1,3 @@
-// @ts-nocheck
-
 import { useQuery } from "@blitzjs/rpc"
 import getTasks from "src/tasks/queries/getTasks"
 import getUsers from "src/users/queries/getUsers"
@@ -44,7 +42,7 @@ export const useTeamTaskListDone = (teamId: number) => {
   const completedTasks = tasks
     .map((task) => ({
       ...task,
-      assignees: task.assignees.filter(
+      assignees: task["assignees"].filter(
         (assignee) =>
           assignee.statusLogs.length > 0 && assignee.statusLogs[0].status === "COMPLETED"
       ),
@@ -77,7 +75,7 @@ export const useTeamTaskListDone = (teamId: number) => {
   // Create a user map for quick lookup and format the name
   const userMap: { [key: number]: string } = {}
   users.forEach((user) => {
-    user.contributions.forEach((contribution) => {
+    user["contributions"].forEach((contribution) => {
       const { firstName, lastName, username } = user
       const fullName = firstName && lastName ? `${firstName} ${lastName}` : username
       userMap[contribution.id] = fullName
@@ -95,8 +93,8 @@ export const useTeamTaskListDone = (teamId: number) => {
         taskName: task.name,
         // Labels
         labels:
-          task.labels.length > 0
-            ? task.labels.map((label) => label.name).join(", ")
+          task["labels"].length > 0
+            ? task["labels"].map((label) => label.name).join(", ")
             : "No labels assigned",
         // Date
         completedAt:
diff --git a/src/widgets/components/ColumnHelpers.tsx b/src/widgets/components/ColumnHelpers.tsx
index 89eb73ef..d3e7b034 100644
--- a/src/widgets/components/ColumnHelpers.tsx
+++ b/src/widgets/components/ColumnHelpers.tsx
@@ -1,7 +1,5 @@
-// @ts-nocheck
-
 import { Routes } from "@blitzjs/next"
-import { Prisma, Project, Notification } from "@prisma/client"
+import { Prisma, Project, Notification, Task } from "@prisma/client"
 import { ColumnDef, createColumnHelper } from "@tanstack/react-table"
 import Link from "next/link"
 
@@ -169,8 +167,8 @@ export const projectManagersColumns: ColumnDef<ContributorWithUser>[] = [
 ]
 
 //past due project Tasks
-const projectTaskColumnHelper = createColumnHelper<Tasks>()
-export const projectTaskColumns: ColumnDef<Tasks>[] = [
+const projectTaskColumnHelper = createColumnHelper<Task>()
+export const projectTaskColumns: ColumnDef<Task>[] = [
   projectTaskColumnHelper.accessor("name", {
     cell: (info) => <span>{info.getValue()}</span>,
     header: "Name",