diff --git a/src/assets/logos/resolved.png b/src/assets/logos/resolved.png
new file mode 100644
index 0000000..f6a2825
Binary files /dev/null and b/src/assets/logos/resolved.png differ
diff --git a/src/components/CreateModal/CreateModal.jsx b/src/components/CreateModal/CreateModal.jsx
index 566d3c8..d5cc066 100644
--- a/src/components/CreateModal/CreateModal.jsx
+++ b/src/components/CreateModal/CreateModal.jsx
@@ -112,15 +112,17 @@ export default function CreateModal({
     <>
       {isCreate ? (
         <Button
-          h={{ base: "10vh", md: "7vh" }}
-          w={{ base: "40vw", md: "8vw" }}
+          // h={{ base: "10vh", md: "7vh" }}
+          // w={{ base: "40vw", md: "" }}
           boxShadow="xl"
           _hover={{ bg: "#b4dbd9" }}
           backgroundColor="#33b249"
           color="white"
           fontSize="xl"
           fontWeight="bold"
-          borderRadius={20}
+          borderRadius={30}
+          size={"lg"}
+          paddingY={{ base: 10, md: 8 }}
           onClick={() => {
             if (user) {
               onOpen();
@@ -150,9 +152,9 @@ export default function CreateModal({
               islost: true,
               name: "",
               description: "",
-              itemDate: "",
-              isResolved: false,
-              isHelped: null,
+              itemdate: "",
+              isresolved: false,
+              ishelped: null,
             });
             setUploadImg("");
             setActiveStep(0);
@@ -173,9 +175,9 @@ export default function CreateModal({
             islost: true,
             name: "",
             description: "",
-            itemDate: "",
-            isResolved: false,
-            isHelped: null,
+            itemdate: "",
+            isresolved: false,
+            ishelped: null,
           });
           setUploadImg("");
           setActiveStep(0);
@@ -344,7 +346,7 @@ export default function CreateModal({
                           setDate(e);
                           setNewAddedItem((prev) => ({
                             ...prev,
-                            itemDate: e.toISOString().split("T")[0],
+                            itemdate: e.toISOString().split("T")[0],
                           }));
                         }}
                         value={date}
@@ -515,7 +517,7 @@ export default function CreateModal({
                       >
                         <SlCalender size={"1.3em"} />
                         <Text ml="2%" fontSize={15} w={"100%"}>
-                          {newAddedItem.itemDate}
+                          {newAddedItem.itemdate}
                         </Text>
                       </Flex>
                     </Flex>
@@ -548,9 +550,9 @@ export default function CreateModal({
                         islost: true,
                         name: "",
                         description: "",
-                        itemDate: "",
-                        isResolved: false,
-                        isHelped: null,
+                        itemdate: "",
+                        isresolved: false,
+                        ishelped: null,
                       });
                       setUploadImg("");
                       onClose();
@@ -565,7 +567,7 @@ export default function CreateModal({
                       (activeStep === 0 && newAddedItem.name === "") ||
                       newAddedItem.description === "" ||
                       (activeStep === 1 && newAddedItem.type === "") ||
-                      (activeStep === 2 && newAddedItem.itemDate === "") ||
+                      (activeStep === 2 && newAddedItem.itemdate === "") ||
                       (activeStep === 3 && uploadImg === "")
                     }
                     variant={"solid"}
diff --git a/src/components/FeedbackModal/FeedbackModal.jsx b/src/components/FeedbackModal/FeedbackModal.jsx
index 45feba0..cc53a1f 100644
--- a/src/components/FeedbackModal/FeedbackModal.jsx
+++ b/src/components/FeedbackModal/FeedbackModal.jsx
@@ -27,7 +27,9 @@ export default function FeedbackModal({
     setLoading(false);
     axios
       .put(`${process.env.REACT_APP_AWS_BACKEND_URL}/items/${props.id}`, {
-        isHelped: feedbackHelped,
+        ...props,
+        isresolved: true,
+        ishelped: feedbackHelped,
       })
       .then(() => console.log("Success"))
       .catch((err) => console.log(err));
@@ -37,7 +39,7 @@ export default function FeedbackModal({
         return prevItems.map((item) => {
           if (item.id === props.id) {
             item.isresolved = true;
-            item.isHelped = feedbackHelped;
+            item.ishelped = feedbackHelped;
           }
           return item;
         });
diff --git a/src/components/Home/Home.jsx b/src/components/Home/Home.jsx
index 9e39de7..45d1db0 100644
--- a/src/components/Home/Home.jsx
+++ b/src/components/Home/Home.jsx
@@ -84,9 +84,9 @@ export default function Home() {
     islost: true,
     name: "",
     description: "",
-    itemDate: "",
-    isResolved: false,
-    isHelped: null
+    itemdate: "",
+    isresolved: false,
+    ishelped: null,
   });
 
   const [isEdit, setIsEdit] = useState(false);
@@ -97,7 +97,7 @@ export default function Home() {
   const [screenWidth, setScreenWidth] = useState(window.screen.width);
   const [uploadImg, setUploadImg] = useState("");
 
-  console.log(data)
+  console.log(data);
 
   // LOGIN MODAL
   const {
@@ -137,10 +137,11 @@ export default function Home() {
     };
     getData();
   }, []);
-  
+
   window.onresize = () => {
     setScreenWidth(window.screen.width);
   };
+  console.log(data);
 
   return (
     <DataContext.Provider
@@ -239,55 +240,58 @@ export default function Home() {
 
         <Flex alignItems="center" justifyContent="space-between" mr={7} gap={5}>
           {user ? (
-            <Menu>
-              <MenuButton>
-                <Image
-                  src={user?.photoURL}
-                  h={{ base: "50px", md: "80px" }}
-                  w={{ base: "50px", md: "80px" }}
-                  borderRadius="100%"
-                />
-              </MenuButton>
-
-              <MenuList zIndex={10000}>
-                <MenuItem _focus={{ bg: "white" }}>
-                  <Image
-                    boxSize="1.2rem"
-                    src={userlogo}
-                    alt="logoutbutton"
-                    mr="12px"
-                  />
-                  {user?.email}
-                </MenuItem>
-                <MenuItem
-                  onClick={() => {
-                    setFindFilter((prev) => ({
-                      ...prev,
-                      isYourPosts: !prev.isYourPosts,
-                    }));
-                    onOpen();
-                  }}
-                >
+            <>
+              <Text>Leaderboard</Text>
+              <Menu>
+                <MenuButton>
                   <Image
-                    boxSize="1.2rem"
-                    src={yourposts}
-                    alt="logoutbutton"
-                    mr="12px"
+                    src={user?.photoURL}
+                    h={{ base: "50px", md: "80px" }}
+                    w={{ base: "50px", md: "80px" }}
+                    borderRadius="100%"
                   />
-                  Your Posts
-                </MenuItem>
+                </MenuButton>
 
-                <MenuItem onClick={handleLogout}>
-                  <Image
-                    boxSize="1.2rem"
-                    src={logout}
-                    alt="logoutbutton"
-                    mr="12px"
-                  />
-                  Logout
-                </MenuItem>
-              </MenuList>
-            </Menu>
+                <MenuList zIndex={10000}>
+                  <MenuItem _focus={{ bg: "white" }}>
+                    <Image
+                      boxSize="1.2rem"
+                      src={userlogo}
+                      alt="logoutbutton"
+                      mr="12px"
+                    />
+                    {user?.email}
+                  </MenuItem>
+                  <MenuItem
+                    onClick={() => {
+                      setFindFilter((prev) => ({
+                        ...prev,
+                        isYourPosts: !prev.isYourPosts,
+                      }));
+                      onOpen();
+                    }}
+                  >
+                    <Image
+                      boxSize="1.2rem"
+                      src={yourposts}
+                      alt="logoutbutton"
+                      mr="12px"
+                    />
+                    Your Posts
+                  </MenuItem>
+
+                  <MenuItem onClick={handleLogout}>
+                    <Image
+                      boxSize="1.2rem"
+                      src={logout}
+                      alt="logoutbutton"
+                      mr="12px"
+                    />
+                    Logout
+                  </MenuItem>
+                </MenuList>
+              </Menu>
+            </>
           ) : (
             <Button
               h={{ base: "6vh", md: "7vh" }}
@@ -373,13 +377,16 @@ export default function Home() {
           ) : (
             <>
               <Button
-                backgroundColor="#a881af"
-                boxShadow="2xl"
-                color="white"
+                backgroundColor="white"
+                variant="outline"
+                boxShadow="7px 7px 14px #666666,
+                -7px -7px 14px #ffffff;"
+                color="#74a2fa"
                 onClick={onOpen}
                 fontSize={{ base: "xl", md: "2xl" }}
                 size="lg"
                 gap={2}
+                borderRadius={"lg"}
               >
                 <SettingsIcon />
                 Filter
@@ -396,9 +403,12 @@ export default function Home() {
                 colorScheme="blue"
                 onClick={onResultsBarOpen}
                 fontSize="2xl"
-                boxShadow="2xl"
+                boxShadow="12px 12px 24px #a8a8a8,
+                -12px -12px 24px #ffffff;"
                 size="lg"
                 gap={2}
+                justifyContent={"center"}
+                alignItems={"center"}
               >
                 <StarIcon />
               </Button>
diff --git a/src/components/Map/Map.jsx b/src/components/Map/Map.jsx
index c95fa8a..9267710 100644
--- a/src/components/Map/Map.jsx
+++ b/src/components/Map/Map.jsx
@@ -76,6 +76,7 @@ export default function Map({
     }
   }, [focusLocation, setFocusLocation]);
 
+  console.log(findFilter);
   const allMarkers = data
     .filter((item) => {
       return (
@@ -85,7 +86,7 @@ export default function Map({
           findFilter.isFound === !item.islost) &&
         (findFilter.type === "everything" || findFilter.type === item.type) &&
         (findFilter.uploadDate === "" ||
-          item.itemDate.includes(findFilter.uploadDate)) &&
+          (item.itemdate && item.itemdate.includes(findFilter.uploadDate))) &&
         (!findFilter.isYourPosts ||
           (findFilter.isYourPosts && item.email === user.email))
       );
@@ -102,7 +103,11 @@ export default function Map({
               setFocusLocation(item.location);
             },
           }}
-          icon={(iconsMap[item.type] || iconsMap["others"])[item.islost]}
+          icon={
+            item.isresolved
+              ? iconsMap["resolved"][item.islost]
+              : (iconsMap[item.type] || iconsMap["others"])[item.islost]
+          }
         ></Marker>
       );
     });
@@ -133,7 +138,7 @@ export default function Map({
   );
 
   async function handleSubmit() {
-    console.log("submitted")
+    console.log("submitted");
     const date = new Date();
 
     axios
@@ -145,10 +150,10 @@ export default function Map({
         description: newAddedItem.description,
         email: user.email,
         location: [position.lat, position.lng],
-        itemDate: newAddedItem.itemDate,
+        itemdate: newAddedItem.itemdate,
         date: date.toISOString(),
-        isResolved: newAddedItem.isResolved,
-        isHelped: newAddedItem.isHelped,
+        isresolved: newAddedItem.isresolved,
+        ishelped: newAddedItem.ishelped,
       })
       .then((item) => {
         const newItem = {
@@ -160,10 +165,10 @@ export default function Map({
           email: user.email,
           location: [position.lat, position.lng],
           date: date.toISOString(),
-          itemDate: newAddedItem.itemDate,
+          itemdate: newAddedItem.itemdate,
           id: item.data.id,
-          isResolved: newAddedItem.isResolved,
-          isHelped: newAddedItem.isHelped,
+          isresolved: newAddedItem.isresolved,
+          ishelped: newAddedItem.ishelped,
         };
         setData((prev) => [...prev, newItem]);
         setPosition(centerPosition);
@@ -174,9 +179,9 @@ export default function Map({
           islost: true,
           name: "",
           description: "",
-          itemDate: "",
-          isResolved: false,
-          isHelped: null,
+          itemdate: "",
+          isresolved: false,
+          ishelped: null,
         });
         setIsCreate(!isCreate);
         setUploadImg("");
diff --git a/src/components/Map/MapIcons.js b/src/components/Map/MapIcons.js
index d5d886d..582980a 100644
--- a/src/components/Map/MapIcons.js
+++ b/src/components/Map/MapIcons.js
@@ -10,6 +10,7 @@ import wallet_lost from "../../assets/logos/Wallet_lost.png";
 
 import key_found from "../../assets/logos/Key_found.png";
 import key_lost from "../../assets/logos/Key_lost.png";
+import resolved from "../../assets/logos/resolved.png";
 
 import others_lost from "../../assets/logos/Others_lost.png";
 import others_found from "../../assets/logos/Others_found.png";
@@ -17,6 +18,12 @@ import others_black from "../../assets/logos/others_black.svg";
 
 import fly_img from "../../assets/images/fly_img.png";
 
+const resolvedIcon = L.icon({
+  iconUrl: resolved,
+  iconSize: [50, 50],
+  iconAnchor: [25, 40],
+});
+
 const headphoneLost = L.icon({
   iconUrl: headphone_lost,
   iconSize: [60, 60],
@@ -109,4 +116,8 @@ export const iconsMap = {
     true: othersLost,
     false: othersFound,
   },
+  resolved: {
+    true: resolvedIcon,
+    false: resolvedIcon,
+  },
 };
diff --git a/src/components/ResultCard/ResultCard.jsx b/src/components/ResultCard/ResultCard.jsx
index be775c0..e17e84c 100644
--- a/src/components/ResultCard/ResultCard.jsx
+++ b/src/components/ResultCard/ResultCard.jsx
@@ -19,14 +19,34 @@ import locate from "../../assets/logos/locate.svg";
 
 export default function ResultCard({ props, setData, onResultsBarClose }) {
   const infoModalDisclosure = useDisclosure();
-  const {id} = useParams();
+  const { id } = useParams();
 
   const formattedDate = formatDate(new Date(props.date));
   return (
     <>
       <Card maxW="lg" align={"center"} mb="10px">
         <CardBody>
-          <Image src={props.image} alt="Car key" borderRadius="lg" />
+          <Flex justifyContent={"center"} alignItems={"center"}>
+            {props.isresolved && (
+              <Flex
+                backgroundColor={"rgba(255, 123, 0, 0.9)"}
+                position={"absolute"}
+                justifyContent={"center"}
+                alignItems={"center"}
+                marginTop={30}
+                flexDir={"column"}
+                w={450}
+              >
+                <Text fontSize={18} as="b" color={"white"}>
+                  RETURNED
+                </Text>
+                <Text fontSize={15} color={"white"}>
+                  This item has been returned.
+                </Text>
+              </Flex>
+            )}
+            <Image rounded={"lg"} src={props.image} />
+          </Flex>
           <Stack mt="6" spacing="3">
             <Flex justifyContent={"space-between"}>
               <Text color="blue.600" fontSize="md" fontWeight="bold">
@@ -83,7 +103,9 @@ export default function ResultCard({ props, setData, onResultsBarClose }) {
         <InfoModal
           props={props}
           onClose={infoModalDisclosure.onClose}
-          isOpen={id === props.id.toString() ? true: infoModalDisclosure.isOpen}
+          isOpen={
+            id === props.id.toString() ? true : infoModalDisclosure.isOpen
+          }
           setData={setData}
         />
       )}
diff --git a/src/components/ResultsBar/ResultsBar.jsx b/src/components/ResultsBar/ResultsBar.jsx
index b066abc..60d15cf 100644
--- a/src/components/ResultsBar/ResultsBar.jsx
+++ b/src/components/ResultsBar/ResultsBar.jsx
@@ -23,7 +23,8 @@ export default function ResultsBar({
           findFilter.isFound === !item.islost) &&
         (findFilter.type === "everything" || findFilter.type === item.type) &&
         (findFilter.uploadDate === "" ||
-          item.itemDate.includes(findFilter.uploadDate)) &&
+          !item.itemdate ||
+          (item.itemdate && item.itemdate.includes(findFilter.uploadDate))) &&
         (!findFilter.isYourPosts ||
           (findFilter.isYourPosts && item.email === user.email))
       );