diff --git a/header.php b/header.php
index e6c671c..dafddd0 100644
--- a/header.php
+++ b/header.php
@@ -1,97 +1,57 @@
 <?php
 session_start();
 ?>
-<nav class="flex items-center lg:justify-between sm:justify-center flex-wrap bg-gray-500 p-6 shadow-lg shadow-black/50 sticky top-4 opacity-100 mb-24"> <!--dark:bg-black-->
-      <div class="block lg:hidden cursor-pointer flex:none mr-4" id="HamburgerInactive">
-        <button id="btn" class="flex flex-col items-center px-3 py-[0.4375rem] border rounded text-teal-200 border-teal-400">
-          <span class="block h-0.5 w-5 mb-1 origin-center rounded-full bg-teal-200"></span>
-          <span class="block h-0.5 w-5 mb-1 origin-center rounded-full bg-teal-200"></span>
-          <span class="block h-0.5 w-5 origin-center rounded-full bg-teal-200"></span>
-        </button>
-      </div>
-      <div id="HamburgerActive" class="hidden lg:hidden flex:none cursor-pointer mr-4 block">
-        <button class="space-y-2 px-3 py-2 border rounded text-teal-200 border-teal-400" >
-          <span class="block h-0.5 w-5 origin-center rounded-full bg-teal-200 translate-y-1.5 rotate-45"></span>
-          <span class="block h-0.5 w-5 origin-center rounded-full bg-teal-200 -translate-y-1 -rotate-45"></span>
-          <span class="hidden h-0.5 w-5 origin-center rounded-full bg-white"></span>
-        </button>
-      </div>
-      <div class="flex items-center flex-shrink-0 text-white mr-6 w-full lg:w-auto flex-1 lg:flex-none justify-center">
-        <svg id="logo" class="fill-current h-8 w-8 mr-2" width="54" height="54" viewBox="0 0 54 54" xmlns="http://www.w3.org/2000/svg"><path d="M13.5 22.1c1.8-7.2 6.3-10.8 13.5-10.8 10.8 0 12.15 8.1 17.55 9.45 3.6.9 6.75-.45 9.45-4.05-1.8 7.2-6.3 10.8-13.5 10.8-10.8 0-12.15-8.1-17.55-9.45-3.6-.9-6.75.45-9.45 4.05zM0 38.3c1.8-7.2 6.3-10.8 13.5-10.8 10.8 0 12.15 8.1 17.55 9.45 3.6.9 6.75-.45 9.45-4.05-1.8 7.2-6.3 10.8-13.5 10.8-10.8 0-12.15-8.1-17.55-9.45-3.6-.9-6.75.45-9.45 4.05z"/></svg>
-        <span class="font-semibold text-xl tracking-tight">G-Link</span>
-      </div>
-      <div id="menu-options" class="bg-gray-500 w-full lg:block flex-grow lg:flex lg:items-center lg:w-auto hidden mr-4">
-        <div class="text-sm lg:flex-grow">
-          <a href="#head" class="block mt-4 lg:inline-block lg:mt-0 text-teal-200 hover:text-black mr-4 hover:bg-gray-200 hover:border hover:border-gray-200 hover:rounded text-teal-200 py-1 px-3">
-            A
-          </a>
-          <a href="#head" class="block mt-4 lg:inline-block lg:mt-0 text-teal-200 hover:text-black mr-4 hover:bg-gray-200 hover:border hover:border-gray-200 hover:rounded text-teal-200 py-1 px-3">
-            B
-          </a>
-          <a href="#head" class="block mt-4 lg:inline-block lg:mt-0 text-teal-200 hover:text-black mr-4 hover:bg-gray-200 hover:border hover:border-gray-200 hover:rounded text-teal-200 py-1 px-3">
-            C
-          </a>
-          <a href="/" class="block mt-4 lg:inline-block lg:mt-0 bg-blue-600 brightness-125 border border-blue-500 rounded text-teal-200 hover:text-black py-1 px-3">
-            Products (Form)
-          </a>
-        </div>
 
