diff --git a/client/src/components/Button/index.tsx b/client/src/components/Button/index.tsx
index 739b3b2..2856d5e 100644
--- a/client/src/components/Button/index.tsx
+++ b/client/src/components/Button/index.tsx
@@ -27,7 +27,9 @@ const Button = ({
   disabled,
 }: IButton) => {
   const className = variation[color];
-  const linkProps = openInNewTab ? { target: "_blank", rel: "noopener noreferrer" } : {};
+  const linkProps = openInNewTab
+    ? { target: "_blank", rel: "noopener noreferrer" }
+    : { onClick };
 
   return to ? (
     <Link to={to} className={className} {...linkProps}>
diff --git a/client/src/components/LayoutEvaluation/index.tsx b/client/src/components/LayoutEvaluation/index.tsx
index 19b9a06..292fa85 100644
--- a/client/src/components/LayoutEvaluation/index.tsx
+++ b/client/src/components/LayoutEvaluation/index.tsx
@@ -2,10 +2,11 @@ import React from "react";
 import { Outlet } from "react-router-dom";
 import NavbarEvaluation from "../NavbarEvaluation";
 import Footer from "../Footer";
+import { Menu } from "../Navbar";
 
 const LayoutEvaluation = () => (
   <>
-    <NavbarEvaluation />
+    <NavbarEvaluation menu={<Menu />} />
     <div className="container mx-auto px-2.5">
       <Outlet />
     </div>
diff --git a/client/src/components/Navbar/index.tsx b/client/src/components/Navbar/index.tsx
index d92f368..a9c8778 100644
--- a/client/src/components/Navbar/index.tsx
+++ b/client/src/components/Navbar/index.tsx
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { Fragment } from "react";
 import { NavLink } from "react-router-dom";
 import NavbarEvaluation from "@/components/NavbarEvaluation";
 import Button from "@/components/Button";
@@ -6,6 +6,8 @@ import UserMenu from "@/components/UserMenu";
 import { useAppSelector } from "@/redux/store";
 import logo from "@/assets/platforma_FDSC_Kaufland.svg";
 import getUserType from "@/lib/userType";
+import { Bars3Icon } from "@heroicons/react/20/solid";
+import { Menu as MenuHeadless, Transition } from "@headlessui/react";
 
 const MENU = {
   public: [
@@ -120,37 +122,92 @@ const MENU = {
   ],
 };
 
-const Menu = () => {
+export const Menu = () => {
   const user = useAppSelector((state) => state.userState.user);
   const userType = getUserType(user);
-  console.log("userType", userType);
   const menu = MENU[userType];
 
-  const linkClassName =
-    "flex flex-wrap border-b-2 border-transparent px-3 py-2 font-medium items-center text-gray-900 border-teal-600";
-
   return (
-    <ul className="items-center hidden text-sm gap-x-3 lg:flex lg:flex-wrap">
-      {menu.map((menuItem) => (
-        <li key={menuItem.link}>
-          <NavLink
-            target={
-              menuItem.link.startsWith("https://crestem.ong")
-                ? "_blank"
-                : undefined
-            }
-            to={menuItem.link}
-            className={({ isActive, isPending }) =>
-              `flex flex-wrap border-b-2 border-transparent px-3 py-2 font-medium items-center text-gray-900 border-teal-600 ${
-                isPending ? "bg-gray-50" : isActive ? "bg-gray-100" : ""
-              }`
-            }
-          >
-            {menuItem.text}
-          </NavLink>
-        </li>
-      ))}
-    </ul>
+    <>
+      <ul className="items-center hidden text-sm gap-x-3 lg:flex lg:flex-wrap">
+        {menu.map((menuItem) => (
+          <li key={menuItem.link}>
+            <NavLink
+              target={
+                menuItem.link.startsWith("https://crestem.ong")
+                  ? "_blank"
+                  : undefined
+              }
+              to={menuItem.link}
+              className={({ isActive, isPending }) =>
+                `flex flex-wrap border-b-2 border-transparent px-3 py-2 font-medium items-center text-gray-900 border-teal-600 ${
+                  isPending ? "bg-gray-50" : isActive ? "bg-gray-100" : ""
+                }`
+              }
+            >
+              {menuItem.text}
+            </NavLink>
+          </li>
+        ))}
+      </ul>
+      <MenuHeadless
+        as="div"
+        className="lg:hidden !mt-0 relative flex items-center"
+      >
+        <MenuHeadless.Button>
+          <Bars3Icon className="h-5" />
+        </MenuHeadless.Button>
+        <Transition
+          as={Fragment}
+          enter="transition ease-out duration-100"
+          enterFrom="transform opacity-0 scale-95"
+          enterTo="transform opacity-100 scale-100"
+          leave="transition ease-in duration-75"
+          leaveFrom="transform opacity-100 scale-100"
+          leaveTo="transform opacity-0 scale-95"
+        >
+          <MenuHeadless.Items className="absolute top-5 right-0 z-10 mt-2 w-60 origin-top-right rounded-md bg-white py-1 shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none flex flex-col">
+            {menu.map((menuItem) => (
+              <MenuHeadless.Item key={menuItem.text}>
+                <NavLink
+                  target={
+                    menuItem.link.startsWith("https://crestem.ong")
+                      ? "_blank"
+                      : undefined
+                  }
+                  to={menuItem.link}
+                  className={({ isActive, isPending }) =>
+                    `flex flex-wrap border-b-2 border-transparent px-3 py-2 font-medium items-center text-gray-900 border-teal-600 ${
+                      isPending ? "bg-gray-50" : isActive ? "bg-gray-100" : ""
+                    }`
+                  }
+                >
+                  {menuItem.text}
+                </NavLink>
+              </MenuHeadless.Item>
+            ))}
+            {!user && (
+              <>
+                <MenuHeadless.Item as="div" className="px-2 flex mb-2">
+                  {({ close }) => (
+                    <Button color="white" to={"/login"} onClick={close}>
+                      Intră în cont
+                    </Button>
+                  )}
+                </MenuHeadless.Item>
+                <MenuHeadless.Item as="div" className="px-2 flex mb-1">
+                  {({ close }) => (
+                    <Button to={"/register"} onClick={close}>
+                      Înregistrează-te
+                    </Button>
+                  )}
+                </MenuHeadless.Item>
+              </>
+            )}
+          </MenuHeadless.Items>
+        </Transition>
+      </MenuHeadless>
+    </>
   );
 };
 
@@ -164,13 +221,13 @@ const Example = () => {
           {user ? (
             <UserMenu />
           ) : (
-            <div className="flex justify-center items-center md:justify-start gap-4">
+            <div className="hidden lg:flex justify-center items-center md:justify-start gap-4">
               <div>
                 <Button color="white" to={"/login"}>
                   Intră în cont
                 </Button>
               </div>
-              <div className="hidden md:block">
+              <div>
                 <Button to={"/register"}>Înregistrează-te</Button>
               </div>
             </div>
diff --git a/client/src/components/NavbarEvaluation/index.tsx b/client/src/components/NavbarEvaluation/index.tsx
index b8b4c5a..ef836ca 100644
--- a/client/src/components/NavbarEvaluation/index.tsx
+++ b/client/src/components/NavbarEvaluation/index.tsx
@@ -10,8 +10,8 @@ const NavbarEvaluation = ({
   menu?: ReactNode;
 }) => (
   <header className={"shadow"}>
-    <nav className="container mx-auto py-6 px-2.5 space-y-4">
-      <div className="relative flex items-center justify-between gap-3">
+    <nav className="container mx-auto py-6 px-2.5 space-y-4 flex items-center justify-between gap-3 lg:block">
+      <div className="relative flex items-center justify-between gap-3 w-full">
         <Link to="/">
           <img
             className="object-contain max-w-[180px]"