diff --git a/apps/web/pages/api/documents/[id].ts b/apps/web/pages/api/documents/[id].ts
index f378d5372..f921e218d 100644
--- a/apps/web/pages/api/documents/[id].ts
+++ b/apps/web/pages/api/documents/[id].ts
@@ -40,6 +40,29 @@ async function getHandler(req: NextApiRequest, res: NextApiResponse) {
   return;
 }
 
+async function deleteHandler(req: NextApiRequest, res: NextApiResponse) {
+  const user = getUserFromToken(req, res);
+  const { id: documentId } = req.query;
+
+  if (!user) return;
+
+  if (!documentId) {
+    res.status(400).send("Missing parameter documentId.");
+    return;
+  }
+
+  await prisma.document
+    .delete({
+      where: {
+        id: +documentId,
+      },
+    })
+    .then(() => {
+      res.status(200).end();
+    });
+}
+
 export default defaultHandler({
   GET: Promise.resolve({ default: defaultResponder(getHandler) }),
+  DELETE: Promise.resolve({ default: defaultResponder(deleteHandler) }),
 });
diff --git a/apps/web/pages/dashboard.tsx b/apps/web/pages/dashboard.tsx
index 76dd49474..7bd0b6335 100644
--- a/apps/web/pages/dashboard.tsx
+++ b/apps/web/pages/dashboard.tsx
@@ -60,6 +60,7 @@ const DashboardPage: NextPageWithLayout = () => {
       link: "/documents?filter=",
     },
   ];
+
   const uploadToServer = async (event: any) => {
     if (event.target.files && event.target.files[0]) {
       const body = new FormData();
@@ -108,30 +109,6 @@ const DashboardPage: NextPageWithLayout = () => {
           ))}
         </dl>
         <div className="mt-12">
-          <button
-            type="button"
-            onClick={() => {
-              document?.getElementById("fileUploadHelper")?.click();
-            }}
-            className="relative block w-full rounded-lg border-2 border-dashed border-gray-300 p-12 text-center hover:border-neon focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2"
-          >
-            <svg
-              className="mx-auto h-12 w-12 text-gray-400"
-              stroke="currentColor"
-              fill="none"
-              viewBox="0 00 20 25"
-              aria-hidden="true"
-            >
-              <path
-                strokeLinecap="round"
-                strokeLinejoin="round"
-                d="M19.5 14.25v-2.625a3.375 3.375 0 00-3.375-3.375h-1.5A1.125 1.125 0 0113.5 7.125v-1.5a3.375 3.375 0 00-3.375-3.375H8.25m2.25 0H5.625c-.621 0-1.125.504-1.125 1.125v17.25c0 .621.504 1.125 1.125 1.125h12.75c.621 0 1.125-.504 1.125-1.125V11.25a9 9 0 00-9-9z"
-              />
-            </svg>
-            <span className="mt-2 block text-sm font-medium text-neon">
-              Upload a new PDF document
-            </span>
-          </button>
           <input
             id="fileUploadHelper"
             type="file"
@@ -141,6 +118,30 @@ const DashboardPage: NextPageWithLayout = () => {
             hidden
           />
         </div>
+        <button
+          type="button"
+          onClick={() => {
+            document?.getElementById("fileUploadHelper")?.click();
+          }}
+          className="relative block w-full rounded-lg border-2 border-dashed border-gray-300 p-12 text-center hover:border-neon focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2"
+        >
+          <svg
+            className="mx-auto h-12 w-12 text-gray-400"
+            stroke="currentColor"
+            fill="none"
+            viewBox="0 00 20 25"
+            aria-hidden="true"
+          >
+            <path
+              strokeLinecap="round"
+              strokeLinejoin="round"
+              d="M19.5 14.25v-2.625a3.375 3.375 0 00-3.375-3.375h-1.5A1.125 1.125 0 0113.5 7.125v-1.5a3.375 3.375 0 00-3.375-3.375H8.25m2.25 0H5.625c-.621 0-1.125.504-1.125 1.125v17.25c0 .621.504 1.125 1.125 1.125h12.75c.621 0 1.125-.504 1.125-1.125V11.25a9 9 0 00-9-9z"
+            />
+          </svg>
+          <span className="mt-2 block text-sm font-medium text-neon">
+            Upload a new PDF document
+          </span>
+        </button>
       </div>
     </>
   );
diff --git a/apps/web/pages/documents.tsx b/apps/web/pages/documents.tsx
index 07d34e83f..4b62084b9 100644
--- a/apps/web/pages/documents.tsx
+++ b/apps/web/pages/documents.tsx
@@ -3,17 +3,20 @@ import { ReactElement, useEffect, useState } from "react";
 import Layout from "../components/layout";
 import type { NextPageWithLayout } from "./_app";
 import Head from "next/head";
-import { PlusIcon } from "@heroicons/react/24/outline";
+import { PlusIcon, TrashIcon } from "@heroicons/react/24/outline";
 import { Document as PrismaDocument } from "@prisma/client";
 import { getUserFromToken } from "@documenso/lib/server";
 import Link from "next/link";