-	<?php if (!isset($_SESSION['user'])) { ?>
-        <div>
-          <a href="signup.html" class="inline-block <%= signup %> text-sm px-4 py-2 leading-none border rounded text-white border-white hover:border-transparent hover:text-teal-500 hover:bg-white mt-4 lg:mt-0 mr-4">
-            Sign up
-          </a>
+<div class="navbar bg-base-100 rounded-lg shadow-xl shadow-black/50 z-[4] sticky top-0 mb-10">
+      <div class="flex-1 lg:ml-4 ml-2 my-2">
+        <!--Hamburger menu-->
+        <div class="lg:hidden" >
+          <ul class="menu menu-horizontal px-1">
+              <label class="btn btn-circle swap swap-rotate ">
+                <input type="checkbox" class="opacity-0 w-full h-full "/>
+                <svg class="swap-off fill-emerald-400 brightness-125" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 512 512"><path d="M64,384H448V341.33H64Zm0-106.67H448V234.67H64ZM64,128v42.67H448V128Z"/></svg>
+                <div class="dropdown dropdown-open swap-on">
+                    <svg class="fill-emerald-400 brightness-125" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 512 512"><polygon points="400 145.49 366.51 112 256 222.51 145.49 112 112 145.49 222.51 256 112 366.51 145.49 400 256 289.49 366.51 400 400 366.51 289.49 256 400 145.49"/></svg>
+                  <ul tabindex="0" class="menu dropdown-content z-[1] p-2 shadow bg-base-100 rounded-box w-36 mt-4">
+                    <li><a class="text-emerald-400 brightness-125">Create</a></li>
+                    <li><a class="text-emerald-400 brightness-125">Signup</a></li>
+                    <li><a class="text-emerald-400 brightness-125">Login</a></li>
+                  </ul>
+                </div>
+              </label>
+          </ul>
         </div>
-	<?php } ?>
+        <!-- Hamburger Menu ended -->
 
-        <?php if (!isset($_SESSION['user'])) { ?>
-        <div>
-          <a href="login.html" class="inline-block text-sm px-4 py-2 leading-none border rounded text-white border-white hover:border-transparent hover:text-teal-500 hover:bg-white mt-4 lg:mt-0">
-            Log in
-          </a>
+        <div class="flex lg:justify-start lg:items-start justify-center items-center lg:w-auto w-full">
+          <a href="/" class="btn btn-ghost normal-case text-xl text-emerald-400 brightness-125"><img src="GLink-Logo-alt.svg" class="h-full "></a>
         </div>
-	<?php } else {?>
-        <div>
-          <a href="logout.php" class="inline-block text-sm px-4 py-2 leading-none border rounded text-white border-white hover:border-transparent hover:text-teal-500 hover:bg-white mt-4 lg:mt-0">
-            Log out
-          </a>
+        <div class="w-full justify-center items-center lg:flex hidden">
+        <?php if(isset($_SESSION['user'])) { ?>
+          <a class="btn btn-outline btn-success brightness-125 lg:text-xl text-sm" href="/form.html">Create</a>
+          <?php } ?>
         </div>
-	<?php } ?>
-
       </div>
-      <div class="w-9 h-9 rounded-full bg-emerald-800 cursor-pointer outline outline-offset-2 outline-4 outline-white hover:bg-emerald-700">
-        <button class="w-full h-full bg-white rounded-full" id="dropdownDefaultButton" data-dropdown-toggle="dropdown">
-
-        </button>
+      <div class="justify-center items-center lg:flex mr-10 my-2 hidden">
+      <?php if(!isset($_SESSION['user'])) { ?>
+        <a class="btn btn-outline btn-success brightness-125 lg:text-xl mr-4 text-sm" href="signup.html">Sign Up</a>
+        <a class="btn btn-outline btn-success brightness-125 lg:text-xl text-sm" href="login.html">Log in</a>
+       <?php } ?>
       </div>
