diff --git a/app/(main)/projects/[id]/settings/danger-zone/page.tsx b/app/(main)/projects/[id]/settings/danger-zone/page.tsx
index f79fa9a..1579ad2 100644
--- a/app/(main)/projects/[id]/settings/danger-zone/page.tsx
+++ b/app/(main)/projects/[id]/settings/danger-zone/page.tsx
@@ -25,16 +25,10 @@ const ProjectSettingsDangerZonePage = ({
   );
   const router = useRouter();
 
-  const handleDeleteProject = () => {
-    deleteProject({ id })
-      .then(() => {
-        toast.success("Project deleted successfully");
-        router.push(DASHBOARD_ROUTE);
-      })
-      .catch(() => {
-        toast.error("Failed to delete project");
-      });
-  };
+  const handleDeleteProject = () =>
+    deleteProject({ id }).then(() => {
+      router.push(DASHBOARD_ROUTE);
+    });
 
   return (
     <div>
@@ -44,6 +38,7 @@ const ProjectSettingsDangerZonePage = ({
           onConfirm={handleDeleteProject}
           header="Delete project"
           disabled={isPending}
+          toastMessage="Project deleted successfully"
         >
           <Button variant="destructive" disabled={isPending}>
             Delete Project
diff --git a/components/modals/confirm-modal.tsx b/components/modals/confirm-modal.tsx
index 322bc34..4c07ab8 100644
--- a/components/modals/confirm-modal.tsx
+++ b/components/modals/confirm-modal.tsx
@@ -10,13 +10,15 @@ import {
 } from "@/components/ui/alert-dialog";
 import { ReactNode } from "react";
 import { buttonVariants } from "../ui/button";
+import { toast } from "sonner";
 
 type ConfirmModalProps = {
   children: ReactNode;
   disabled?: boolean;
-  onConfirm: () => void;
+  onConfirm: () => Promise<any>;
   header: string;
   description?: string;
+  toastMessage?: string;
 };
 
 const ConfirmModal = ({
@@ -25,9 +27,12 @@ const ConfirmModal = ({
   disabled,
   header,
   onConfirm,
+  toastMessage = "Action completed successfully.",
 }: ConfirmModalProps) => {
   const handleConfirm = () => {
-    onConfirm();
+    onConfirm()
+      .then(() => toast.success(toastMessage))
+      .catch(() => toast.error("Failed to perform action. Please try again."));
   };
 
   return (
diff --git a/components/resources/file-card.tsx b/components/resources/file-card.tsx
index bdd925a..7ca13d5 100644
--- a/components/resources/file-card.tsx
+++ b/components/resources/file-card.tsx
@@ -63,6 +63,7 @@ const FileCard = ({
           header={`Delete file : ${title}`}
           onConfirm={() => deleteFile({ _id })}
           disabled={isDeleting}
+          toastMessage="File deleted successfully"
         >
           <Button size="icon" variant="ghost">
             <Trash className="h-5 w-5" />
diff --git a/components/resources/link-card.tsx b/components/resources/link-card.tsx
index b39ac4f..12cf641 100644
--- a/components/resources/link-card.tsx
+++ b/components/resources/link-card.tsx
@@ -4,8 +4,8 @@ import { Id } from "@/convex/_generated/dataModel";
 import useApiMutation from "@/lib/hooks/use-api-mutation";
 import { useLinkModal } from "@/lib/store/use-link-modal";
 import { Edit, LinkIcon, Trash } from "lucide-react";
+import ConfirmModal from "@/components/modals/confirm-modal";
 import { Avatar, AvatarFallback, AvatarImage } from "../ui/avatar";
-import ConfirmModal from "../modals/confirm-modal";
 
 type LinkCardProps = {
   resource: {
@@ -45,7 +45,7 @@ const LinkCard = ({
           className="font-medium hover:underline hover:text-gray-900 dark:hover:text-gray-50"
           href={url}
         >
-          {title}
+          {title.length > 10 ? `${title.slice(0, 10)}...` : title}
         </a>
       </div>
       <div>
@@ -60,6 +60,8 @@ const LinkCard = ({
         <ConfirmModal
           onConfirm={() => deleteLink({ _id })}
           header={`Delete link:${title}`}
+          disabled={isPending}
+          toastMessage="Link deleted successfully"
         >
           <Button size="icon" variant="ghost" disabled={isPending}>
             <Trash className="h-5 w-5" />
diff --git a/components/resources/resource-list.tsx b/components/resources/resource-list.tsx
index a528788..7bf2e82 100644
--- a/components/resources/resource-list.tsx
+++ b/components/resources/resource-list.tsx
@@ -20,12 +20,13 @@ const ResourceList = () => {
   const files = useQuery(api.resources.files.list, {
     projectId: param.id as Id<"projects">,
   });
+
   return (
     <div className="grid grid-cols-2 md:grid-cols-5 gap-2">
       <Card className="col-span-3 overflow-hidden">
         <CardHeader className="bg-gray-100 dark:bg-gray-800 flex-row flex items-center justify-between py-3">
           <h2 className="text-lg font-semibold">Files</h2>
-          <UploadFile />
+          <UploadFile fileCount={files?.length} />
         </CardHeader>
         <CardContent className="p-6 grid gap-6">
           {files && files.length > 0 ? (
diff --git a/components/resources/upload-file.tsx b/components/resources/upload-file.tsx
index 5473b36..d88b8f7 100644
--- a/components/resources/upload-file.tsx
+++ b/components/resources/upload-file.tsx
@@ -5,8 +5,14 @@ import { useUploadFiles } from "@xixixao/uploadstuff/react";
 import { Upload } from "lucide-react";
 import { useParams } from "next/navigation";
 import { Button } from "../ui/button";
+import { MAX_FILE_COUNT, MAX_FILE_SIZE } from "@/lib/constants";
+import { toast } from "sonner";
 
-const UploadFile = () => {
+type UploadFileProps = {
+  fileCount?: number;
+};
+
+const UploadFile = ({ fileCount = 0 }: UploadFileProps) => {
   const params = useParams();
 
   const { mutate: generateUploadUrl, isPending } = useApiMutation(
@@ -23,18 +29,32 @@ const UploadFile = () => {
     fileInput.accept = "*/*";
 
     fileInput.addEventListener("change", async (e) => {
+      if (fileCount >= MAX_FILE_COUNT) {
+        toast.error(`A project can have a maximum of ${MAX_FILE_COUNT} files.`);
+        return;
+      }
+
       const file = (e.target as HTMLInputElement).files?.[0];
-      if (!file) {
+      if (!file) return;
+
+      if (file.size > MAX_FILE_SIZE) {
+        toast.error("File size should be less than 5MB");
         return;
       }
 
-      const [res] = await startUpload([file]);
-      createFileResource({
-        title: res.name,
-        storageId: (res.response as { storageId: Id<"_storage"> }).storageId,
-        projectId: params.id as Id<"projects">,
-        type: res.type,
-      });
+      try {
+        const [res] = await startUpload([file]);
+        createFileResource({
+          title: res.name,
+          storageId: (res.response as { storageId: Id<"_storage"> }).storageId,
+          projectId: params.id as Id<"projects">,
+          type: res.type,
+        });
+
+        toast.success("File uploaded successfully.");
+      } catch (e) {
+        toast.error("Failed to upload file. Please try again.");
+      }
     });
 
     fileInput.click();
diff --git a/lib/constants.ts b/lib/constants.ts
index 69c3788..aed69da 100644
--- a/lib/constants.ts
+++ b/lib/constants.ts
@@ -14,6 +14,9 @@ import { TaskPriority, TaskStatus, TaskType } from "./types";
 
 export const DASHBOARD_ROUTE = "/dashboard";
 
+export const MAX_FILE_SIZE = 1024 * 1024 * 5; // 5MB
+export const MAX_FILE_COUNT = 10;
+
 export const UNASSIGNED_USER = {
   label: "Unassigned",
   value: process.env.UNASSIGNED_USER_ID as Id<"users">,