diff --git a/frontend/src/app/home/home.component.html b/frontend/src/app/home/home.component.html
index 461aebf..e7902cd 100644
--- a/frontend/src/app/home/home.component.html
+++ b/frontend/src/app/home/home.component.html
@@ -1,29 +1,29 @@
-<div class="container mx-auto p-4">
+<div class="container mx-auto p-4 mt-4">
   <h1 class="text-4xl font-bold text-center text-gray-800 mb-10">Welcome to SharePule</h1>
   <p class="text-xl text-center text-gray-800 mb-10">Where sharing files is easier than finding a matching sock on laundry day!</p>
   <div class="grid md:grid-cols-2 gap-4">
+    <!-- Downloading Section -->
+    <div class="bg-white shadow-lg rounded-lg p-6 flex flex-col items-center justify-center text-center">
+      <img class="w-1/3 mb-4" src="./assets/cloud-arrow-down-solid.svg">
+      <h2 class="text-2xl font-bold text-gray-700 mb-4">Download File</h2>
+      <p class="text-gray-600 mb-4">Access and download shared files quickly.</p>
+      <div class="divider mb-10">QUICK LINK</div>
+      <button routerLink="/download" class="btn btn-primary w-full max-w-xs">Download</button>
+    </div>
 
     <!-- Uploading Section -->
     <div class="bg-white shadow-lg rounded-lg p-6 flex flex-col items-center justify-center">
       <img class="w-1/3 mb-4" src="./assets/cloud-arrow-up-solid.svg">
       <h2 class="text-2xl font-bold text-gray-700 mb-4 text-center">Upload File</h2>
       <p class="text-gray-600 mb-4 text-center ">Easily share your files with anyone by uploading them here.</p>
-      <div class="divider mb-10">QUICK UPLOAD</div>
-      <input type="file" class="file-input w-full max-w-xs mb-4" />
-      <button class="btn btn-primary w-full max-w-xs">Upload</button>
+      <div class="divider mb-10">QUICK LINK</div>
+      <button routerLink="/upload" class="btn btn-primary w-full max-w-xs">Upload</button>
     </div>
-
-
-    <!-- Downloading Section -->
-    <div class="bg-white shadow-lg rounded-lg p-6 flex flex-col items-center justify-center text-center">
-      <img class="w-1/3 mb-4" src="./assets/cloud-arrow-down-solid.svg">
-      <h2 class="text-2xl font-bold text-gray-700 mb-4">Download File</h2>
-      <p class="text-gray-600 mb-4">Access and download shared files quickly.</p>
-      <div class="divider mb-10">QUICK DOWNLOAD</div>
-      <input type="text" placeholder="Enter file ID" class="input input-bordered w-full max-w-xs mb-4" />
-      <button class="btn btn-secondary w-full max-w-xs">Download</button>
-    </div>
-
-
+  </div>
+  <div class="bg-white shadow-lg rounded-lg p-6 mt-10">
+    <h2 class="text-2xl font-bold text-gray-700 mb-4 text-center">Data Privacy/Security</h2>
+    <p class="text-gray-600 text-center mb-4">We prioritize data security and privacy consequently.
+      Any files uploaded by our clients are securely stored on our servers for a maximum duration of one day,
+      after which they are permanently and irretrievably wiped to ensure the utmost confidentiality and data protection.</p>
   </div>
 </div>
diff --git a/frontend/src/app/home/home.component.ts b/frontend/src/app/home/home.component.ts
index deb69c4..3918a5e 100644
--- a/frontend/src/app/home/home.component.ts
+++ b/frontend/src/app/home/home.component.ts
@@ -1,9 +1,12 @@
 import { Component } from '@angular/core';
+import {RouterLink} from "@angular/router";
 
 @Component({
   selector: 'app-home',
   standalone: true,
-  imports: [],
+  imports: [
+    RouterLink
+  ],
   templateUrl: './home.component.html',
   styleUrl: './home.component.scss'
 })
diff --git a/frontend/src/app/navbar/navbar.component.html b/frontend/src/app/navbar/navbar.component.html
index b25670d..ec6a9a4 100644
--- a/frontend/src/app/navbar/navbar.component.html
+++ b/frontend/src/app/navbar/navbar.component.html
@@ -16,10 +16,10 @@
       <div [ngClass]="{'hidden': !isMenuOpen, 'flex': isMenuOpen}" class="justify-between items-center w-full lg:flex lg:w-auto lg:order-1" id="mobile-menu-2">
         <ul class="flex flex-col mt-4 font-medium lg:flex-row lg:space-x-8 lg:mt-0">
           <li>
-            <a routerLink="/upload" class="block py-2 pr-4 pl-3 rounded bg-primary-700 lg:bg-transparent lg:text-primary-700 lg:p-0" aria-current="page">Upload</a>
+            <a routerLink="/download" class="block py-2 pr-4 pl-3 rounded bg-primary-700 lg:bg-transparent lg:text-primary-700 lg:p-0" aria-current="page">Download</a>
           </li>
           <li>
-            <a routerLink="/download" class="block py-2 pr-4 pl-3 rounded bg-primary-700 lg:bg-transparent lg:text-primary-700 lg:p-0" aria-current="page">Download</a>
+            <a routerLink="/upload" class="block py-2 pr-4 pl-3 rounded bg-primary-700 lg:bg-transparent lg:text-primary-700 lg:p-0" aria-current="page">Upload</a>
           </li>
         </ul>
       </div>
diff --git a/frontend/src/app/upload/upload.component.html b/frontend/src/app/upload/upload.component.html
index 804edf2..2be1da3 100644
--- a/frontend/src/app/upload/upload.component.html
+++ b/frontend/src/app/upload/upload.component.html
@@ -1 +1,34 @@
-<p>upload works!</p>
+<div class="container mx-auto p-4 mt-4">
+  <h1 class="text-4xl font-bold text-center text-gray-800 mb-10">Upload Your File</h1>
+  <div class="bg-white shadow-lg rounded-lg p-6">
+    <div class="flex flex-col items-center justify-center">
+      <!-- File Drop Area -->
+      <div class="border-2 border-dashed border-gray-300 rounded-lg w-full p-20 flex flex-col items-center justify-center mb-6">
+        <img class="w-16 mb-3" src="./assets/cloud-arrow-up-solid.svg">
+        <p class="text-gray-700 mb-3">Drag and drop your files here or <span class="text-blue-600 cursor-pointer">browse</span></p>
+        <input type="file" class="hidden" />
+      </div>
+      <!-- Settings -->
+      <div class="w-full mb-10">
+        <label class="block text-gray-700 text-l font-bold mb-4">Options</label>
+        <div class="grid grid-cols-1 md:grid-cols-3 gap-4">
+          <div class="flex items-center">
+            <input type="checkbox" class="toggle" checked />
+            <span class="ml-2 text-gray-700">Store for only one hour</span>
+          </div>
+          <div class="flex items-center">
+            <input type="checkbox" class="toggle" />
+            <span class="ml-2 text-gray-700">Allow only one download</span>
+          </div>
+          <div class="flex items-center">
+            <input type="checkbox" class="toggle" />
+            <span class="ml-2 text-gray-700">Protect download with password</span>
+          </div>
+        </div>
+      </div>
+      <!-- Upload Button -->
+      <button class="btn btn-primary w-full max-w-xs">Upload Files</button>
+    </div>
+  </div>
+  <p class="text-gray-600 text-center mt-6">Drag and drop files, or click to select the files you want to share.</p>
+</div>