diff --git a/src/components/Board/ActiveBoard.tsx b/src/components/Board/ActiveBoard.tsx
index 5967f0f..d4fbd9c 100644
--- a/src/components/Board/ActiveBoard.tsx
+++ b/src/components/Board/ActiveBoard.tsx
@@ -19,10 +19,8 @@ import { FcCheckmark } from "react-icons/fc";
 import IconButton from "components/IconButton";
 import { IoCloseOutline } from "react-icons/io5";
 
-interface Props {
-  showSidebar: boolean;
-}
-export default function ActiveBoard({ showSidebar }: Props) {
+
+export default function ActiveBoard() {
   const dispatch = useDispatch();
   const [isAddTask, setAddTask] = useState(false);
   const [isOpenPopup, setOpenPopup] = useState(false);
@@ -86,12 +84,7 @@ export default function ActiveBoard({ showSidebar }: Props) {
     <>
       <DragDropContext onDragEnd={onDragEnd}>
         <div className="h-[90vh]">
-          <div
-            style={{
-              marginLeft: showSidebar ? "clamp(260px, 10vw, 500px)" : "0px",
-            }}
-            className={`z-10 relative h-auto py-4 mb-8 pr-8 pl-8`}
-          >
+         
             <div className="mt-3 z-10 h-full flex gap-x-10 w-full">
               {active.columns?.map((item: IColumn, index: number) => {
                 return (
@@ -172,7 +165,7 @@ export default function ActiveBoard({ showSidebar }: Props) {
                         >
                           <div>
                             <PiDotsThreeLight
-                              className=" relative font-bold"
+                              className="relative font-bold"
                               size={20}
                             />
                             {isOpenPopup && selectedColumn?.id === item.id ? (
@@ -243,7 +236,7 @@ export default function ActiveBoard({ showSidebar }: Props) {
               </div>
             </div>
           </div>
-        </div>
+     
       </DragDropContext>
 
       <Modal
diff --git a/src/components/Board/AddTask.tsx b/src/components/Board/AddTask.tsx
index e62ac5f..ef0ab56 100644
--- a/src/components/Board/AddTask.tsx
+++ b/src/components/Board/AddTask.tsx
@@ -181,7 +181,7 @@ export default function AddTask({ handleClose, activeColumn, tasks }: Props) {
                   )}
                 />
               </div>
-              <div className="relative flex items-center my-8 gap-x-8 justify-between ">
+              <div className="relative flex items-center my-6 gap-x-8 justify-between ">
                <div className="w-1/2">
                <TextInput
                   label="Deadline"
diff --git a/src/components/Board/index.tsx b/src/components/Board/index.tsx
index 98705dc..327d25f 100644
--- a/src/components/Board/index.tsx
+++ b/src/components/Board/index.tsx
@@ -14,21 +14,27 @@ interface Props {
 export default function Index({ showSidebar }: Props) {
   const [isOpenBoard, setOpenBoard] = useState(false);
   const data: AppState = useSelector(appData);
-  const { active } = data;
+  const { active,board } = data;
 
   return (
-    <div className="w-auto h-full">
-      <>
+    <div className={` ${board.length? "h-auto":"h-full"} w-auto`}>
+      <div
+            style={{
+              marginLeft: showSidebar ? "clamp(260px, 10vw, 500px)" : "0px",
+            }}
+            className={`relative h-full pt-8 pb-28 mb-8 pr-8 pl-8`}
+          >
         {active ? (
-          <ActiveBoard showSidebar={showSidebar} />
+          <ActiveBoard  />
         ) : (
-          <div className=" fixed -translate-y-[50%] -translate-x-[50%] top-1/2 shadow-lg p-4 md:p-8 bg-primary/20 rounded-lg left-[50%] text-center">
-            <div className="w-64 md:w-72 mx-auto h-auto">
+          <div className="h-full flex flex-col items-center justify-center">
+          <div className="shadow-lg p-4 md:p-8 bg-primary/20 rounded-lg w-64 md:w-96 mx-auto text-center">
+            <div className="w-52 md:w-72 mx-auto h-auto">
               <img
                 src="/empty-project.png"
                 alt="start project"
                 loading="eager"
-                className="w-64 md:w-72 mx-auto h-auto"
+                className="w-52 md:w-72 mx-auto h-auto"
               />
             </div>
             <div className="">
@@ -54,8 +60,9 @@ export default function Index({ showSidebar }: Props) {
               </div>
             </button>
           </div>
+          </div>
         )}
-      </>
+      </div>
       <Modal open={isOpenBoard} handleClose={() => setOpenBoard(false)}>
         <AddBoard handleClose={() => setOpenBoard(false)} />
       </Modal>
diff --git a/src/components/Header.tsx b/src/components/Header.tsx
index ec27924..1ad0311 100644
--- a/src/components/Header.tsx
+++ b/src/components/Header.tsx
@@ -35,7 +35,7 @@ export default function Header() {
 
   return (
     <div>
-      <div className="bg-white h-[65px] z-50 dark:bg-secondary flex items-center fixed w-full border-b-[1px] border-gray/20">
+      <div className="bg-white h-[65px] z-40 dark:bg-secondary flex items-center absolute w-full border-b-[1px] border-gray/20">
         <div
           className={`border-r-[1px] border-gray/20 py-6 px-4 min-w-[14rem] cursor-pointer hidden md:block`}
         >
@@ -53,9 +53,9 @@ export default function Header() {
               onClick={() => {
                 setWorkspaceMenu(!isWorkspaceMenu);
               }}
-              className="flex items-center gap-x-2 relative"
+              className="flex items-center relative"
             >
-              <h3 className="font-bold truncate w-[5ch] sm:w-auto sm:text-base md:text-xl">
+              <h3 className="font-bold truncate w-[10ch] md:w-auto sm:text-base md:text-xl">
                 {profile.name}
               </h3>{" "}
               <HiOutlineChevronDown className="mt-1 text-sm" />
@@ -63,12 +63,14 @@ export default function Header() {
             {isWorkspaceMenu && (
               <Popup
                 description={
-                  <div className="flex gap-x-8 items-center border-b-[1px] border-gray/30 py-4 dark:text-white text-gray font-medium px-6 justify-center ">
-                    <img
+                  <div className="flex gap-x-6 items-center border-b-[1px] border-gray/30 py-4 dark:text-white text-gray font-medium px-4 justify-center ">
+                   <div  className="w-8 h-8">
+                   <img
                       src="./workspace-placeholder.webp"
-                      className="w-10 h-10"
+                      className="w-8 h-8 object-fit"
                       alt=""
                     />
+                   </div>
                     <div>
                       <h2 className="text-xl font-bold">{profile.name}</h2>
                       <p className="text-xs">{profile.email}</p>
diff --git a/src/components/Modal.tsx b/src/components/Modal.tsx
index 52729fa..01f1cf0 100644
--- a/src/components/Modal.tsx
+++ b/src/components/Modal.tsx
@@ -12,11 +12,10 @@ export default function Modal({
   handleClose,
   showDowndrop,
 }: Props) {
- 
   return (
     <>
       {open && (
-        <>
+        <div className="z-50">
           <button
             onClick={handleClose}
             className="z-50 bg-black/70 fixed -translate-y-[50%] -translate-x-[50%] top-[50%] left-[50%] w-screen h-screen"
@@ -31,7 +30,7 @@ export default function Modal({
           >
             {children}
           </div>
-        </>
+        </div>
       )}
     </>
   );
diff --git a/src/components/Popup.tsx b/src/components/Popup.tsx
index d832360..65c14b8 100644
--- a/src/components/Popup.tsx
+++ b/src/components/Popup.tsx
@@ -29,10 +29,10 @@ function Popup({ items, style, handleOpenMenu, description }: Props) {
       style={style}
       className={`  ${
         description ? "py-1" : "py-0"
-      } absolute rounded-md  shadow-3xl dark:shadow-gray/20 shadow-gray/30 
-      dark:bg-[#20212c] bg-offwhite text-white w-fit right-0 top-6 `}
+      }  absolute rounded-md shadow-3xl dark:shadow-gray/20 shadow-gray/30 
+      dark:bg-[#20212c] bg-offwhite text-white w-fit right-0 top-6`}
     >
-      <div className="w-max">
+      <div className={`${description?"w-auto":"w-max"}`}>
         {description ? description : null}
         <div className="">
           {items.map((list, i) => {
@@ -40,9 +40,9 @@ function Popup({ items, style, handleOpenMenu, description }: Props) {
               <button
                 key={i}
                 onClick={list.handler}
-                className={`dark:text-white text-gray block w-full text-left hover:text-primary font-semiBold text-[0.95rem] ${
-                  description ? "py-3 text-[0.9rem] hover:bg-primary hover:text-white" : "py-2 text-[0.75rem]"
-                } px-6 
+                className={`dark:text-white text-gray block w-full text-left  hover:text-primary font-semiBold text-[0.95rem] ${
+                  description ? "py-3 text-[0.9rem] hover:bg-primary hover:text-white" : "dark:hover:text-primary py-2 text-[0.72rem]"
+                } px-4
                ${i < items.length - 1 && `border-b-[1px] border-gray/20`}`}
               >
                 {list.title}
diff --git a/src/components/SideBar/index.tsx b/src/components/SideBar/index.tsx
index 3c95482..1b4fd5f 100644
--- a/src/components/SideBar/index.tsx
+++ b/src/components/SideBar/index.tsx
@@ -8,7 +8,9 @@ import { appData, activeItem } from "redux/boardSlice";
 import { IoIosAdd } from "react-icons/io";
 import Modal from "components/Modal";
 import AddBoard from "components/Board/AddBoard";
+import { Collapse } from "@chakra-ui/react";
 interface Props {
+  showSidebar: boolean;
   setShowSidebar?: Dispatch<SetStateAction<boolean>>;
   handleClose?: () => void;
   handleaddBoardMobile?: () => void;
@@ -18,6 +20,7 @@ export default function Index({
   handleaddBoardMobile,
   setShowSidebar,
   handleClose,
+  showSidebar,
 }: Props) {
   const [isOpen, setIsOpen] = useState<boolean>(false);
   const dispatch = useDispatch();
@@ -27,77 +30,82 @@ export default function Index({
 
   return (
     <>
-      <div
-        className={`text-gray bg-white dark:bg-secondary ${
-          isMobile && "pr-2 pb-24 border-r-[1px] border-gray/20"
-        } 
+      <Collapse in={showSidebar} animateOpacity>
+        <div
+          className={`h-screen fixed w-56 ${showSidebar ? "block " : "hidden"}`}
+        >
+          <div
+            className={`z-40 text-gray bg-white dark:bg-secondary ${
+              isMobile && "pr-2 pb-24 border-r-[1px] border-gray/20"
+            } 
      pt-4 flex  
         flex-col justify-between h-full left-0 `}
-      >
-        <div>
-          <p className="pl-4 py-2 text-xs">ALL BOARDS ({board.length})</p>
-          <div>
-            {board && (
-              <>
-                {board.map((options: IBoard) => {
-                  return (
-                    <button
-                      key={options.id}
-                      className={`py-3 w-52 px-4 flex items-center gap-x-2 font-bold cursor-pointer ${`${
-                        active.id === options.id
-                          ? "bg-primary rounded-r-full text-white"
-                          : "hover:bg-primary/20 rounded-r-full"
-                      } `} `}
-                      onClick={() => {
-                        dispatch(activeItem(options));
-                        if (handleClose) {
-                          handleClose();
-                        }
-                      }}
-                    >
-                      <Icon type="board" />
-                      {options.name}
-                    </button>
-                  );
-                })}
-              </>
-            )}
+          >
+            <div>
+              <p className="pl-4 py-2 text-xs">ALL BOARDS ({board.length})</p>
+              <div>
+                {board && (
+                  <>
+                    {board.map((options: IBoard) => {
+                      return (
+                        <button
+                          key={options.id}
+                          className={`py-3 w-52 px-4 flex items-center gap-x-2 font-bold cursor-pointer ${`${
+                            active.id === options.id
+                              ? "bg-primary rounded-r-full text-white"
+                              : "hover:bg-primary/20 rounded-r-full"
+                          } `} `}
+                          onClick={() => {
+                            dispatch(activeItem(options));
+                            if (handleClose) {
+                              handleClose();
+                            }
+                          }}
+                        >
+                          <Icon type="board" />
+                          {options.name}
+                        </button>
+                      );
+                    })}
+                  </>
+                )}
+
+                {profile.id.length ? (
+                  <button
+                    onClick={() => {
+                      handleaddBoardMobile
+                        ? handleaddBoardMobile()
+                        : setIsOpen(true);
+                    }}
+                    className="pl-4 my-8 md:my-4 font-bold cursor-pointer text-primary hover:text-primary/60"
+                  >
+                    <div className="flex items-center ">
+                      {" "}
+                      <span>
+                        {" "}
+                        <IoIosAdd size={20} />{" "}
+                      </span>{" "}
+                      <p> Add New Board</p>
+                    </div>
+                  </button>
+                ) : null}
+              </div>
+            </div>
 
-            {profile.id.length ? (
+            <div className="mx-auto w-4/5 mb-4 absolute bottom-20 right-5 md:mb-0">
               <button
+                aria-label="Hide Sidebar"
                 onClick={() => {
-                  handleaddBoardMobile
-                    ? handleaddBoardMobile()
-                    : setIsOpen(true);
+                  setShowSidebar ? setShowSidebar(false) : null;
                 }}
-                className="pl-4 my-8 md:my-4 font-bold cursor-pointer text-primary hover:text-primary/60"
+                className="cursor-pointer hover:text-primary border-none inline-flex items-center gap-x-2 text-xs my-4"
               >
-                <div className="flex items-center ">
-                  {" "}
-                  <span>
-                    {" "}
-                    <IoIosAdd size={20} />{" "}
-                  </span>{" "}
-                  <p> Add New Board</p>
-                </div>
+                <MdVisibilityOff size={20} /> Hide Sidebar
               </button>
-            ) : null}
+            </div>
           </div>
         </div>
-
-        <div className="mx-auto w-4/5 mb-4 absolute bottom-20 right-5 md:mb-0">
-          <button
-            aria-label="Hide Sidebar"
-            onClick={() => {
-              setShowSidebar ? setShowSidebar(false) : null;
-            }}
-            className="cursor-pointer hover:text-primary border-none inline-flex items-center gap-x-2 text-xs my-4"
-          >
-            <MdVisibilityOff size={20} /> Hide Sidebar
-          </button>
-        </div>
-      </div>
-
+      </Collapse>
       <Modal open={isOpen} handleClose={() => setIsOpen(false)}>
         <AddBoard handleClose={() => setIsOpen(false)} />
       </Modal>
diff --git a/src/page/dashboard/index.tsx b/src/page/dashboard/index.tsx
index 4f40d5a..12aa78d 100644
--- a/src/page/dashboard/index.tsx
+++ b/src/page/dashboard/index.tsx
@@ -1,6 +1,6 @@
 import { useState, useEffect } from "react";
 import Header from "components/Header";
-import { Collapse } from "@chakra-ui/react";
+
 import { MdVisibilityOff } from "react-icons/md";
 import SideBar from "components/SideBar";
 import Board from "components/Board";
@@ -15,40 +15,35 @@ export default function Index() {
   const data: AppState = useSelector(appData);
   const { profile, board } = data;
   const navigate = useNavigate();
+  const isMobile = useMediaQuery({ query: "(min-width: 700px)" });
 
   useEffect(() => {
     if (!profile.id.length) {
       navigate("/workspace");
     }
-  }, [navigate, profile.id.length]);
+    if (isMobile === false && board.length < 1) {
+      console.log("see");
+      setShowSidebar(false);
+    }
+  }, [board.length, isMobile, navigate, profile.id.length]);
 
-  const isMobile = useMediaQuery({ query: "(min-width: 700px)" });
   return (
-    <div className="w-full h-full">
+    <div className="w-full h-full relative">
       <Header />
       <div className="w-full h-screen">
-        <div className={`absolute top-[65px] overflow-auto w-full`}>
+        <div
+          className={`absolute top-[65px] ${
+            board.length ? "h-[90vh] overflow-auto" : "h-full"
+          }  w-full`}
+        >
           {profile.id.length ? (
-            <div
-              className={`${
-                isMobile === false && board.length < 1 ? "hidden" : "block"
-              }`}
-            >
-              <Collapse in={showSidebar} animateOpacity>
-                <div
-                  className={`h-screen fixed w-56 z-40 ${
-                    showSidebar ? "block " : "hidden"
-                  }`}
-                >
-                  <SideBar setShowSidebar={setShowSidebar} />
-                </div>
-              </Collapse>
-            </div>
+            <SideBar
+              setShowSidebar={setShowSidebar}
+              showSidebar={showSidebar}
+            />
           ) : null}
 
-          <div>
-            <Board showSidebar={showSidebar} />
-          </div>
+          <Board showSidebar={showSidebar} />
         </div>
       </div>
 
diff --git a/src/utilis/index.ts b/src/utilis/index.ts
index 3779eb6..c66d3f8 100644
--- a/src/utilis/index.ts
+++ b/src/utilis/index.ts
@@ -9,7 +9,7 @@ export const loadState = () => {
   };
 
   try {
-    const serializedState = localStorage.getItem("boarddata");
+    const serializedState = localStorage.getItem("kanban");
     if (serializedState === null) {
       return initialState;
     }
@@ -22,7 +22,7 @@ export const loadState = () => {
 export const saveState = (state: any) => {
   try {
     const serializesState = JSON.stringify(state);
-    localStorage.setItem("boarddata", serializesState);
+    localStorage.setItem("kanban", serializesState);
   } catch (err) {
     return err;
   }