+import { useRouter } from "next/router";
+import { NEXT_PUBLIC_WEBAPP_URL } from "@documenso/lib/constants";
 
 const DocumentsPage: NextPageWithLayout = (req, res) => {
-  const [documents = [], setDocuments] = useState([]);
+  const router = useRouter();
+  const [documents, setDocuments] = useState([]);
 
   useEffect(() => {
     getDocuments();
-  }, []);
+  });
 
   const getDocuments = async () => {
     fetch("/api/documents", {
@@ -27,19 +30,143 @@ const DocumentsPage: NextPageWithLayout = (req, res) => {
     });
   };
 
+  function showDocument(documentId: number) {
+    router.push("/documents/" + documentId);
+  }
+
+  const uploadToServer = async (event: any) => {
+    if (event.target.files && event.target.files[0]) {
+      const body = new FormData();
+      const document = event.target.files[0];
+      body.append("document", document || "");
+      const response: any = await fetch("/api/documents", {
+        method: "POST",
+        body,
+      }).then((response: Response) => {
+        response.json().then((createdDocumentIdFromBody) => {
+          router.push(
+            `${NEXT_PUBLIC_WEBAPP_URL}/documents/${createdDocumentIdFromBody}`
+          );
+        });
+      });
+    }
+  };
+
   return (
     <>
       <Head>
         <title>Documents | Documenso</title>
       </Head>
-      {documents.map((item: any) => (
-        <div>
-          <Link key={item.id} href={"/documents/" + item.id} target="_blank">
-            Document Nr.{item.id}
-          </Link>
+      <div className="px-4 sm:px-6 lg:px-8" hidden={!documents.length}>
+        <div className="sm:flex sm:items-center">
+          <div className="sm:flex-auto">
+            <div className="pt-10 max-sm:px-4">
+              <header>
+                <h1 className="text-3xl font-bold leading-tight tracking-tight text-gray-900">
+                  Documents
+                </h1>
+              </header>
+            </div>
+          </div>
+          <div className="mt-4 sm:mt-0 sm:ml-16 sm:flex-none">
+            <button
+              type="button"
+              className="inline-flex items-center justify-center rounded-md border border-transparent bg-indigo-600 px-4 py-2 text-sm font-medium text-white shadow-sm hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 sm:w-auto"
+            >
+              Add user
+            </button>
+          </div>
         </div>
-      ))}
-      <div className="text-center mt-24" id="empty" hidden>
+        <div className="mt-8 flex flex-col">
+          <div className="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8">
+            <div className="inline-block min-w-full py-2 align-middle md:px-6 lg:px-8">
+              <div className="overflow-hidden shadow ring-1 ring-black ring-opacity-5 md:rounded-lg">
+                <table className="min-w-full divide-y divide-gray-300">
+                  <thead className="bg-gray-50">
+                    <tr>
+                      <th
+                        scope="col"
+                        className="px-3 py-3.5 text-left text-sm font-semibold text-gray-900"
+                      >
+                        Title
+                      </th>
+                      <th
+                        scope="col"
+                        className="px-3 py-3.5 text-left text-sm font-semibold text-gray-900"
+                      >
+                        Recipients
+                      </th>
+                      <th
+                        scope="col"
+                        className="px-3 py-3.5 text-left text-sm font-semibold text-gray-900"
+                      >
+                        Status
+                      </th>
+                      <th
+                        scope="col"
+                        className="relative py-3.5 pl-3 pr-4 sm:pr-6"
+                      >
+                        <span className="sr-only">Delete</span>
+                      </th>
+                    </tr>
+                  </thead>
+                  <tbody className="divide-y divide-gray-200 bg-white">
+                    {documents.map((document: any) => (
+                      <tr
+                        key={document.id}
+                        className="hover:bg-gray-100 cursor-pointer"
+                        onClick={(event) => showDocument(document.id)}
+                      >
+                        <td className="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
+                          {document.title || "#" + document.id}
+                        </td>
+                        <td className="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
+                          {document.recipients || "-"}
+                        </td>
+                        <td className="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
+                          {document.status || "Draft"}
+                        </td>
+                        <td className="relative whitespace-nowrap py-4 pl-3 pr-4 text-right text-sm font-medium sm:pr-6">
+                          <Link
+                            href={"/documents/" + document.id}
+                            className="text-indigo-600 hover:text-indigo-900"
+                          >
+                            <TrashIcon
+                              className="flex-shrink-0 -ml-1 mr-3 h-6 w-6 inline text-neon"
+                              aria-hidden="true"
+                              onClick={(event) => {
+                                event.preventDefault();
+                                event.stopPropagation();
+                                if (
+                                  confirm(
+                                    "Are you sure you want to delete this document"
+                                  )
+                                ) {
+                                  fetch(`/api/documents/${document.id}`, {
+                                    method: "DELETE",
+                                  }).then(() => {
+                                    getDocuments();
+                                  });
+                                }
+                              }}
+                            />
+                            <span className="sr-only">, {document.name}</span>
+                          </Link>
+                        </td>
+                      </tr>
+                    ))}
+                  </tbody>
+                </table>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div
+        className="text-center mt-24"
+        id="empty"
+        hidden={documents.length > 0}
+      >
         <svg
           className="mx-auto h-12 w-12 text-gray-400"
           fill="none"
@@ -61,11 +188,22 @@ const DocumentsPage: NextPageWithLayout = (req, res) => {
         <div className="mt-6">
           <button
             type="button"
+            onClick={() => {
+              document?.getElementById("fileUploadHelper")?.click();
+            }}
             className="inline-flex items-center rounded-md border border-transparent bg-neon px-4 py-2 text-sm font-medium text-white shadow-sm hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2"
           >
             <PlusIcon className="-ml-1 mr-2 h-5 w-5" aria-hidden="true" />
             Upload Document
           </button>
+          <input
+            id="fileUploadHelper"
+            type="file"
+            onChange={(event: any) => {
+              uploadToServer(event);
+            }}
+            hidden
+          />
         </div>
       </div>
     </>