-      <div class="relative">
-        <button dropdown-trigger aria-expanded="false" type="button" class="inline-block px-6 py-3 mr-3 font-bold text-center text-white uppercase align-middle transition-all rounded-lg cursor-pointer bg-gradient-to-tl from-purple-700 to-pink-500 leading-pro text-sm ease-soft-in tracking-tight-soft shadow-soft-md bg-150 bg-x-25 hover:scale-102 active:opacity-85 hover:shadow-soft-xs">Dropdown</button>
-        <p class="hidden transform-dropdown-show"></p>
-        <ul dropdown-menu class="z-10 text-sm lg:shadow-soft-3xl duration-250 before:duration-350 before:font-awesome before:ease-soft min-w-44 before:text-5.5 transform-dropdown pointer-events-none absolute left-auto top-1/2 m-0 -mr-4 mt-2 list-none rounded-lg border-0 border-solid border-transparent bg-white bg-clip-padding px-0 py-2 text-left text-slate-500 opacity-0 transition-all before:absolute before:right-7 before:left-auto before:top-0 before:z-40 before:text-white before:transition-all before:content-['\f0d8']">
-          <li>
-            <a class="py-1.2 lg:ease-soft clear-both block w-full whitespace-nowrap border-0 bg-transparent px-4 text-left font-normal text-slate-500 hover:bg-gray-200 hover:text-slate-700 dark:text-white dark:hover:bg-gray-200/80 dark:hover:text-slate-700 lg:transition-colors lg:duration-300" href="javascript:;">Action</a>
-          </li>
-          <li>
-            <a class="py-1.2 lg:ease-soft clear-both block w-full whitespace-nowrap border-0 bg-transparent px-4 text-left font-normal text-slate-500 hover:bg-gray-200 hover:text-slate-700 dark:text-white dark:hover:bg-gray-200/80 dark:hover:text-slate-700 lg:transition-colors lg:duration-300" href="javascript:;">Another action</a>
-          </li>
-          <li>
-            <a class="py-1.2 lg:ease-soft clear-both block w-full whitespace-nowrap border-0 bg-transparent px-4 text-left font-normal text-slate-500 hover:bg-gray-200 hover:text-slate-700 dark:text-white dark:hover:bg-gray-200/80 dark:hover:text-slate-700 lg:transition-colors lg:duration-300" href="javascript:;">Something else here</a>
-          </li>
-        </ul>
+
+	<?php if(isset($_SESSION['user'])) { ?>
+      <div class="flex-none my-2">
+        <div class="dropdown dropdown-end">
+          <label tabindex="0" class="btn btn-ghost btn-circle avatar border border-2 border-emerald-500 brightness-125 hover:border-none hover:ring-2 hover:ring-emerald-400 focus:ring-2 focus:ring-emerald-400">
+            <div class="w-10 rounded-full cursor-pointer ">
+              <div class="w-full h-full bg-white rounded-full text-center"></div>
+            </div>
+          </label>
+          <ul tabindex="0" class="menu menu-sm dropdown-content mt-3 z-[1] p-2 shadow bg-base-100 rounded-box w-36">
+            <li><a href="dashboard.html">My Links</a></li>
+            <li><a href="logout.php">Logout</a></li>
+          </ul>
+        </div>
       </div>
-      <script>
-        let active = document.getElementById("HamburgerActive");
-        let inactive = document.getElementById("HamburgerInactive");
-        let options = document.querySelector("#menu-options");
-        active.addEventListener("click", ()=>{
-          active.classList.add("hidden");
-          inactive.classList.remove("hidden");
-          options.classList.toggle("hidden");
-        })
-        inactive.addEventListener("mouseup", ()=>{
-          inactive.classList.add("hidden");
-          active.classList.remove("hidden");
-          options.classList.toggle("hidden");
-        });
-      </script>
-</nav>
+	<?php } ?>
+    </div>