diff --git a/src/components/Layout/Navbar.js b/src/components/Layout/Navbar.js
index b994d41d..73f5aa21 100644
--- a/src/components/Layout/Navbar.js
+++ b/src/components/Layout/Navbar.js
@@ -33,12 +33,10 @@ const Navbar = ({ setSidebarOpen }) => {
           <div className="flex-1 flex">
             <img alt="" className="w-32" src={Logo} />
           </div>
-          <div className="ml-4 flex items-center md:ml-6"> 
+          <div className="ml-4 flex items-center md:ml-6">
             <button
               onClick={() => setIsHelpDialogueOpen(true)}
-              className={
-                "flex text-gray-400 py-5 text-sm focus"
-              }
+              className={"flex text-gray-400 py-5 text-sm focus"}
             >
               <QuestionMarkCircleIcon strokeWidth={1} className="h-5" />
               <span className={"block ml-1"}>Help</span>
@@ -53,7 +51,7 @@ const Navbar = ({ setSidebarOpen }) => {
             </div>
             <div>
               <LogoutIcon
-                className="text-gray-400 w-5"
+                className="text-gray-400 w-5 cursor-pointer"
                 onClick={() => {
                   localStorage.removeItem("auth");
                   navigate("/");
diff --git a/src/components/Layout/Sidebar.js b/src/components/Layout/Sidebar.js
index de9dd1fa..53a6a5dc 100644
--- a/src/components/Layout/Sidebar.js
+++ b/src/components/Layout/Sidebar.js
@@ -105,13 +105,13 @@ const Sidebar = ({ setSidebarOpen, sidebarOpen, labels }) => {
                         <div className="flex mt-4 flex-col space-y-3 pb-4 pl-4 pr-10">
                           {labels
                             ? labels.split(",").map((label, index) => (
-                                <div
+                                <button
                                   onClick={() => labelClickHandler(label)}
                                   key={index}
                                   className="cursor-pointer text-white font-light w-full border py-1  flex justify-center items-center border-white rounded-lg"
                                 >
                                   {label}
-                                </div>
+                                </button>
                               ))
                             : null}
                         </div>
diff --git a/src/components/PillFilter/index.js b/src/components/PillFilter/index.js
index 9d6ca333..3596a2e3 100644
--- a/src/components/PillFilter/index.js
+++ b/src/components/PillFilter/index.js
@@ -3,17 +3,16 @@ import className from "classnames";
 
 const PillFilter = ({ text, onClick, selected }) => {
   return (
-    <div
+    <button
       onClick={() => onClick()}
       className={className(
         "block w-min py-2 px-3 max-w-[15rem] cursor-pointer hover:bg-gray-600 hover:text-gray-50 border-2 truncate mr-3 my-1 text-xs leading-3 rounded-xl",
         { "bg-gray-600 font-semibold text-gray-50 border-gray-600": selected },
         { "bg-gray-50 font-medium text-gray-600 border-gray-400": !selected }
-
       )}
     >
       <span>{text}</span>
-    </div>
+    </button>
   );
 };
 
diff --git a/src/page/Login/index.js b/src/page/Login/index.js
index 1c283d54..1bd4f4ff 100644
--- a/src/page/Login/index.js
+++ b/src/page/Login/index.js
@@ -104,12 +104,12 @@ const Login = () => {
               </p>
             )}
           </form>
-          <div
+          <button
             onClick={() => navigate("/forgot-password")}
             className="cursor-pointer mt-3 text-bluePrimary text-center underline text-sm"
           >
             Forgot password?
-          </div>
+          </button>
         </div>
       </div>
     </div>