diff --git a/package.json b/package.json
index 71d0ef09..c9e83e26 100644
--- a/package.json
+++ b/package.json
@@ -1,37 +1,37 @@
 {
   "name": "data-dex",
-  "version": "1.14.6",
+  "version": "1.15.1",
   "description": "The Itheum Data DEX enables you to trade your data using web3 tech",
   "dependencies": {
     "@chakra-ui/icons": "2.1.1",
     "@chakra-ui/react": "2.8.2",
     "@emotion/react": "11.11.4",
-    "@emotion/styled": "11.11.0",
+    "@emotion/styled": "11.11.5",
     "@hookform/resolvers": "3.3.4",
     "@itheum/sdk-mx-data-nft": "3.4.0",
-    "@itheum/sdk-mx-enterprise": "0.2.0",
-    "@multiversx/sdk-core": "12.19.0",
-    "@multiversx/sdk-dapp": "2.28.8",
-    "@multiversx/sdk-native-auth-client": "1.0.7",
-    "@multiversx/sdk-network-providers": "2.3.0",
+    "@itheum/sdk-mx-enterprise": "0.3.0",
+    "@multiversx/sdk-core": "13.0.1",
+    "@multiversx/sdk-dapp": "2.31.3",
+    "@multiversx/sdk-native-auth-client": "1.0.8",
+    "@multiversx/sdk-network-providers": "2.4.3",
     "@peerme/sdk": "0.2.1",
-    "@sentry/react": "7.103.0",
-    "@tanstack/match-sorter-utils": "8.11.8",
-    "@tanstack/react-table": "8.13.2",
-    "axios": "1.6.7",
+    "@sentry/react": "7.110.1",
+    "@tanstack/match-sorter-utils": "8.15.1",
+    "@tanstack/react-table": "8.16.0",
+    "axios": "1.6.8",
     "bignumber.js": "9.1.2",
     "dotenv": "16.4.5",
-    "framer-motion": "11.0.6",
+    "framer-motion": "11.1.3",
     "mime": "4.0.1",
     "moment": "2.30.1",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "react-hook-form": "7.50.1",
-    "react-icons": "5.0.1",
-    "react-router-dom": "6.22.2",
+    "react-hook-form": "7.51.3",
+    "react-icons": "5.1.0",
+    "react-router-dom": "6.22.3",
     "web-vitals": "3.5.2",
-    "yup": "1.3.3",
-    "zustand": "4.5.1"
+    "yup": "1.4.0",
+    "zustand": "4.5.2"
   },
   "scripts": {
     "start": "vite dev",
diff --git a/src/components/Faucet/Faucet.tsx b/src/components/Faucet/Faucet.tsx
index 38853167..2637bccb 100644
--- a/src/components/Faucet/Faucet.tsx
+++ b/src/components/Faucet/Faucet.tsx
@@ -5,7 +5,7 @@ import { Address } from "@multiversx/sdk-core/out";
 import { useGetNetworkConfig } from "@multiversx/sdk-dapp/hooks";
 import { useGetAccountInfo } from "@multiversx/sdk-dapp/hooks/account";
 import { useGetPendingTransactions } from "@multiversx/sdk-dapp/hooks/transactions";
-import { CHAIN_TOKEN_SYMBOL } from "libs/config";
+import { CHAIN_TOKEN_SYMBOL, IS_DEVNET } from "libs/config";
 import { FaucetContract } from "libs/MultiversX/faucet";
 
 const Faucet = ({ tileBoxW, tileBoxH }: any) => {
@@ -18,7 +18,7 @@ const Faucet = ({ tileBoxW, tileBoxH }: any) => {
   useEffect(() => {
     // hasPendingTransactions will fire with false during init and then move from true to false each time a TX is done...
     // ... so if it's 'false' we need check and prevent faucet from being used too often
-    if (chainID === "D" && mxAddress && mxFaucetContract && !hasPendingTransactions) {
+    if (IS_DEVNET && mxAddress && mxFaucetContract && !hasPendingTransactions) {
       mxFaucetContract.getFaucetTime(new Address(mxAddress)).then((lastUsedTime) => {
         const timeNow = new Date().getTime();
 
diff --git a/src/components/ImageSlider.tsx b/src/components/ImageSlider.tsx
index fe31c951..8cdf7e27 100644
--- a/src/components/ImageSlider.tsx
+++ b/src/components/ImageSlider.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from "react";
 import { ArrowBackIcon, ArrowForwardIcon } from "@chakra-ui/icons";
-import { Box, Container, Flex, IconButton, Image, Text } from "@chakra-ui/react";
+import { Box, Container, Flex, IconButton, Image, AspectRatio, Text } from "@chakra-ui/react";
 import { motion } from "framer-motion";
 import { DEFAULT_NFT_IMAGE } from "libs/mxConstants";
 import Card3DAnimation from "./Card3DAnimation";
@@ -70,16 +70,24 @@ const ImageSlider: React.FC<ImageSliderProps> = (props) => {
                     backfaceVisibility: "hidden",
                     position: "absolute",
                   }}>
-                  <Image
-                    w={imageWidth}
-                    h={imageHeight}
-                    borderRadius={"32px"}
-                    src={imageUrls[imageIndex]}
-                    onLoad={onLoad}
-                    onError={({ currentTarget }) => {
-                      currentTarget.src = DEFAULT_NFT_IMAGE;
-                    }}
-                  />
+                  {imageUrls[nextImageIndex].includes("mp4") ? (
+                    <Box width={imageWidth} height={imageHeight} as="div" borderRadius={"32px"} overflow={"hidden"}>
+                      <Box as="div" width={"420px"} height={"420px"} ml={"-92px"}>
+                        <video width={"420px"} height={"420px"} src={imageUrls[nextImageIndex]} autoPlay loop muted></video>
+                      </Box>{" "}
+                    </Box>
+                  ) : (
+                    <Image
+                      w={imageWidth}
+                      h={imageHeight}
+                      borderRadius={"32px"}
+                      src={imageUrls[imageIndex]}
+                      onLoad={onLoad}
+                      onError={({ currentTarget }) => {
+                        currentTarget.src = DEFAULT_NFT_IMAGE;
+                      }}
+                    />
+                  )}
                 </motion.div>
                 {makeFlip && (
                   <motion.div
@@ -98,16 +106,22 @@ const ImageSlider: React.FC<ImageSliderProps> = (props) => {
                     onAnimationComplete={() => {
                       setImageIndex(nextImageIndex);
                     }}>
-                    <Image
-                      w={imageWidth}
-                      h={imageHeight}
-                      borderRadius={"32px"}
-                      src={imageUrls[nextImageIndex]}
-                      onLoad={onLoad}
-                      onError={({ currentTarget }) => {
-                        currentTarget.src = DEFAULT_NFT_IMAGE;
-                      }}
-                    />
+                    {imageUrls[nextImageIndex].includes("mp4") ? (
+                      <AspectRatio w={imageWidth} h={imageHeight} borderRadius={"32px"} onLoad={onLoad}>
+                        <iframe title="Data Nft Video" src={imageUrls[nextImageIndex]} />
+                      </AspectRatio>
+                    ) : (
+                      <Image
+                        w={imageWidth}
+                        h={imageHeight}
+                        borderRadius={"32px"}
+                        src={imageUrls[nextImageIndex]}
+                        onLoad={onLoad}
+                        onError={({ currentTarget }) => {
+                          currentTarget.src = DEFAULT_NFT_IMAGE;
+                        }}
+                      />
+                    )}
                   </motion.div>
                 )}
               </div>
diff --git a/src/components/ListDataNFTModal.tsx b/src/components/ListDataNFTModal.tsx
index 95796aaa..0f5883ce 100644
--- a/src/components/ListDataNFTModal.tsx
+++ b/src/components/ListDataNFTModal.tsx
@@ -40,9 +40,10 @@ export type ListModalProps = {
   marketContract: DataNftMarketContract;
   amount: number;
   setAmount: (amount: number) => void;
+  maxPerAddress: number;
 };
 
-export default function ListDataNFTModal({ isOpen, onClose, sellerFee, nftData, offer, marketContract, amount, setAmount }: ListModalProps) {
+export default function ListDataNFTModal({ isOpen, onClose, sellerFee, nftData, offer, marketContract, amount, setAmount, maxPerAddress }: ListModalProps) {
   const { chainID } = useGetNetworkConfig();
   const { address } = useGetAccountInfo();
   const { hasPendingTransactions } = useGetPendingTransactions();
@@ -105,7 +106,8 @@ export default function ListDataNFTModal({ isOpen, onClose, sellerFee, nftData,
       (Number(offer.wantedTokenAmount) + (Number(offer.wantedTokenAmount) * (marketRequirements.buyerTaxPercentage ?? 200)) / 10000) * Number(10 ** 18)
     ).toString(),
     quantity = amount * 1,
-    owner = address
+    owner = address,
+    maxQuantityPerAddress = maxPerAddress
   ) {
     const indexResponse = await axios.get(
       `https://${getApi(chainID)}/accounts/${contractsForChain(chainID).market}/transactions?hashes=${txHash}&status=success&withScResults=true&withLogs=true`
@@ -148,6 +150,7 @@ export default function ListDataNFTModal({ isOpen, onClose, sellerFee, nftData,
         wantedTokenAmount,
         quantity,
         owner,
+        maxQuantityPerAddress,
       };
 
       const response = await fetch(`${backendUrl}/addOffer`, {
@@ -198,7 +201,7 @@ export default function ListDataNFTModal({ isOpen, onClose, sellerFee, nftData,
       }
     }
 
-    const { sessionId } = await marketContract.addToMarket(nftData.collection, nftData.nonce, amount, offer.wantedTokenAmount ?? 0, address);
+    const { sessionId } = await marketContract.addToMarket(nftData.collection, nftData.nonce, amount, offer.wantedTokenAmount ?? 0, address, maxPerAddress);
     if (isWebWallet) {
       const price = Number(offer.wantedTokenAmount) + (Number(offer.wantedTokenAmount) * (marketRequirements.buyerTaxPercentage ?? 200)) / 10000;
       sessionStorage.setItem(
@@ -215,6 +218,7 @@ export default function ListDataNFTModal({ isOpen, onClose, sellerFee, nftData,
           wantedTokenAmount: Number(price * Number(10 ** 18)).toString(),
           quantity: amount * 1,
           owner: address,
+          maxQuantityPerAddress: maxPerAddress,
         })
       );
     }
diff --git a/src/components/MarketplaceLowerCard.tsx b/src/components/MarketplaceLowerCard.tsx
index 4dc1b32c..555728a2 100644
--- a/src/components/MarketplaceLowerCard.tsx
+++ b/src/components/MarketplaceLowerCard.tsx
@@ -18,7 +18,7 @@ import { useGetPendingTransactions } from "@multiversx/sdk-dapp/hooks/transactio
 import ProcureDataNFTModal from "components/ProcureDataNFTModal";
 import ExploreAppButton from "components/UtilComps/ExploreAppButton";
 import { ExtendedOffer } from "libs/types";
-import { isValidNumericCharacter } from "libs/utils";
+import { computeMaxBuyForOfferForAddress, isValidNumericCharacter } from "libs/utils";
 import { useMarketStore } from "store";
 import { LivelinessScore } from "./Liveliness/LivelinessScore";
 import PreviewDataButton from "./PreviewDataButton";
@@ -38,8 +38,11 @@ const MarketplaceLowerCard: FC<MarketplaceLowerCardProps> = ({ extendedOffer: of
   const [amountError, setAmountError] = useState<string>("");
   const { isOpen: isProcureModalOpen, onOpen: onProcureModalOpen, onClose: onProcureModalClose } = useDisclosure();
   const isMyNft = offer.owner === address;
-  const maxBuyLimit = import.meta.env.VITE_MAX_BUY_LIMIT_PER_SFT ? Number(import.meta.env.VITE_MAX_BUY_LIMIT_PER_SFT) : 0;
-  const maxBuyNumber = maxBuyLimit > 0 ? Math.min(maxBuyLimit, offer.quantity) : offer.quantity;
+  const maxBuyPerTransaction = import.meta.env.VITE_MAX_BUY_LIMIT_PER_SFT ? Number(import.meta.env.VITE_MAX_BUY_LIMIT_PER_SFT) : 0;
+  const maxBuyPerAddress = offer ? offer.maxQuantityPerAddress : 0;
+  const boughtByAddressAlreadyForThisOffer =
+    useMarketStore((state) => state.addressBoughtOffers).find((boughtOffer) => boughtOffer.offerId === offer.index)?.quantity ?? 0;
+  const maxBuyForOfferForAddress = computeMaxBuyForOfferForAddress(offer, maxBuyPerTransaction, maxBuyPerAddress, boughtByAddressAlreadyForThisOffer);
 
   return (
     <>
@@ -63,7 +66,7 @@ const MarketplaceLowerCard: FC<MarketplaceLowerCardProps> = ({ extendedOffer: of
                   maxW="24"
                   step={1}
                   min={1}
-                  max={maxBuyNumber}
+                  max={maxBuyForOfferForAddress}
                   isValidCharacter={isValidNumericCharacter}
                   value={amount}
                   defaultValue={1}
@@ -74,10 +77,11 @@ const MarketplaceLowerCard: FC<MarketplaceLowerCardProps> = ({ extendedOffer: of
                       error = "Cannot be zero or negative";
                     } else if (value > offer.quantity) {
                       error = "Cannot exceed listed amount";
-                    } else if (maxBuyLimit > 0 && value > maxBuyLimit) {
-                      error = "Cannot exceed max buy limit";
+                    } else if (maxBuyPerTransaction > 0 && value > maxBuyPerTransaction) {
+                      error = "Cannot exceed max buy limit per tx";
+                    } else if (maxBuyPerAddress > 0 && value > maxBuyPerAddress) {
+                      error = "Cannot exceed max buy limit per address";
                     }
-
                     setAmountError(error);
                     setAmount(value);
                   }}>
diff --git a/src/components/MyListedDataLowerCard.tsx b/src/components/MyListedDataLowerCard.tsx
index b6370800..ef9ef7f0 100644
--- a/src/components/MyListedDataLowerCard.tsx
+++ b/src/components/MyListedDataLowerCard.tsx
@@ -24,8 +24,8 @@ import { useGetNetworkConfig } from "@multiversx/sdk-dapp/hooks";
 import { useGetAccountInfo, useGetLoginInfo } from "@multiversx/sdk-dapp/hooks/account";
 import { useGetPendingTransactions, useGetSignedTransactions, useTrackTransactionStatus } from "@multiversx/sdk-dapp/hooks/transactions";
 import BigNumber from "bignumber.js";
-import { PREVIEW_DATA_ON_DEVNET_SESSION_KEY, contractsForChain } from "libs/config";
-import { useLocalStorage } from "libs/hooks";
+import { contractsForChain } from "libs/config";
+import { updateOfferSupplyOnBackend, updatePriceOnBackend } from "libs/MultiversX";
 import { DataNftMarketContract } from "libs/MultiversX/dataNftMarket";
 import {
   convertToLocalString,
@@ -90,11 +90,14 @@ const MyListedDataLowerCard: FC<MyListedDataLowerCardProps> = ({ offer, nftMetad
       const { type } = JSON.parse(sessionInfo);
       if (type == "delist-tx") {
         const { index, amount } = JSON.parse(sessionInfo);
-        updateOfferOnBackend(index, amount);
+        updateOfferSupplyOnBackend(chainID, tokenLogin?.nativeAuthToken ?? "", index, amount);
         sessionStorage.removeItem("web-wallet-tx");
       } else if (type == "update-price-tx") {
         const { index, price } = JSON.parse(sessionInfo);
-        updatePriceOnBackend(index, price);
+
+        const newPrice = price + (price * (marketRequirements.buyerTaxPercentage ?? 200)) / 10000;
+        const formattedPrice = convertEsdtToWei(newPrice, tokenDecimals(offer.wantedTokenIdentifier)).toFixed();
+        updatePriceOnBackend(chainID, tokenLogin?.nativeAuthToken ?? "", index, formattedPrice);
         sessionStorage.removeItem("web-wallet-tx");
       }
     }
@@ -121,64 +124,18 @@ const MyListedDataLowerCard: FC<MyListedDataLowerCardProps> = ({ offer, nftMetad
 
   useEffect(() => {
     if (updatePriceTxStatus && !isWebWallet) {
-      updatePriceOnBackend();
+      const price = newListingPrice + (newListingPrice * (marketRequirements.buyerTaxPercentage ?? 200)) / 10000;
+      const formattedPrice = convertEsdtToWei(price, tokenDecimals(offer.wantedTokenIdentifier)).toFixed();
+      updatePriceOnBackend(chainID, tokenLogin?.nativeAuthToken ?? "", offer.index, formattedPrice);
     }
   }, [updatePriceTxStatus]);
 
-  async function updatePriceOnBackend(index = offer.index, newPrice = newListingPrice) {
-    try {
-      const headers = {
-        Authorization: `Bearer ${tokenLogin?.nativeAuthToken}`,
-        "Content-Type": "application/json",
-      };
-
-      const price = newPrice + (newPrice * (marketRequirements.buyerTaxPercentage ?? 200)) / 10000;
-
-      const requestBody = { price: convertEsdtToWei(price, tokenDecimals(offer.wantedTokenIdentifier)).toFixed() };
-      const response = await fetch(`${backendUrl}/updateOffer/${index}`, {
-        method: "POST",
-        headers: headers,
-        body: JSON.stringify(requestBody),
-      });
-
-      if (response.ok) {
-        console.log("Response:", response.ok);
-      }
-    } catch (error) {
-      console.log("Error:", error);
-    }
-  }
-
-  async function updateOfferOnBackend(index = offer.index, supply = delistAmount) {
-    try {
-      const headers = {
-        Authorization: `Bearer ${tokenLogin?.nativeAuthToken}`,
-        "Content-Type": "application/json",
-      };
-
-      const requestBody = { supply: supply };
-      const response = await fetch(`${backendApi(chainID)}/updateOffer/${index}`, {
-        method: "POST",
-        headers: headers,
-        body: JSON.stringify(requestBody),
-      });
-
-      if (response.ok) {
-        console.log("Response:", response.ok);
-      }
-    } catch (error) {
-      console.log("Error:", error);
-    }
-  }
-
   useEffect(() => {
     if (delistTxStatus && !isWebWallet) {
-      updateOfferOnBackend();
+      updateOfferSupplyOnBackend(chainID, tokenLogin?.nativeAuthToken ?? "", offer.index, delistAmount);
     }
   }, [delistTxStatus]);
 
-  const [previewDataOnDevnetSession] = useLocalStorage(PREVIEW_DATA_ON_DEVNET_SESSION_KEY, null);
-
   const fee =
     marketRequirements && offer
       ? convertWeiToEsdt(
diff --git a/src/components/MyListedDataNFT.tsx b/src/components/MyListedDataNFT.tsx
index edbf03ba..6be5087a 100644
--- a/src/components/MyListedDataNFT.tsx
+++ b/src/components/MyListedDataNFT.tsx
@@ -74,7 +74,7 @@ const MyListedDataNFT: FC<MyListedDataNFTProps> = (props) => {
 
   const marketRequirements = useMarketStore((state) => state.marketRequirements);
   const userData = useMintStore((state) => state.userData);
-
+  const nftParsedCreationTime = moment(nftMetadata[index].creationTime);
   return (
     <Skeleton isLoaded={nftMetadataLoading}>
       <Flex wrap="wrap" gap="5" key={index}>
@@ -161,7 +161,7 @@ const MyListedDataNFT: FC<MyListedDataNFTProps> = (props) => {
                 </Flex>
 
                 <Box display="flex" justifyContent="flex-start" mt="2">
-                  <Text fontSize="xs">{`Creation time:   ${moment(nftMetadata[index].creationTime).format(uxConfig.dateStr)}`}</Text>
+                  {nftParsedCreationTime.isValid() && <Text fontSize="xs">{`Creation time:   ${nftParsedCreationTime.format(uxConfig.dateStr)}`}</Text>}
                 </Box>
 
                 <Box color="gray.600" fontSize="sm">
diff --git a/src/components/ProcureDataNFTModal.tsx b/src/components/ProcureDataNFTModal.tsx
index ac67edae..0e8801ea 100644
--- a/src/components/ProcureDataNFTModal.tsx
+++ b/src/components/ProcureDataNFTModal.tsx
@@ -19,6 +19,7 @@ import { DataNft, Offer } from "@itheum/sdk-mx-data-nft/out";
 import { useGetAccountInfo, useGetLoginInfo, useGetNetworkConfig, useGetSignedTransactions, useTrackTransactionStatus } from "@multiversx/sdk-dapp/hooks";
 import BigNumber from "bignumber.js";
 import DataNFTLiveUptime from "components/UtilComps/DataNFTLiveUptime";
+import { updateOfferSupplyOnBackend } from "libs/MultiversX";
 import { DataNftMarketContract } from "libs/MultiversX/dataNftMarket";
 import {
   backendApi,
@@ -54,7 +55,6 @@ export default function ProcureDataNFTModal({ isOpen, onClose, buyerFee, nftData
   const marketContract = new DataNftMarketContract(chainID);
   const { tokenLogin, loginMethod } = useGetLoginInfo();
   const isWebWallet = loginMethod === "wallet";
-  const backendUrl = backendApi(chainID);
   const feePrice = printPrice(
     convertWeiToEsdt(Number(offer.wantedTokenAmount) * amount, tokenDecimals(offer.wantedTokenIdentifier)).toNumber(),
     getTokenWantedRepresentation(offer.wantedTokenIdentifier, offer.wantedTokenNonce)
@@ -85,7 +85,7 @@ export default function ProcureDataNFTModal({ isOpen, onClose, buyerFee, nftData
     if (sessionInfo) {
       const { type, index, amount: amountt } = JSON.parse(sessionInfo);
       if (type == "purchase-tx") {
-        updateOfferOnBackend(index, amountt);
+        updateOfferSupplyOnBackend(chainID, tokenLogin?.nativeAuthToken ?? "", index, amountt);
         sessionStorage.removeItem("web-wallet-tx");
       }
     }
@@ -97,7 +97,7 @@ export default function ProcureDataNFTModal({ isOpen, onClose, buyerFee, nftData
 
   useEffect(() => {
     if (purchaseTxStatus && !isWebWallet) {
-      updateOfferOnBackend();
+      updateOfferSupplyOnBackend(chainID, tokenLogin?.nativeAuthToken ?? "", offer.index, amount);
     }
   }, [purchaseTxStatus]);
 
@@ -108,28 +108,6 @@ export default function ProcureDataNFTModal({ isOpen, onClose, buyerFee, nftData
     }
   }, [isOpen]);
 
-  async function updateOfferOnBackend(index = offer.index, supply = amount) {
-    try {
-      const headers = {
-        Authorization: `Bearer ${tokenLogin?.nativeAuthToken}`,
-        "Content-Type": "application/json",
-      };
-
-      const requestBody = { supply: supply };
-      const response = await fetch(`${backendUrl}/updateOffer/${index}`, {
-        method: "POST",
-        headers: headers,
-        body: JSON.stringify(requestBody),
-      });
-
-      if (response.ok) {
-        console.log("Response:", response.ok);
-      }
-    } catch (error) {
-      console.log("Error:", error);
-    }
-  }
-
   const showErrorToast = (title: string) => {
     toast({
       title,
diff --git a/src/components/ProfileCard.tsx b/src/components/ProfileCard.tsx
index ea4e15ab..fb1c3441 100644
--- a/src/components/ProfileCard.tsx
+++ b/src/components/ProfileCard.tsx
@@ -56,7 +56,7 @@ const ProfileCard = ({
 
   const nftId = createNftId(collection, nonce);
   const imageUrl = collection ? `https://${getApi(chainID)}/nfts/${nftId}/thumbnail` : DEFAULT_NFT_IMAGE;
-
+  const parsedCreationTime = moment(creationTime);
   return (
     <Skeleton fitContent={true} isLoaded={hasLoaded} borderRadius="lg" display={"flex"} alignItems={"center"} justifyContent={"center"}>
       <Box w="275px" h="30rem" mx="3 !important" borderWidth="0.5px" borderRadius="xl" borderColor="#00C79740" position="relative" mb="1rem">
@@ -155,7 +155,7 @@ const ProfileCard = ({
             <Flex>
               <Box color="#8c8f92d0">Creation Time:</Box>
               <Spacer />
-              <Box>{moment(creationTime).format(uxConfig.dateStr)}</Box>
+              {parsedCreationTime.isValid() && <Box>{parsedCreationTime.format(uxConfig.dateStr)}</Box>}
             </Flex>
           </Box>
         </Flex>
diff --git a/src/components/ProposalButton/index.tsx b/src/components/ProposalButton/index.tsx
new file mode 100644
index 00000000..8d24e533
--- /dev/null
+++ b/src/components/ProposalButton/index.tsx
@@ -0,0 +1,37 @@
+import React from "react";
+import { timeUntil } from "../../libs/utils";
+import { ProposalDeepLinkBuilder } from "@peerme/sdk";
+import { IS_DEVNET, PEERME_TEAM_NAME } from "../../libs/config";
+import BigNumber from "bignumber.js";
+import { useGetLoginInfo } from "@multiversx/sdk-dapp/hooks/account";
+import { Button } from "@chakra-ui/react";
+
+type ProposalButtonProps = {
+  proposalTitle: string;
+  proposalDescription: string;
+  contractAddress: string;
+  endpoint: string;
+  proposalArguments: any;
+  isDisabled?: boolean;
+};
+
+export const ProposalButton: React.FC<ProposalButtonProps> = (props) => {
+  const { contractAddress, endpoint, proposalTitle, proposalDescription, proposalArguments, isDisabled } = props;
+  const { tokenLogin } = useGetLoginInfo();
+
+  const addDeeplinkUrl = () => {
+    const url = new ProposalDeepLinkBuilder(PEERME_TEAM_NAME, { network: IS_DEVNET ? "devnet" : "mainnet" })
+      .authenticate(tokenLogin?.nativeAuthToken ?? "")
+      .setTitle(`${proposalTitle}`)
+      .setDescription(`${proposalDescription}`)
+      .addAction(contractAddress, `${endpoint}`, 0, [proposalArguments], [])
+      .build();
+    return window.open(url, "_blank");
+  };
+
+  return (
+    <Button type="button" ml={3} colorScheme="teal" isDisabled={isDisabled} onClick={() => addDeeplinkUrl()}>
+      Proposal
+    </Button>
+  );
+};
diff --git a/src/components/Sections/RecentDataNFTs.tsx b/src/components/Sections/RecentDataNFTs.tsx
index 7c1f7406..6599aca6 100644
--- a/src/components/Sections/RecentDataNFTs.tsx
+++ b/src/components/Sections/RecentDataNFTs.tsx
@@ -27,8 +27,8 @@ for (let i = 0; i < 10; i++) {
     wantedTokenIdentifier: "",
     wantedTokenNonce: 0,
     wantedTokenAmount: 0,
-    creator: new Address(),
-    owner: new Address(),
+    creator: new Address(""),
+    owner: new Address(""),
     tokenName: "",
     title: "",
     nftImgUrl: "",
@@ -133,7 +133,7 @@ const RecentDataNFTs = ({ headingText, headingSize }: { headingText: string; hea
           const _nftMetaData = DataNft.decodeAttributes(_nft.attributes);
 
           _latestOffers.push({
-            creator: new Address(_nftMetaData.creator),
+            creator: new Address(_nftMetaData.creator ?? ""),
             owner: new Address(offer.owner),
             offeredTokenIdentifier: offer.offeredTokenIdentifier,
             offeredTokenNonce: offer.offeredTokenNonce,
diff --git a/src/components/UtilComps/UpperCardComponent.tsx b/src/components/UtilComps/UpperCardComponent.tsx
index 5f8ef392..1b04f00c 100644
--- a/src/components/UtilComps/UpperCardComponent.tsx
+++ b/src/components/UtilComps/UpperCardComponent.tsx
@@ -72,6 +72,7 @@ const UpperCardComponent: FC<UpperCardComponentProps> = ({
       )
     : "";
   const fee = offer ? convertWeiToEsdt(offer.wantedTokenAmount as BigNumber.Value, tokenDecimals(offer.wantedTokenIdentifier)).toNumber() : 0;
+  const parsedCreationTime = moment(nftMetadata?.creationTime);
   return (
     <Skeleton fitContent={true} isLoaded={nftImageLoading} borderRadius="lg" display={"flex"} alignItems={"center"} justifyContent={"center"}>
       <Box
@@ -169,7 +170,9 @@ const UpperCardComponent: FC<UpperCardComponentProps> = ({
               </Flex>
 
               <Box display="flex" justifyContent="flex-start" mt="2">
-                <Text fontSize="md" fontWeight="medium" color="#929497">{`Creation time:   ${moment(nftMetadata.creationTime).format(uxConfig.dateStr)}`}</Text>
+                {parsedCreationTime.isValid() && (
+                  <Text fontSize="md" fontWeight="medium" color="#929497">{`Creation time:   ${parsedCreationTime.format(uxConfig.dateStr)}`}</Text>
+                )}
               </Box>
 
               {nftMetadata && (
diff --git a/src/components/WalletDataNFTMX/WalletDataNFTMX.tsx b/src/components/WalletDataNFTMX/WalletDataNFTMX.tsx
index 94340e51..d4787d37 100644
--- a/src/components/WalletDataNFTMX/WalletDataNFTMX.tsx
+++ b/src/components/WalletDataNFTMX/WalletDataNFTMX.tsx
@@ -87,6 +87,8 @@ export default function WalletDataNFTMX(item: any) {
   const [amountError, setAmountError] = useState("");
   const [price, setPrice] = useState(10);
   const [priceError, setPriceError] = useState("");
+  const [maxPerAddress, setMaxPerAddress] = useState(0);
+  const [maxPerAddressError, setMaxPerAddressError] = useState("");
   const [previewDataOnDevnetSession] = useLocalStorage(PREVIEW_DATA_ON_DEVNET_SESSION_KEY, null);
   const [webWalletListTxHash, setWebWalletListTxHash] = useState("");
   const maxListLimit = import.meta.env.VITE_MAX_LIST_LIMIT_PER_SFT ? Number(import.meta.env.VITE_MAX_LIST_LIMIT_PER_SFT) : 0;
@@ -132,7 +134,8 @@ export default function WalletDataNFTMX(item: any) {
           txData.wantedTokenNonce,
           txData.wantedTokenAmount,
           txData.quantity,
-          txData.owner
+          txData.owner,
+          txData.maxQuantityPerAddress
         );
       }
       sessionStorage.removeItem("web-wallet-tx");
@@ -151,7 +154,8 @@ export default function WalletDataNFTMX(item: any) {
     wantedTokenNonce: string,
     wantedTokenAmount: string,
     quantity: number,
-    owner: string
+    owner: string,
+    maxQuantityPerAddress: number
   ) {
     try {
       let indexResponse;
@@ -207,6 +211,7 @@ export default function WalletDataNFTMX(item: any) {
           wantedTokenAmount: wantedTokenAmount,
           quantity: quantity,
           owner: owner,
+          maxQuantityPerAddress: maxQuantityPerAddress,
         };
 
         const response = await fetch(`${backendUrl}/addOffer`, {
@@ -317,11 +322,14 @@ export default function WalletDataNFTMX(item: any) {
       return "Free";
     }
   };
+
+  const parsedCreationTime = moment(item.creationTime);
+
   return (
     <Skeleton fitContent={true} isLoaded={item.hasLoaded} borderRadius="lg" display="flex" alignItems="center" justifyContent="center">
       <Box
         w="275px"
-        h={item.isProfile === true ? "660px" : "900px"}
+        h={item.isProfile === true ? "660px" : "930px"}
         mx="3 !important"
         border="1px solid transparent"
         borderColor="#00C79740"
@@ -338,7 +346,7 @@ export default function WalletDataNFTMX(item: any) {
           openNftDetailsDrawer={() => item.openNftDetailsDrawer(item.id)}
         />
 
-        <Flex h="28rem" mx={6} my={3} direction="column" justify={item.isProfile === true ? "initial" : "space-between"}>
+        <Flex h="28rem" mx={6} my={2} direction="column" justify={item.isProfile === true ? "initial" : "space-between"}>
           <Text fontSize="md" color="#929497">
             <Link href={`${CHAIN_TX_VIEWER[chainID as keyof typeof CHAIN_TX_VIEWER]}/nfts/${item.tokenIdentifier}`} isExternal>
               {item.tokenName} <ExternalLinkIcon mx="2px" />
@@ -382,9 +390,9 @@ export default function WalletDataNFTMX(item: any) {
               </Box>
             )}
 
-            {item.creationTime && (
+            {parsedCreationTime.isValid() && (
               <Box color="#8c8f92d0" fontSize="md">
-                Creation time: {moment(item.creationTime).format(uxConfig.dateStr)}
+                Creation time: {parsedCreationTime.format(uxConfig.dateStr)}
               </Box>
             )}
 
@@ -447,7 +455,7 @@ export default function WalletDataNFTMX(item: any) {
               {item.dataPreview && <PreviewDataButton previewDataURL={item.dataPreview} />}
             </HStack>
 
-            <Flex mt="7" display={item.isProfile === true ? "none" : "flex"} flexDirection="row" justifyContent="space-between" alignItems="center" maxH={10}>
+            <Flex mt="6" display={item.isProfile === true ? "none" : "flex"} flexDirection="row" justifyContent="space-between" alignItems="center" maxH={10}>
               <Text fontSize="md" color="#929497">
                 How many to list:{" "}
               </Text>
@@ -491,7 +499,7 @@ export default function WalletDataNFTMX(item: any) {
               )}
             </Box>
 
-            <Flex mt="5" display={item.isProfile === true ? "none" : "flex"} flexDirection="row" justifyContent="space-between" alignItems="center" maxH={10}>
+            <Flex mt="3" display={item.isProfile === true ? "none" : "flex"} flexDirection="row" justifyContent="space-between" alignItems="center" maxH={10}>
               <Tooltip label="This fee is what your dataset is advertised for on the marketplace">
                 <Text fontSize="md" color="#929497">
                   Access fee for each:
@@ -533,10 +541,55 @@ export default function WalletDataNFTMX(item: any) {
               )}
             </Box>
 
+            <Flex mt="3" display={item.isProfile === true ? "none" : "flex"} flexDirection="row" justifyContent="space-between" alignItems="center" maxH={10}>
+              <Tooltip label="This is a limit that you can impose in order to avoid someone buying your whole supply. Setting it to 0 will disable it">
+                <Text fontSize="md" color="#929497">
+                  Max buy per address:
+                </Text>
+              </Tooltip>
+              <NumberInput
+                size="sm"
+                borderRadius="4.65px !important"
+                maxW={20}
+                step={1}
+                defaultValue={0}
+                min={0}
+                max={Number(maxListNumber)}
+                isValidCharacter={isValidNumericCharacter}
+                value={maxPerAddress}
+                onChange={(value) => {
+                  let error = "";
+                  const valueAsNumber = Number(value);
+                  if (valueAsNumber < 0) {
+                    error = "Cannot be negative";
+                  } else if (valueAsNumber > item.balance) {
+                    error = "Cannot be higher than balance";
+                  } else if (maxListLimit > 0 && valueAsNumber > maxListLimit) {
+                    error = "Cannot exceed max list limit";
+                  }
+
+                  setMaxPerAddressError(error);
+                  setMaxPerAddress(valueAsNumber);
+                }}>
+                <NumberInputField />
+                <NumberInputStepper>
+                  <NumberIncrementStepper />
+                  <NumberDecrementStepper />
+                </NumberInputStepper>
+              </NumberInput>
+            </Flex>
+            <Box h={3}>
+              {maxPerAddressError && (
+                <Text color="red.400" fontSize="xs">
+                  {maxPerAddressError}
+                </Text>
+              )}
+            </Box>
+
             <Tooltip colorScheme="teal" hasArrow placement="top" label="Market is paused" isDisabled={!isMarketPaused}>
               <Button
                 size="sm"
-                mt={4}
+                mt={2}
                 width="215px"
                 display={item.isProfile === true ? "none" : "flex"}
                 colorScheme="teal"
@@ -574,6 +627,7 @@ export default function WalletDataNFTMX(item: any) {
             }}
             amount={amount}
             setAmount={setAmount}
+            maxPerAddress={maxPerAddress}
           />
         )}
 
diff --git a/src/libs/MultiversX/backend-api.ts b/src/libs/MultiversX/backend-api.ts
index 2c51bb96..a34bb7c5 100644
--- a/src/libs/MultiversX/backend-api.ts
+++ b/src/libs/MultiversX/backend-api.ts
@@ -1,6 +1,6 @@
 import { DataNftMarket, MarketplaceRequirements, Offer } from "@itheum/sdk-mx-data-nft/out";
 import axios from "axios";
-import { backendApi } from "libs/utils";
+import { backendApi, convertEsdtToWei, tokenDecimals } from "libs/utils";
 import { IS_DEVNET, uxConfig } from ".";
 import { DataNftCollectionType, Favorite, TrendingNft } from "./types";
 
@@ -56,6 +56,87 @@ export async function addFavoriteToBackendApi(chainID: string, tokenIdentifier:
   }
 }
 
+export async function getAddressBoughtOffersFromBackendApi(chainId: string, bearerToken: string): Promise<Array<string>> {
+  try {
+    const url = `${backendApi(chainId)}/addressBoughtOffers`;
+    const { data } = await axios.get<any>(url, {
+      timeout: uxConfig.mxAPITimeoutMs,
+      headers: {
+        Authorization: `Bearer ${bearerToken}`,
+      },
+    });
+    console.log(data);
+    return data;
+  } catch (error) {
+    console.error(error);
+    return [];
+  }
+}
+
+export async function updateOfferSupplyOnBackend(chainID: string, bearerToken: string, index: number, supply: number) {
+  try {
+    const headers = {
+      Authorization: `Bearer ${bearerToken}`,
+      "Content-Type": "application/json",
+    };
+
+    const requestBody = { supply: supply };
+    const response = await fetch(`${backendApi(chainID)}/updateOffer/${index}`, {
+      method: "POST",
+      headers: headers,
+      body: JSON.stringify(requestBody),
+    });
+    updateAddressBoughtOfferToBackendApi(chainID, index, supply, bearerToken);
+    if (response.ok) {
+      console.log("Response:", response.ok);
+    }
+  } catch (error) {
+    console.log("Error:", error);
+  }
+}
+
+export async function updatePriceOnBackend(chainID: string, bearerToken: string, index: number, newPrice: string) {
+  try {
+    const headers = {
+      Authorization: `Bearer ${bearerToken}`,
+      "Content-Type": "application/json",
+    };
+
+    const requestBody = { price: newPrice };
+    const response = await fetch(`${backendApi(chainID)}/updateOffer/${index}`, {
+      method: "POST",
+      headers: headers,
+      body: JSON.stringify(requestBody),
+    });
+
+    if (response.ok) {
+      console.log("Response:", response.ok);
+    }
+  } catch (error) {
+    console.log("Error:", error);
+  }
+}
+
+export async function updateAddressBoughtOfferToBackendApi(chainID: string, offerId: number, amount: number, bearerToken: string): Promise<Favorite> {
+  try {
+    const url = `${backendApi(chainID)}/updateAddressBoughtOffer/${offerId}`;
+    const { data } = await axios.post<any>(
+      url,
+      { quantity: amount },
+      {
+        timeout: uxConfig.mxAPITimeoutMs,
+        headers: {
+          Authorization: `Bearer ${bearerToken}`,
+        },
+      }
+    );
+    return data;
+  } catch (error) {
+    console.error(error);
+    return {} as Favorite;
+  }
+}
+
 export async function removeFavoriteFromBackendApi(chainID: string, tokenIdentifier: string, bearerToken: string): Promise<Favorite> {
   try {
     const url = `${backendApi(chainID)}/removeFavorite`;
@@ -185,11 +266,11 @@ export async function getOffersByIdAndNoncesFromBackendApi(
   const { data } = await axios.get<Offer[]>(url, {
     timeout: uxConfig.mxAPITimeoutMs,
   });
-
+  console.log(data);
   return data;
 }
 
-export async function getMarketRequirements(chainID: string): Promise<MarketplaceRequirements | undefined> {
+export async function getMarketRequirements(): Promise<MarketplaceRequirements | undefined> {
   const dataNftMarketplace = new DataNftMarket(IS_DEVNET ? "devnet" : "mainnet");
   try {
     return dataNftMarketplace.viewRequirements();
diff --git a/src/libs/MultiversX/custom.css b/src/libs/MultiversX/custom.css
index 4a89117e..b861059b 100644
--- a/src/libs/MultiversX/custom.css
+++ b/src/libs/MultiversX/custom.css
@@ -236,13 +236,11 @@ body {
   color: var(--chakra-colors-chakra-body-text) !important;
 }
 
-.chakra-ui-dark
   .dapp-core-component__walletConnectLoginContainerStyles__xPortal-login-container
   .dapp-core-component__walletConnectLoginContainerStyles__xPortal-modal-dialog-content {
   background: var(--chakra-colors-gray-700) !important;
 }
 
-.chakra-ui-dark
   .dapp-core-component__dappModalStyles__dappModalCloseButton.dapp-core-component__main__btn.dapp-core-component__main__btn-light.dapp-core-component__walletConnectLoginContainerStyles__xPortal-modal-close-button {
   background: var(--chakra-colors-gray-700) !important;
   color: var(--chakra-colors-chakra-body-text) !important;
@@ -402,3 +400,7 @@ body {
   overflow-y: scroll !important;
   max-height: 100% !important;
 }
+
+.chakra-ui-dark {
+  background: #181818;
+}
diff --git a/src/libs/MultiversX/dataNftMarket.ts b/src/libs/MultiversX/dataNftMarket.ts
index 8eb430c7..f4890e20 100644
--- a/src/libs/MultiversX/dataNftMarket.ts
+++ b/src/libs/MultiversX/dataNftMarket.ts
@@ -135,7 +135,14 @@ export class DataNftMarketContract {
     return { sessionId, error };
   }
 
-  async addToMarket(addTokenCollection: string, addTokenNonce: number, addTokenQuantity: number, price: BigNumber.Value, addressOfSender: string) {
+  async addToMarket(
+    addTokenCollection: string,
+    addTokenNonce: number,
+    addTokenQuantity: number,
+    price: BigNumber.Value,
+    addressOfSender: string,
+    maxQuantity = 0
+  ) {
     const addToMarketTx = this.contract.addOffer(
       new Address(addressOfSender),
       addTokenCollection,
@@ -145,7 +152,7 @@ export class DataNftMarketContract {
       0,
       new BigNumber(price).multipliedBy(10 ** 18),
       0,
-      0
+      maxQuantity
     );
 
     await refreshAccount();
@@ -239,9 +246,9 @@ export class DataNftMarketContract {
     }
   }
 
-  async viewPagedOffers(startIndex: number, stopIndex: number, userAddress?: string): Promise<Offer[]> {
+  async viewPagedOffers(startIndex: number, stopIndex: number, userAddress?: Address): Promise<Offer[]> {
     try {
-      const pagedOffers = await this.contract.viewPagedOffers(startIndex, stopIndex, new Address(userAddress));
+      const pagedOffers = await this.contract.viewPagedOffers(startIndex, stopIndex, new Address(userAddress ?? ""));
 
       return pagedOffers;
     } catch (e) {
diff --git a/src/libs/MultiversX/types.ts b/src/libs/MultiversX/types.ts
index 7a970dec..7265e404 100644
--- a/src/libs/MultiversX/types.ts
+++ b/src/libs/MultiversX/types.ts
@@ -75,6 +75,7 @@ export interface UserDataType {
   contractPaused: boolean;
   userWhitelistedForMint: boolean;
   lastUserMintTime: number;
+  maxDonationPecentage: number;
   maxRoyalties: number;
   maxSupply: number;
   minRoyalties: number;
diff --git a/src/libs/config.ts b/src/libs/config.ts
index 6afbe748..e694b7e8 100644
--- a/src/libs/config.ts
+++ b/src/libs/config.ts
@@ -30,30 +30,6 @@ export function contractsForChain(chainID: string): ContractsType {
             id: dataNFTFTTicker_Mx_Devnet,
             contract: new Address(dataNftMintContractAddress_Mx_Devnet),
           },
-          {
-            id: "BIGBANG-6b34db",
-            contract: new Address("erd1qqqqqqqqqqqqqpgqdsf80w35nqlxfd34z0cd9n60vwlkdj9a8yps3t6x4m"),
-          },
-          {
-            id: "BETATOK-5b7317",
-            contract: new Address("erd1qqqqqqqqqqqqqpgqjk0cxzm79qzced5sevmnn6swgp3jjch88ypsfd068q"),
-          },
-          {
-            id: "COLNAMA-539838",
-            contract: new Address("erd1qqqqqqqqqqqqqpgqnf8lrjy9efepss09qm3a3q9za9ahtcah8ypsnd6lqd"),
-          },
-          {
-            id: "ALPHADATA-b3f6d0",
-            contract: new Address("erd1qqqqqqqqqqqqqpgqcaqv55lrfjuvspgrhezvqrag4gq3qdxu8ypsx9f0ar"),
-          },
-          {
-            id: "NEWDNFT-3a8caa",
-            contract: new Address("erd1qqqqqqqqqqqqqpgq69lkfnnzgvqpjzze690rl4lmqtmvnccsw3wqhvsacl"),
-          },
-          {
-            id: "FOOA-141164",
-            contract: new Address("erd1qqqqqqqqqqqqqpgqteqgaxcel2zjkrsm27szjlptemqk0sdpu00sp49kss"),
-          },
           {
             id: "DNFTPHMA-9e2b1c",
             contract: new Address("erd1qqqqqqqqqqqqqpgq5hsq5z09zv3g0lsxs3y6q2x0qvlhzugpu00sevtqsw"),
@@ -70,6 +46,11 @@ export function contractsForChain(chainID: string): ContractsType {
             id: "OASMUSICPL-47b186",
             contract: new Address("erd1qqqqqqqqqqqqqpgq30mwjcjmy7l7p4v0ytf2pmcmj95u9l8xu00sku2n5h"),
           },
+          {
+            id: "FOOWLDMSC-5ee8ec",
+            contract: new Address("erd1qqqqqqqqqqqqqpgqu0nxfwcnsaccu3sgt0a8u0sglmk6se9cu00s0zm03r"),
+          },
+          { id: "DNFTPHMUS-73cde3", contract: new Address("") },
         ],
       };
     }
@@ -84,6 +65,8 @@ export function contractsForChain(chainID: string): ContractsType {
             id: dataNFTFTTicker_Mx_Mainnet,
             contract: new Address(dataNftMintContractAddress_Mx_Mainnet),
           },
+          //deep forest album
+          { id: "DFEE-72425b", contract: new Address("erd1qqqqqqqqqqqqqpgq0lcp4hrr2jg54e09cex3ema6h0rtakw2wgtst0krnk") },
         ],
       };
     }
@@ -520,12 +503,14 @@ export const EXPLORER_APP_SUPPORTED_TOKENS: any = {
     "timecapsule": [{ tokenIdentifier: "DATANFTFT-e0b917", nonce: 57 }],
     "bitzgame": [{ tokenIdentifier: "DATANFTFT-e0b917", nonce: 198 }],
     "bobergameroom": [],
+    "deepforest": [],
   },
   "1": {
     "trailblazer": [{ tokenIdentifier: "DATANFTFT-e936d4", nonce: 1 }],
     "multiversxbubbles": [{ tokenIdentifier: "DATANFTFT-e936d4", nonce: 2 }],
     "multiversxinfographics": [{ tokenIdentifier: "DATANFTFT-e936d4", nonce: 3 }],
     "nftunes": [{ tokenIdentifier: "DATANFTFT-e936d4", nonce: 4 }],
+    "deepforest": [...Array.from({ length: 91 }, (_, i) => ({ tokenIdentifier: "DFEE-72425b", nonce: i }))],
     "timecapsule": [{ tokenIdentifier: "DATANFTFT-e936d4", nonce: 5 }],
     "bitzgame": [{ tokenIdentifier: "DATANFTFT-e936d4", nonce: 7 }],
     "bobergameroom": [{ tokenIdentifier: "DATANFTFT-e936d4", nonce: 8 }],
@@ -547,6 +532,7 @@ export const EXPLORER_APP_FOR_TOKEN: Record<string, Record<string, string>> = {
     "multiversxbubbles": "https://explorer.itheum.io/multiversx-bubbles",
     "multiversxinfographics": "https://explorer.itheum.io/multiversx-infographics",
     "nftunes": "https://explorer.itheum.io/nftunes",
+    "deepforest": "https://explorer.itheum.io/deep-forest-music-data-nft",
     "timecapsule": "https://explorer.itheum.io/timecapsule",
     "bitzgame": "https://explorer.itheum.io/getbitz",
     "bobergameroom": "https://explorer.itheum.io/bobergameroom",
diff --git a/src/libs/types.ts b/src/libs/types.ts
index 1aeb0679..0f6572ca 100644
--- a/src/libs/types.ts
+++ b/src/libs/types.ts
@@ -32,6 +32,13 @@ export interface DataNFTToken {
   contract: IAddress;
 }
 
+export type AddressBoughtOffer = {
+  id: number;
+  address: string;
+  offerId: number;
+  quantity: number;
+};
+
 export interface ExtendedOffer extends Offer, Partial<Bond> {}
 
 export enum BlobDataType {
diff --git a/src/libs/utils/util.ts b/src/libs/utils/util.ts
index 43cb4b9c..b896f7c7 100644
--- a/src/libs/utils/util.ts
+++ b/src/libs/utils/util.ts
@@ -393,3 +393,20 @@ export const computeRemainingCooldown = (startTime: number, cooldown: number) =>
 
   return _cooldown > 0 ? _cooldown + Date.now() : 0;
 };
+
+export function computeMaxBuyForOfferForAddress(
+  offer: Offer | undefined,
+  maxBuyPerTransaction: number,
+  maxBuyPerAddress: number,
+  boughtByAddressAlreadyForThisOffer: number
+) {
+  let mboa = offer ? offer.quantity : 0;
+  if (maxBuyPerTransaction > 0) {
+    mboa = Math.min(mboa, maxBuyPerTransaction);
+
+    if (maxBuyPerAddress > 0) {
+      mboa = Math.min(mboa, maxBuyPerAddress - boughtByAddressAlreadyForThisOffer);
+    }
+  }
+  return mboa;
+}
diff --git a/src/pages/AdvertiseData/components/TradeForm.tsx b/src/pages/AdvertiseData/components/TradeForm.tsx
index b805ae75..3220e6c4 100644
--- a/src/pages/AdvertiseData/components/TradeForm.tsx
+++ b/src/pages/AdvertiseData/components/TradeForm.tsx
@@ -15,9 +15,15 @@ import {
   NumberInput,
   NumberInputField,
   NumberInputStepper,
+  Slider,
+  SliderFilledTrack,
+  SliderMark,
+  SliderThumb,
+  SliderTrack,
   Tag,
   Text,
   Textarea,
+  Tooltip,
   useColorMode,
   useToast,
 } from "@chakra-ui/react";
@@ -46,6 +52,7 @@ type TradeDataFormType = {
   datasetTitleForm: string;
   datasetDescriptionForm: string;
   extraAssets?: string;
+  donatePercentage?: number;
   numberOfCopiesForm: number;
   royaltiesForm: number;
   bondingAmount?: number;
@@ -82,6 +89,8 @@ export const TradeForm: React.FC<TradeFormProps> = (props) => {
     s3: 0,
     s4: 0,
   });
+
+  const [showTooltip, setShowTooltip] = useState<boolean>(false);
   const [mintSessionId, setMintSessionId] = useState<any>(null);
   const itheumBalance = useAccountStore((state) => state.itheumBalance);
   const { colorMode } = useColorMode();
@@ -95,6 +104,8 @@ export const TradeForm: React.FC<TradeFormProps> = (props) => {
     { amount: "10000000000000000000", lockPeriod: 900 },
     { amount: "10000000000000000000", lockPeriod: 2 },
   ]);
+  const [previousDataNFTStreamUrl, setPreviousDataNFTStreamUrl] = useState<string>("");
+  const [wasPreviousCheck200StreamSuccess, setWasPreviousCheck200StreamSuccess] = useState<boolean>(false);
 
   useEffect(() => {
     bond.viewLockPeriodsWithBonds().then((periodsT) => {
@@ -125,11 +136,18 @@ export const TradeForm: React.FC<TradeFormProps> = (props) => {
         return value !== this.parent.dataPreviewUrlForm;
       })
       .test("is-200", "Data Stream URL must be public", async function (value: string) {
-        const { isSuccess, message } = await checkUrlReturns200(value);
-        if (!isSuccess) {
-          return this.createError({ message });
+        if (previousDataNFTStreamUrl !== value) {
+          const { isSuccess, message } = await checkUrlReturns200(value);
+          setPreviousDataNFTStreamUrl(value);
+          setWasPreviousCheck200StreamSuccess(isSuccess);
+          if (!isSuccess) {
+            return this.createError({ message });
+          } else {
+            return true;
+          }
+        } else {
+          return wasPreviousCheck200StreamSuccess;
         }
-        return true;
       }),
 
     dataPreviewUrlForm: Yup.string()
@@ -167,6 +185,11 @@ export const TradeForm: React.FC<TradeFormProps> = (props) => {
 
     extraAssets: Yup.string().optional().url("Extra asset URL must be a valid URL"),
 
+    donatePercentage: Yup.number()
+      .optional()
+      .min(0, "Donate percentage must be a number between 0 and 100")
+      .max(100, "Donate percentage must be a number between 0 and 100"),
+
     numberOfCopiesForm: Yup.number()
       .typeError("Number of copies must be a number.")
       .min(1, "Minimum number of copies should be 1 or greater.")
@@ -207,6 +230,7 @@ export const TradeForm: React.FC<TradeFormProps> = (props) => {
       datasetTitleForm: dataToPrefill?.additionalInformation.programName.replaceAll(" ", "") ?? "",
       datasetDescriptionForm: dataToPrefill?.additionalInformation.description ?? "",
       extraAssets: dataToPrefill?.additionalInformation.extraAssets ?? "",
+      donatePercentage: 0,
       numberOfCopiesForm: 1,
       royaltiesForm: 0,
       bondingAmount:
@@ -226,6 +250,7 @@ export const TradeForm: React.FC<TradeFormProps> = (props) => {
   const datasetTitle: string = getValues("datasetTitleForm");
   const datasetDescription: string = getValues("datasetDescriptionForm");
   const extraAssets: string = getValues("extraAssets") ?? "";
+  const donatePercentage: number = getValues("donatePercentage") ?? 0;
   const dataNFTCopies: number = getValues("numberOfCopiesForm");
   const dataNFTRoyalties: number = getValues("royaltiesForm");
   const bondingAmount: number = getValues("bondingAmount") ?? -1;
@@ -365,7 +390,7 @@ export const TradeForm: React.FC<TradeFormProps> = (props) => {
       datasetDescription,
       BigNumber(periods[0].amount).toNumber() + new BigNumber(antiSpamTax).multipliedBy(10 ** 18).toNumber(),
       Number(periods[0].lockPeriod),
-      0,
+      donatePercentage * 100,
       optionalSDKMintCallFields
     );
 
@@ -444,7 +469,7 @@ export const TradeForm: React.FC<TradeFormProps> = (props) => {
   const onSubmit = (data: TradeDataFormType) => {
     console.log(data);
     //TODO refactor this with react form hook
-  }; // here you can make logic that you want to happen on submit (used for debugging)
+  };
   return (
     <form onSubmit={handleSubmit(onSubmit)}>
       <Flex flexDirection="row">
@@ -696,6 +721,48 @@ export const TradeForm: React.FC<TradeFormProps> = (props) => {
           />
           <FormErrorMessage>{errors?.extraAssets?.message}</FormErrorMessage>
         </FormControl>
+
+        <FormControl isInvalid={!!errors.donatePercentage} minH={"8.5rem"}>
+          <Text fontWeight="bold" fontSize="md" mt={{ base: "1", md: "4" }}>
+            Donate Percentage
+          </Text>
+
+          <Controller
+            control={control}
+            render={({ field: { onChange, value } }) => (
+              <Slider
+                id="slider"
+                defaultValue={donatePercentage}
+                min={0}
+                max={userData && userData?.maxDonationPecentage / 100}
+                colorScheme="teal"
+                onChange={(v) => onChange(v)}
+                onMouseEnter={() => setShowTooltip(true)}
+                onMouseLeave={() => setShowTooltip(false)}>
+                <SliderMark value={25} mt="1" ml="-2.5" fontSize="sm">
+                  25%
+                </SliderMark>
+                <SliderMark value={50} mt="1" ml="-2.5" fontSize="sm">
+                  50%
+                </SliderMark>
+                <SliderMark value={(userData && userData?.maxDonationPecentage / 100) ?? 0} mt="1" ml="-2.5" fontSize="sm">
+                  {(userData && userData?.maxDonationPecentage / 100) ?? 0}%
+                </SliderMark>
+                <SliderTrack>
+                  <SliderFilledTrack />
+                </SliderTrack>
+                <Tooltip hasArrow bg="teal.500" color="white" placement="top" isOpen={showTooltip} label={`${value}%`}>
+                  <SliderThumb />
+                </Tooltip>
+              </Slider>
+            )}
+            name="donatePercentage"
+          />
+          <Text color="gray.400" fontSize="sm" mt={"1"}>
+            Min: 0%, Max: {userData && userData?.maxDonationPecentage / 100}%
+          </Text>
+          <FormErrorMessage>{errors?.donatePercentage?.message}</FormErrorMessage>
+        </FormControl>
       </>
 
       <>
diff --git a/src/pages/AdvertiseData/components/TradeFormModal.tsx b/src/pages/AdvertiseData/components/TradeFormModal.tsx
index 476142de..9df6adb2 100644
--- a/src/pages/AdvertiseData/components/TradeFormModal.tsx
+++ b/src/pages/AdvertiseData/components/TradeFormModal.tsx
@@ -59,7 +59,7 @@ export const TradeFormModal: React.FC<TradeFormProps> = (props) => {
       setMaxSupply(maxSupplyT);
       setAntiSpamTax(antiSpamTaxT / 10 ** 18);
     })();
-  }, []);
+  }, [isOpen]);
 
   const onClose = () => {
     setIsOpen(false);
@@ -271,6 +271,39 @@ export const TradeFormModal: React.FC<TradeFormProps> = (props) => {
             Find out how you can get whitelisted
           </Button>
         </Box>
+        <Box
+          position="absolute"
+          top="5rem"
+          bottom="0"
+          display={"flex"}
+          justifyContent={"center"}
+          alignItems={"center"}
+          flexDirection={"column"}
+          left="0"
+          right="0"
+          height="100%"
+          width="100%"
+          backgroundColor="blackAlpha.800"
+          rounded="lg"
+          visibility={userData === null || userData === undefined ? "visible" : "hidden"}
+          borderTop="solid .1rem"
+          borderColor="teal.200">
+          <Text fontSize="24px" fontWeight="500" lineHeight="38px" textAlign="center" textColor="teal.200" px="2">
+            - Fetching minting requirements failed, please refresh the page to try again. -
+          </Text>
+          <Button
+            variant="solid"
+            colorScheme="teal"
+            px={7}
+            py={6}
+            rounded="lg"
+            mt={7}
+            onClick={() => {
+              window.location.reload();
+            }}>
+            Refresh Data DEX
+          </Button>
+        </Box>
       </DrawerContent>
     </Drawer>
   );
diff --git a/src/pages/App/AppMultiversX.tsx b/src/pages/App/AppMultiversX.tsx
index 839dfb70..efa59d20 100644
--- a/src/pages/App/AppMultiversX.tsx
+++ b/src/pages/App/AppMultiversX.tsx
@@ -219,6 +219,7 @@ function App({ onShowConnectWalletModal }: { onShowConnectWalletModal: any }) {
                       <Route path="wallet/activity" element={<MyDataNFTsMx tabState={4} />} />
                       <Route path="wallet/favorite" element={<MyDataNFTsMx tabState={3} />} />
                       <Route path="wallet/bonding" element={<MyDataNFTsMx tabState={5} />} />
+                      <Route path="wallet/compensation" element={<MyDataNFTsMx tabState={6} />} />
                       <Route path="wallet/:nftId/:dataNonce" element={<MyDataNFTsMx tabState={1} />} />
                       <Route path="wallet/purchased/:nftId/:dataNonce" element={<MyDataNFTsMx tabState={2} />} />
                       <Route path="wallet/activity/:nftId/:dataNonce" element={<MyDataNFTsMx tabState={4} />} />
@@ -230,7 +231,9 @@ function App({ onShowConnectWalletModal }: { onShowConnectWalletModal: any }) {
                       <Route path="marketplace/my/:pageNumber" element={<DataNFTMarketplaceMultiversX tabState={2} />} />
                     </Route>
                     <Route path="bonding/" element={<Bonding />} />
-                    <Route path="bonding/:pageNumber" element={<Bonding />} />
+                    <Route path="bonding/:bondingPageNumber" element={<Bonding />}>
+                      <Route path="compensation/:compensationPageNumber" element={<Bonding />} />
+                    </Route>
                     <Route path="settings" element={<AppSettings />} />
                   </Routes>
                 </AuthenticatedRoutesWrapper>
diff --git a/src/pages/App/ModalAuthPickerMultiversX.tsx b/src/pages/App/ModalAuthPickerMultiversX.tsx
index 8dc8aef1..e9687f64 100644
--- a/src/pages/App/ModalAuthPickerMultiversX.tsx
+++ b/src/pages/App/ModalAuthPickerMultiversX.tsx
@@ -16,6 +16,7 @@ import {
   useDisclosure,
   WrapItem,
   useBreakpointValue,
+  useColorMode,
 } from "@chakra-ui/react";
 import { useGetNetworkConfig } from "@multiversx/sdk-dapp/hooks";
 import { useGetAccountInfo } from "@multiversx/sdk-dapp/hooks/account";
@@ -36,6 +37,7 @@ function ModalAuthPickerMx({ resetLaunchMode }: { resetLaunchMode: any }) {
   const [, setWalletUsedSession] = useLocalStorage("itm-wallet-used", null);
   const { pathname } = useLocation();
   const navigate = useNavigate();
+  const { colorMode } = useColorMode();
 
   useEffect(() => {
     async function cleanOutRemoteXPortalAppWalletDisconnect() {
@@ -81,7 +83,7 @@ function ModalAuthPickerMx({ resetLaunchMode }: { resetLaunchMode: any }) {
 
   const nativeAuthProps: NativeAuthConfigType = {
     apiAddress: `https://${getApi(chainID)}`,
-    // origin: window.location.origin,
+    // origin: "https://test.datadex.itheum.io",
     expirySeconds: 3600,
   };
   const commonProps = {
@@ -96,7 +98,7 @@ function ModalAuthPickerMx({ resetLaunchMode }: { resetLaunchMode: any }) {
       {!mxAddress && isProgressModalOpen && (
         <Modal isCentered size={modelSize} isOpen={isProgressModalOpen} onClose={handleProgressModalClose} closeOnEsc={false} closeOnOverlayClick={false}>
           <ModalOverlay backdropFilter="blur(10px)" />
-          <ModalContent>
+          <ModalContent bgColor={colorMode === "dark" ? "#181818" : "bgWhite"}>
             <ModalCloseButton />
             <ModalHeader mt={5}>
               Select a{" "}
diff --git a/src/pages/Bonding/Bonding.tsx b/src/pages/Bonding/Bonding.tsx
index 6ff529b4..869ae988 100644
--- a/src/pages/Bonding/Bonding.tsx
+++ b/src/pages/Bonding/Bonding.tsx
@@ -1,6 +1,6 @@
 import React, { Fragment, useEffect, useState } from "react";
 import { Box, Flex, Text } from "@chakra-ui/react";
-import { Bond, BondContract, DataNft } from "@itheum/sdk-mx-data-nft/out";
+import { Bond, BondContract, Compensation, DataNft } from "@itheum/sdk-mx-data-nft/out";
 import { useGetAccountInfo } from "@multiversx/sdk-dapp/hooks";
 import { useGetPendingTransactions } from "@multiversx/sdk-dapp/hooks/transactions";
 import BigNumber from "bignumber.js";
@@ -11,6 +11,12 @@ import { IS_DEVNET } from "libs/config";
 import { BondingParameters } from "./components/BondingParameters";
 import { CollectionDashboard } from "./components/CollectionDashboard";
 import { NoDataHere } from "../../components/Sections/NoDataHere";
+import { CompensationDashboard } from "./components/CompensationDashboard";
+
+type CompensationNftsType = {
+  nonce: number;
+  tokenIdentifier: string;
+};
 
 export const Bonding: React.FC = () => {
   const { address } = useGetAccountInfo();
@@ -20,23 +26,38 @@ export const Bonding: React.FC = () => {
   const bondContract = new BondContract(IS_DEVNET ? "devnet" : "mainnet");
   DataNft.setNetworkConfig(IS_DEVNET ? "devnet" : "mainnet");
   const [bondingDataNfts, setBondingDataNfts] = useState<Array<DataNft>>([]);
+  const [compensationDataNfts, setCompensationDataNfts] = useState<Array<DataNft>>([]);
   const [contractBonds, setContractBonds] = useState<Bond[]>([]);
   const [totalAmountBondedForThisPage, setTotalAmountBondedForThisPage] = useState<number>(0);
+  const [allCompensation, setAllCompensation] = useState<Compensation[]>([]);
   const navigate = useNavigate();
 
   // pagination
-  const [pageCount, setPageCount] = useState(0);
+  const [bondingPageCount, setBondingPageCount] = useState(0);
+  const [compensationPageCount, setCompensationPageCount] = useState(0);
   const pageSize = 8;
-  const { pageNumber } = useParams();
-  const pageIndex = pageNumber ? Number(pageNumber) : 0;
+  const { bondingPageNumber, compensationPageNumber } = useParams();
+  const bondingPageIndex = bondingPageNumber ? Number(bondingPageNumber) : 0;
+  const compensationPageIndex = compensationPageNumber ? Number(compensationPageNumber) : 0;
 
-  const setPageIndex = (newPageIndex: number) => {
-    navigate(`/bonding${newPageIndex > 0 ? "/" + newPageIndex : ""}`);
+  const setPageIndexBonding = (newPageIndex: number) => {
+    navigate(`/bonding${newPageIndex > 0 ? "/" + newPageIndex : "/" + 0}/compensation/${compensationPageIndex}`);
   };
 
-  const onGotoPage = useThrottle((newPageIndex: number) => {
-    if (0 <= newPageIndex && newPageIndex < pageCount) {
-      setPageIndex(newPageIndex);
+  const setPageIndexCompensation = (newPageIndex: number) => {
+    navigate(`/bonding/${bondingPageIndex}/compensation${newPageIndex > 0 ? "/" + newPageIndex : "/" + 0}`);
+  };
+
+  const onGotoPageBonding = useThrottle((newPageIndex: number) => {
+    if (0 <= newPageIndex && newPageIndex < bondingPageCount) {
+      setPageIndexBonding(newPageIndex);
+    }
+  });
+
+  const onGotoPageCompensation = useThrottle((newPageIndex: number) => {
+    console.log("newPageIndex", newPageIndex);
+    if (0 <= newPageIndex && newPageIndex < compensationPageCount) {
+      setPageIndexCompensation(newPageIndex);
     }
   });
 
@@ -50,26 +71,55 @@ export const Bonding: React.FC = () => {
   useEffect(() => {
     (async () => {
       const totalNumberOfBonds = await bondContract.viewTotalBonds();
-      setPageCount(Math.ceil(totalNumberOfBonds / pageSize));
+      setBondingPageCount(Math.ceil(totalNumberOfBonds / pageSize));
     })();
   }, []);
 
   useEffect(() => {
     (async () => {
-      const pagedBonds = await bondContract.viewPagedBonds(pageIndex * pageSize, (pageIndex + 1) * pageSize - 1);
+      const totalNumberOfCompensation = await bondContract.viewTotalCompensations();
+      console.log("totalNumberOfCompensation", totalNumberOfCompensation);
+      setCompensationPageCount(Math.ceil(totalNumberOfCompensation / pageSize));
+    })();
+  }, []);
+
+  useEffect(() => {
+    (async () => {
+      const pagedBonds = await bondContract.viewPagedBonds(bondingPageIndex * pageSize, (bondingPageIndex + 1) * pageSize - 1);
       let _totalAmountBondedForThisPage = 0;
       pagedBonds.forEach((bond) => {
         _totalAmountBondedForThisPage += BigNumber(bond.bondAmount)
           .dividedBy(10 ** 18)
           .toNumber();
       });
-      setTotalAmountBondedForThisPage(_totalAmountBondedForThisPage);
-      setContractBonds(pagedBonds.reverse());
 
       const dataNfts: DataNft[] = await DataNft.createManyFromApi(pagedBonds.map((bond) => ({ nonce: bond.nonce, tokenIdentifier: bond.tokenIdentifier })));
+      setTotalAmountBondedForThisPage(_totalAmountBondedForThisPage);
+      setContractBonds(pagedBonds);
+      // console.log(pagedBonds, dataNfts);
       setBondingDataNfts(dataNfts);
     })();
-  }, [hasPendingTransactions, pageIndex]);
+  }, [hasPendingTransactions, bondingPageIndex]);
+
+  useEffect(() => {
+    (async () => {
+      const itemsForCompensation: Array<CompensationNftsType> = [];
+      const _contractBonds = await bondContract.viewAllBonds();
+      _contractBonds.map((bond) => {
+        itemsForCompensation.push({ nonce: bond.nonce, tokenIdentifier: bond.tokenIdentifier });
+      });
+      if (_contractBonds.length === 0) {
+        return;
+      }
+      const pagedCompensation = await bondContract.viewPagedCompensations(compensationPageIndex * pageSize, (compensationPageIndex + 1) * pageSize - 1);
+      const dataNfts: DataNft[] = await DataNft.createManyFromApi(
+        pagedCompensation.map((bond) => ({ nonce: bond.nonce, tokenIdentifier: bond.tokenIdentifier }))
+      );
+      setCompensationDataNfts(dataNfts.reverse());
+      console.log(pagedCompensation, dataNfts);
+      setAllCompensation(pagedCompensation);
+    })();
+  }, [hasPendingTransactions, compensationPageIndex]);
 
   return (
     <>
@@ -94,7 +144,7 @@ export const Bonding: React.FC = () => {
               </Flex>
             </Flex>
           </Box>
-          <Box border="1px solid" borderColor="#00C79740" rounded="3xl" px={10} py={5} bg="#1b1b1b50" mb={10}>
+          <Box border="1px solid" borderColor="#00C79740" rounded="3xl" px={10} py={5} bg="#1b1b1b50" overflowY="scroll" h="70rem" mb={10}>
             <Flex justifyContent="space-between" alignItems="center" px={10}>
               <Flex flexDirection="column" justifyContent="center" w="full" gap={5}>
                 <Flex flexDirection="row" justifyContent="space-between">
@@ -103,7 +153,12 @@ export const Bonding: React.FC = () => {
                   </Text>{" "}
                   {contractBonds.length > 0 && (
                     <Flex justifyContent={{ base: "center", md: "center" }} py="5">
-                      <CustomPagination pageCount={pageCount} pageIndex={pageIndex} gotoPage={onGotoPage} disabled={hasPendingTransactions} />
+                      <CustomPagination
+                        pageCount={bondingPageCount}
+                        pageIndex={bondingPageIndex}
+                        gotoPage={onGotoPageBonding}
+                        disabled={hasPendingTransactions}
+                      />
                     </Flex>
                   )}
                 </Flex>
@@ -111,19 +166,56 @@ export const Bonding: React.FC = () => {
                   <NoDataHere />
                 ) : (
                   contractBonds.map((bond, index) => (
-                    <Fragment key={index}>
+                    <Fragment key={bond.bondId}>
                       <CollectionDashboard bondNft={bond} bondDataNft={bondingDataNfts} />
                     </Fragment>
                   ))
                 )}
+
                 {contractBonds.length > 0 && (
                   <Flex justifyContent={{ base: "center", md: "center" }} py="5">
-                    <CustomPagination pageCount={pageCount} pageIndex={pageIndex} gotoPage={onGotoPage} disabled={hasPendingTransactions} />
+                    <CustomPagination
+                      pageCount={bondingPageCount}
+                      pageIndex={bondingPageIndex}
+                      gotoPage={onGotoPageBonding}
+                      disabled={hasPendingTransactions}
+                    />
                   </Flex>
                 )}
               </Flex>
             </Flex>
           </Box>
+          <Box border="1px solid" borderColor="#00C79740" rounded="3xl" px={10} py={5} bg="#1b1b1b50" overflowY="scroll" h="70rem" mb={10}>
+            <Flex justifyContent="space-between" alignItems="center" px={10}>
+              <Flex flexDirection="column" justifyContent="center" w="full">
+                <Text fontSize="1.75rem" fontFamily="Clash-Medium" textColor="teal.200">
+                  Compensation Module
+                </Text>
+                <Text fontSize="1.5rem" fontFamily="Clash-Regular" textColor="teal.200">
+                  Slashes and Penalties
+                </Text>
+                {allCompensation.length > 0 && (
+                  <Flex justifyContent={{ base: "center", md: "center" }} py="5">
+                    <CustomPagination
+                      pageCount={compensationPageCount}
+                      pageIndex={compensationPageIndex}
+                      gotoPage={onGotoPageCompensation}
+                      disabled={hasPendingTransactions}
+                    />
+                  </Flex>
+                )}
+                {allCompensation.length === 0 ? (
+                  <NoDataHere />
+                ) : (
+                  allCompensation.map((compensation, index) => (
+                    <Fragment key={compensation.compensationId}>
+                      <CompensationDashboard compensationBondNft={compensation} bondDataNft={compensationDataNfts} />
+                    </Fragment>
+                  ))
+                )}
+              </Flex>
+            </Flex>
+          </Box>
         </Flex>
       ) : (
         navigate("/")
diff --git a/src/pages/Bonding/components/BlacklistModal.tsx b/src/pages/Bonding/components/BlacklistModal.tsx
new file mode 100644
index 00000000..33af8ec7
--- /dev/null
+++ b/src/pages/Bonding/components/BlacklistModal.tsx
@@ -0,0 +1,55 @@
+import React, { useEffect } from "react";
+import { Flex, Modal, ModalBody, ModalCloseButton, ModalContent, ModalHeader, ModalOverlay, Text, useColorMode } from "@chakra-ui/react";
+import { BondContract } from "@itheum/sdk-mx-data-nft/out";
+import { IS_DEVNET } from "../../../libs/config";
+
+type BlacklistModalProps = {
+  isModalOpen: boolean;
+  onModalClose: () => void;
+  compensationId: number;
+};
+
+export const BlacklistModal: React.FC<BlacklistModalProps> = (props) => {
+  const { isModalOpen, onModalClose, compensationId } = props;
+  const { colorMode } = useColorMode();
+  const [blacklistAddresses, setBlacklistAddresses] = React.useState<Array<string>>([]);
+  const bondContract = new BondContract(IS_DEVNET ? "devnet" : "mainnet");
+
+  const handleBlacklistModalClose = () => {
+    onModalClose();
+  };
+
+  useEffect(() => {
+    (async () => {
+      if (!isModalOpen) return;
+      const data = await bondContract.viewCompensationBlacklist(compensationId);
+      setBlacklistAddresses(data);
+    })();
+  }, [isModalOpen]);
+
+  return (
+    <>
+      {isModalOpen && (
+        <Modal isCentered size="3xl" isOpen={isModalOpen} onClose={handleBlacklistModalClose} closeOnEsc={false} closeOnOverlayClick={false}>
+          <ModalOverlay backdropFilter="blur(10px)" />
+          <ModalContent bgColor={colorMode === "dark" ? "#181818" : "bgWhite"}>
+            <ModalCloseButton />
+            <ModalHeader mt={5}>Blacklist Addresses</ModalHeader>
+            <ModalBody pb={6}>
+              <Text fontSize="xl" fontWeight="700" color="teal.200">
+                Addresses
+              </Text>
+              {blacklistAddresses.map((address, index) => (
+                <Flex key={index} gap={2}>
+                  <Text>
+                    {index + 1}. {address.substring(0, 7)}...{address.substring(address.length, address.length - 7)}
+                  </Text>
+                </Flex>
+              ))}
+            </ModalBody>
+          </ModalContent>
+        </Modal>
+      )}
+    </>
+  );
+};
diff --git a/src/pages/Bonding/components/BondingParameters.tsx b/src/pages/Bonding/components/BondingParameters.tsx
index d9c6caf6..06933495 100644
--- a/src/pages/Bonding/components/BondingParameters.tsx
+++ b/src/pages/Bonding/components/BondingParameters.tsx
@@ -21,15 +21,15 @@ import { yupResolver } from "@hookform/resolvers/yup";
 import { BondConfiguration, BondContract, State } from "@itheum/sdk-mx-data-nft/out";
 import { Address } from "@multiversx/sdk-core/out";
 import { useGetAccountInfo } from "@multiversx/sdk-dapp/hooks";
+import { useGetLoginInfo } from "@multiversx/sdk-dapp/hooks/account";
 import { useGetPendingTransactions } from "@multiversx/sdk-dapp/hooks/transactions";
 import { sendTransactions } from "@multiversx/sdk-dapp/services";
+import { ProposalDeepLinkBuilder } from "@peerme/sdk";
 import BigNumber from "bignumber.js";
 import { Controller, useForm } from "react-hook-form";
 import { AiFillPauseCircle, AiFillPlayCircle } from "react-icons/ai";
 import * as Yup from "yup";
 import { IS_DEVNET, PEERME_TEAM_NAME } from "libs/config";
-import { useGetLoginInfo } from "@multiversx/sdk-dapp/hooks/account";
-import { ProposalDeepLinkBuilder } from "@peerme/sdk";
 import { timeUntil } from "../../../libs/utils";
 
 type BondingParametersFormType = {
diff --git a/src/pages/Bonding/components/CollectionDashboard.tsx b/src/pages/Bonding/components/CollectionDashboard.tsx
index 9313f6d0..39313c13 100644
--- a/src/pages/Bonding/components/CollectionDashboard.tsx
+++ b/src/pages/Bonding/components/CollectionDashboard.tsx
@@ -71,14 +71,9 @@ export const CollectionDashboard: React.FC<CollectionDashboardProps> = (props) =
     handleSubmit,
     watch,
   } = useForm<CollectionDashboardFormType>({
-    defaultValues: {
-      enforceMinimumPenalty: 5,
-      endTimestampOfBond: "10",
-    },
     mode: "onChange",
     resolver: yupResolver(validationSchema),
   });
-
   const enforceMinimumPenalty = watch("enforceMinimumPenalty");
   const endTimestampOfBond = watch("endTimestampOfBond");
 
@@ -118,20 +113,22 @@ export const CollectionDashboard: React.FC<CollectionDashboardProps> = (props) =
       transactions: [tx],
     });
   };
-
   return (
     <Flex flexDirection="column" w="full" gap={5}>
       <Flex flexDirection="row" w="full" gap={5} justifyContent="space-between">
         <Box>
-          {bondDataNft.map((dataNft, index) => {
-            if (dataNft.tokenIdentifier === createTokenIdentifier(bondNft.tokenIdentifier, bondNft.nonce)) {
+          {bondDataNft
+            .filter((dataNft) => dataNft.tokenIdentifier === createTokenIdentifier(bondNft.tokenIdentifier, bondNft.nonce))
+            .map((dataNft, index) => {
               return (
-                <Text fontSize="1.5rem" key={index}>
-                  {dataNft.tokenName}
-                </Text>
+                <div key={dataNft.tokenIdentifier}>
+                  <Text fontSize="1.6rem">{dataNft.tokenName}</Text>
+                  <Text fontSize="0.8rem">
+                    Title: {dataNft.title} | Nonce: {dataNft.nonce}
+                  </Text>
+                </div>
               );
-            }
-          })}
+            })}
           <Flex flexDirection="row" gap={4}>
             <Text fontSize=".75rem" textColor="teal.200">
               {BigNumber(bondNft.bondAmount)
@@ -172,6 +169,7 @@ export const CollectionDashboard: React.FC<CollectionDashboardProps> = (props) =
                               mt="1 !important"
                               id="enforceMinimumPenalty"
                               w="25%"
+                              defaultValue={5}
                               onChange={(event) => {
                                 onChange(event.target.value);
                               }}
@@ -180,7 +178,6 @@ export const CollectionDashboard: React.FC<CollectionDashboardProps> = (props) =
                           name={"enforceMinimumPenalty"}
                         />
                         <FormErrorMessage>{errors?.enforceMinimumPenalty?.message}</FormErrorMessage>
-
                         <Text fontSize="1.1rem">%</Text>
                         <Button colorScheme="pink" type="submit">
                           Penalize
@@ -235,6 +232,7 @@ export const CollectionDashboard: React.FC<CollectionDashboardProps> = (props) =
                             id="endTimestampOfBond"
                             type="datetime-local"
                             w="70%"
+                            defaultValue={new Date(new Date().getTime() + new Date().getTimezoneOffset() * -60 * 1000).toISOString().slice(0, 16)}
                             onChange={(event) => {
                               onChange(event.target.value);
                             }}
@@ -248,6 +246,12 @@ export const CollectionDashboard: React.FC<CollectionDashboardProps> = (props) =
                         GO!
                       </Button>
                     </Flex>
+                    {allCompensation.endDate > 0 && (
+                      <Text marginTop={1} fontSize="0.6rem">
+                        Current end date:{" "}
+                        {new Date(allCompensation.endDate * 1000 + new Date().getTimezoneOffset() * -60 * 1000).toISOString().slice(0, 16).replace("T", " ")}
+                      </Text>
+                    )}
                   </FormControl>
                 </form>
               </Flex>
diff --git a/src/pages/Bonding/components/CompensationDashboard.tsx b/src/pages/Bonding/components/CompensationDashboard.tsx
new file mode 100644
index 00000000..07749b48
--- /dev/null
+++ b/src/pages/Bonding/components/CompensationDashboard.tsx
@@ -0,0 +1,221 @@
+import React, { useEffect } from "react";
+import { Box, Button, Flex, FormControl, FormErrorMessage, Input, Text } from "@chakra-ui/react";
+import { yupResolver } from "@hookform/resolvers/yup";
+import { BondContract, Compensation, createTokenIdentifier, DataNft } from "@itheum/sdk-mx-data-nft/out";
+import { Address } from "@multiversx/sdk-core/out";
+import { useGetAccountInfo } from "@multiversx/sdk-dapp/hooks";
+import { sendTransactions } from "@multiversx/sdk-dapp/services";
+import BigNumber from "bignumber.js";
+import { Controller, useForm } from "react-hook-form";
+import * as Yup from "yup";
+import { BlacklistModal } from "./BlacklistModal";
+import { ProposalButton } from "../../../components/ProposalButton";
+import ShortAddress from "../../../components/UtilComps/ShortAddress";
+import { IS_DEVNET } from "../../../libs/config";
+
+type CompensationDashboardProps = {
+  compensationBondNft: Compensation;
+  bondDataNft: Array<DataNft>;
+};
+
+type CompensationDashboardFormType = {
+  compensationEndDate: Date;
+  blacklistAddresses: string;
+};
+
+export const CompensationDashboard: React.FC<CompensationDashboardProps> = (props) => {
+  const { compensationBondNft, bondDataNft } = props;
+  const { address } = useGetAccountInfo();
+  const bondContract = new BondContract(IS_DEVNET ? "devnet" : "mainnet");
+  const isMultiSig = import.meta.env.VITE_MULTISIG_STATE;
+  const [isModalOpen, setIsModalOpen] = React.useState(false);
+  const [addressRefund, setAddressRefund] = React.useState<Record<any, any>>({});
+
+  const validationSchema = Yup.object().shape({
+    compensationEndDate: Yup.date().required("Required"),
+    blacklistAddresses: Yup.string().required("Required"),
+  });
+
+  const {
+    control,
+    formState: { errors },
+    handleSubmit,
+    watch,
+  } = useForm<CompensationDashboardFormType>({
+    defaultValues: {
+      compensationEndDate: new Date(),
+      blacklistAddresses: "erd",
+    },
+    mode: "onChange",
+    resolver: yupResolver(validationSchema),
+  });
+
+  const compensationEndDate = watch("compensationEndDate");
+  const blacklistAddresses = watch("blacklistAddresses");
+
+  useEffect(() => {
+    (async () => {
+      if (compensationBondNft.endDate === 0) return;
+      const data = await bondContract.viewAddressRefund(new Address(address), compensationBondNft.tokenIdentifier, compensationBondNft.nonce);
+      setAddressRefund(data);
+    })();
+  }, []);
+
+  const handleInitiateRefund = async (tokenIdentifier: string, nonce: number, timestamp: Date) => {
+    const timestampDate = new Date(timestamp).getTime() / 1000;
+    const tx = bondContract.initiateRefund(new Address(address), tokenIdentifier, nonce, timestampDate);
+    await sendTransactions({
+      transactions: [tx],
+    });
+  };
+
+  const handleInitiateBlacklistLoad = async (compensationId: number, addresses: string) => {
+    const splittedAddresses = addresses.split(",").map((addressModified: string) => new Address(addressModified.trim()));
+
+    const tx = bondContract.setBlacklist(new Address(address), compensationId, splittedAddresses);
+    await sendTransactions({
+      transactions: [tx],
+    });
+  };
+
+  const handleOpenBlacklistModal = () => {
+    setIsModalOpen(!isModalOpen);
+  };
+
+  return (
+    <Flex flexDirection="column" w="full" gap={5}>
+      <Flex flexDirection="row" gap={5}>
+        <Box w="full">
+          {bondDataNft.map((dataNft, index) => {
+            if (dataNft.tokenIdentifier === createTokenIdentifier(compensationBondNft.tokenIdentifier, compensationBondNft.nonce)) {
+              return (
+                <Flex flexDirection="column" key={dataNft.tokenIdentifier}>
+                  <Flex justifyContent="space-between" py={10}>
+                    <Flex flexDirection="column" w="50%">
+                      <Text fontSize="1.5rem">{dataNft.tokenName}</Text>
+                      <Text fontSize="0.8rem">
+                        Title: {dataNft.title} | Nonce: {dataNft.nonce}
+                      </Text>
+                      <Text fontSize="0.8rem">
+                        Creator: <ShortAddress address={dataNft.creator} fontSize="1.1rem" />
+                      </Text>
+                      {compensationBondNft.endDate * 1000 === 0 ? (
+                        <></>
+                      ) : (
+                        <>
+                          {new Date().getTime() < new Date(compensationBondNft.endDate).getTime() ? (
+                            <Text fontSize="1.4rem" fontWeight="600" textColor="indianred">
+                              {BigNumber(compensationBondNft.accumulatedAmount)
+                                .dividedBy(10 ** 18)
+                                .toNumber()}{" "}
+                              $ITHEUM Penalties can be claimed
+                            </Text>
+                          ) : (
+                            <Text fontSize="1.4rem" fontWeight="600" textColor="teal.200">
+                              Compensation claiming is live
+                            </Text>
+                          )}
+                        </>
+                      )}
+                    </Flex>
+                    <Flex flexDirection="column" w="50%">
+                      <Text fontSize="1.35rem" fontWeight="600" pb={2}>
+                        Compensation End Date:{" "}
+                        {compensationBondNft.endDate * 1000 !== 0 ? new Date(compensationBondNft.endDate * 1000).toDateString() : "Not Set"}
+                      </Text>
+                      <form onSubmit={handleSubmit(() => handleInitiateRefund(dataNft.collection, dataNft.nonce, compensationEndDate))}>
+                        <FormControl isInvalid={!!errors.compensationEndDate} isRequired minH={"3.5rem"}>
+                          <Flex flexDirection="row" alignItems="center" gap={3}>
+                            <Controller
+                              control={control}
+                              render={({ field: { onChange } }) => (
+                                <Input
+                                  mt="1 !important"
+                                  id="compensationEndDate"
+                                  type="datetime-local"
+                                  w="40%"
+                                  onChange={(event) => {
+                                    onChange(event.target.value);
+                                  }}
+                                />
+                              )}
+                              name={"compensationEndDate"}
+                            />
+                            <FormErrorMessage>{errors?.compensationEndDate?.message}</FormErrorMessage>
+                            {isMultiSig === "false" ? (
+                              <Button colorScheme="teal" type="submit">
+                                Set
+                              </Button>
+                            ) : (
+                              <ProposalButton
+                                proposalTitle={"Set Compensation End Data"}
+                                proposalDescription={`This is a propose to change the Compensation Date to ${new Date(compensationEndDate).toDateString()}`}
+                                contractAddress={bondContract.getContractAddress().bech32()}
+                                endpoint={"initiateRefund"}
+                                proposalArguments={[dataNft.tokenIdentifier, dataNft.nonce, new Date(compensationEndDate).getTime() / 1000]}
+                              />
+                            )}
+                          </Flex>
+                        </FormControl>
+                      </form>
+                      <Text fontSize="1.20rem" fontWeight="600">
+                        Deposited Data NFT&apos;s for Claiming Compensation
+                      </Text>
+                      <Flex alignItems="center" gap={6} pt={3} w="full">
+                        <img src={dataNft.nftImgUrl} width="15%" />
+                        <Flex flexDirection="column" w="full">
+                          {addressRefund && addressRefund.refund?.compensationId === compensationBondNft.compensationId ? (
+                            <Flex gap={1} h="5rem" overflowY="scroll">
+                              <Text>
+                                Depositor: <ShortAddress address={addressRefund.refund.address} fontSize="1rem" /> |
+                              </Text>
+                              <Text>Amount: {addressRefund.refund.proofOfRefund.amount} </Text>
+                            </Flex>
+                          ) : (
+                            <></>
+                          )}
+                        </Flex>
+                      </Flex>
+                      <Text fontSize="1.20rem" fontWeight="600" pt={3}>
+                        Blacklist Load Window
+                      </Text>
+                      <form onSubmit={handleSubmit(() => handleInitiateBlacklistLoad(compensationBondNft.compensationId, blacklistAddresses))}>
+                        <FormControl isInvalid={!!errors.blacklistAddresses} isRequired minH={"3.5rem"}>
+                          <Flex flexDirection="row" alignItems="center" gap={3}>
+                            <Controller
+                              control={control}
+                              render={({ field: { onChange } }) => (
+                                <Input
+                                  mt="1 !important"
+                                  id="blacklistAddresses"
+                                  type="text"
+                                  w="40%"
+                                  onChange={(event) => {
+                                    onChange(event.target.value);
+                                  }}
+                                />
+                              )}
+                              name={"blacklistAddresses"}
+                            />
+                            <Button colorScheme="teal" type="submit">
+                              Load
+                            </Button>
+                            <Button colorScheme="teal" variant="outline" onClick={handleOpenBlacklistModal}>
+                              View Blacklist
+                            </Button>
+                          </Flex>
+                          <FormErrorMessage>{errors?.blacklistAddresses?.message}</FormErrorMessage>
+                        </FormControl>
+                      </form>
+                    </Flex>
+                  </Flex>
+                  <BlacklistModal isModalOpen={isModalOpen} onModalClose={handleOpenBlacklistModal} compensationId={compensationBondNft.compensationId} />
+                </Flex>
+              );
+            }
+          })}
+        </Box>
+      </Flex>
+    </Flex>
+  );
+};
diff --git a/src/pages/DataNFT/DataNFTDetails.tsx b/src/pages/DataNFT/DataNFTDetails.tsx
index 81b09137..b585f7f7 100644
--- a/src/pages/DataNFT/DataNFTDetails.tsx
+++ b/src/pages/DataNFT/DataNFTDetails.tsx
@@ -49,6 +49,7 @@ import { getFavoritesFromBackendApi, getOffersByIdAndNoncesFromBackendApi } from
 import { getApi } from "libs/MultiversX/api";
 import { DataNftMarketContract } from "libs/MultiversX/dataNftMarket";
 import {
+  computeMaxBuyForOfferForAddress,
   convertToLocalString,
   convertWeiToEsdt,
   getTokenWantedRepresentation,
@@ -105,8 +106,13 @@ export default function DataNFTDetails(props: DataNFTDetailsProps) {
   const walletDrawer = "/datanfts/wallet";
   const { pathname } = useLocation();
   const [favouriteItems, setFavouriteItems] = React.useState<Array<string>>([]);
-  const maxBuyLimit = import.meta.env.VITE_MAX_BUY_LIMIT_PER_SFT ? Number(import.meta.env.VITE_MAX_BUY_LIMIT_PER_SFT) : 0;
-  const maxBuyNumber = offer && maxBuyLimit > 0 ? Math.min(maxBuyLimit, offer.quantity) : offer?.quantity;
+  const maxBuyPerTransaction = import.meta.env.VITE_MAX_BUY_LIMIT_PER_SFT ? Number(import.meta.env.VITE_MAX_BUY_LIMIT_PER_SFT) : 0;
+  const maxBuyPerAddress = offer ? offer.maxQuantityPerAddress : 0;
+  const boughtByAddressAlreadyForThisOffer =
+    useMarketStore((state) => state.addressBoughtOffers).find((boughtOffer) => boughtOffer.offerId === (offer ? offer.index : -1))?.quantity ?? 0;
+
+  const maxBuyForOfferForAddress = computeMaxBuyForOfferForAddress(offer, maxBuyPerTransaction, maxBuyPerAddress, boughtByAddressAlreadyForThisOffer);
+
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   const [searchParams, setSearchParams] = useSearchParams();
 
@@ -298,6 +304,8 @@ export default function DataNFTDetails(props: DataNFTDetailsProps) {
     return nftData.creator === offer?.owner;
   };
 
+  const parsedCreationTime = moment(nftData.creationTime);
+
   return (
     <Box mx={tokenIdParam ? { base: "5 !important", xl: "28 !important" } : 0}>
       {!isLoadingNftData() ? (
@@ -398,7 +406,7 @@ export default function DataNFTDetails(props: DataNFTDetailsProps) {
                               maxW={24}
                               step={1}
                               min={1}
-                              max={maxBuyNumber}
+                              max={maxBuyForOfferForAddress}
                               isValidCharacter={isValidNumericCharacter}
                               value={amount}
                               defaultValue={1}
@@ -409,8 +417,10 @@ export default function DataNFTDetails(props: DataNFTDetailsProps) {
                                   error = "Cannot be zero or negative";
                                 } else if (value > offer.quantity) {
                                   error = "Cannot exceed balance";
-                                } else if (maxBuyLimit > 0 && value > maxBuyLimit) {
+                                } else if (maxBuyPerTransaction > 0 && value > maxBuyPerTransaction) {
                                   error = "Cannot exceed max buy limit";
+                                } else if (maxBuyPerAddress > 0 && value > maxBuyPerAddress) {
+                                  error = "Cannot exceed max buy limit per address";
                                 }
                                 setAmountError(error);
                                 setAmount(value);
@@ -631,9 +641,12 @@ export default function DataNFTDetails(props: DataNFTDetailsProps) {
                             </Box>
                           )}
                           <Box display="flex" justifyContent="flex-start" pb="14px">
-                            <Text color={colorMode === "dark" ? "white" : "black"} fontSize="lg" fontWeight="light">{`Creation time: ${moment(
-                              nftData.creationTime
-                            ).format(uxConfig.dateStr)}`}</Text>
+                            {parsedCreationTime.isValid() && (
+                              <Text
+                                color={colorMode === "dark" ? "white" : "black"}
+                                fontSize="lg"
+                                fontWeight="light">{`Creation time: ${parsedCreationTime.format(uxConfig.dateStr)}`}</Text>
+                            )}
                           </Box>
                         </Flex>
                       </Flex>
diff --git a/src/pages/DataNFT/DataNFTMarketplaceMultiversX.tsx b/src/pages/DataNFT/DataNFTMarketplaceMultiversX.tsx
index 2a63a3d1..dc6bfec6 100644
--- a/src/pages/DataNFT/DataNFTMarketplaceMultiversX.tsx
+++ b/src/pages/DataNFT/DataNFTMarketplaceMultiversX.tsx
@@ -26,7 +26,7 @@ import {
   useToast,
 } from "@chakra-ui/react";
 import { DataNft, Offer } from "@itheum/sdk-mx-data-nft/out";
-import { TransactionWatcher } from "@multiversx/sdk-core/out";
+import { Address, TransactionWatcher } from "@multiversx/sdk-core/out";
 import { useGetNetworkConfig } from "@multiversx/sdk-dapp/hooks";
 import { useGetAccountInfo, useGetLoginInfo } from "@multiversx/sdk-dapp/hooks/account";
 import { useGetPendingTransactions } from "@multiversx/sdk-dapp/hooks/transactions";
@@ -183,7 +183,7 @@ export const Marketplace: FC<PropsType> = ({ tabState }) => {
       if (isApiUp && isMarketplaceApiUp) {
         _offers = await getOffersFromBackendApi(chainID, start, pageSize, tabState === 1 ? undefined : address);
       } else {
-        _offers = await marketContract.viewPagedOffers(start, start + pageSize - 1, tabState === 1 ? "" : address);
+        _offers = await marketContract.viewPagedOffers(start, start + pageSize - 1, tabState === 1 ? undefined : new Address(address));
       }
       const settingExtendOffer = await getBondsForOffers(_offers);
 
diff --git a/src/pages/DataNFT/MyDataNFTsMultiversX.tsx b/src/pages/DataNFT/MyDataNFTsMultiversX.tsx
index 2a2c15db..89828d4e 100644
--- a/src/pages/DataNFT/MyDataNFTsMultiversX.tsx
+++ b/src/pages/DataNFT/MyDataNFTsMultiversX.tsx
@@ -26,7 +26,7 @@ import { useGetNetworkConfig } from "@multiversx/sdk-dapp/hooks";
 import { useGetAccountInfo } from "@multiversx/sdk-dapp/hooks/account";
 import { useGetPendingTransactions } from "@multiversx/sdk-dapp/hooks/transactions";
 import { BsClockHistory } from "react-icons/bs";
-import { FaBrush } from "react-icons/fa";
+import { FaBrush, FaCoins } from "react-icons/fa";
 import { MdFavoriteBorder, MdLockOutline, MdOutlineShoppingBag } from "react-icons/md";
 import { useNavigate } from "react-router-dom";
 import { NoDataHere } from "components/Sections/NoDataHere";
@@ -39,6 +39,7 @@ import DataNFTDetails from "./DataNFTDetails";
 import { useMarketStore } from "store";
 import { FavoriteCards } from "./components/FavoriteCards";
 import { BondingCards } from "./components/BondingCards";
+import { CompensationCards } from "./components/CompensationCards";
 
 export default function MyDataNFTsMx({ tabState }: { tabState: number }) {
   const { colorMode } = useColorMode();
@@ -60,7 +61,7 @@ export default function MyDataNFTsMx({ tabState }: { tabState: number }) {
 
   const onChangeTab = useThrottle((newTabState: number) => {
     navigate(
-      `/datanfts/wallet${newTabState === 2 ? "/purchased" : newTabState === 4 ? "/activity" : newTabState === 3 ? "/favorite" : newTabState === 5 ? "/bonding" : ""}`
+      `/datanfts/wallet${newTabState === 2 ? "/purchased" : newTabState === 4 ? "/activity" : newTabState === 3 ? "/favorite" : newTabState === 5 ? "/bonding" : newTabState === 6 ? "/compensation" : ""}`
     );
   }, /* delay: */ 500);
 
@@ -92,6 +93,11 @@ export default function MyDataNFTsMx({ tabState }: { tabState: number }) {
       icon: MdLockOutline,
       isDisabled: false,
     },
+    {
+      tabName: "Compensation",
+      icon: FaCoins,
+      isDisabled: false,
+    },
   ];
 
   const getOnChainNFTs = async () => {
@@ -140,7 +146,7 @@ export default function MyDataNFTsMx({ tabState }: { tabState: number }) {
                 <Tab
                   key={index}
                   isDisabled={tab.isDisabled}
-                  p={{ base: "0", md: "initial" }}
+                  p={{ base: "3", md: "0" }}
                   _selected={{ borderBottom: "5px solid", borderBottomColor: "teal.200" }}
                   onClick={() => onChangeTab(index + 1)}
                   mx={"auto"}>
@@ -241,6 +247,15 @@ export default function MyDataNFTsMx({ tabState }: { tabState: number }) {
                 </Flex>
               )}
             </TabPanel>
+            <TabPanel mt={2} width={"full"}>
+              {tabState === 6 ? (
+                <CompensationCards />
+              ) : (
+                <Flex onClick={getOnChainNFTs}>
+                  <NoDataHere />
+                </Flex>
+              )}
+            </TabPanel>
           </TabPanels>
         </Tabs>
       </Stack>
diff --git a/src/pages/DataNFT/components/CompensationCards.tsx b/src/pages/DataNFT/components/CompensationCards.tsx
new file mode 100644
index 00000000..4b91f16c
--- /dev/null
+++ b/src/pages/DataNFT/components/CompensationCards.tsx
@@ -0,0 +1,194 @@
+import React, { useEffect, useState } from "react";
+import { Button, Flex, Text } from "@chakra-ui/react";
+import { Bond, BondContract, Compensation, DataNft, Refund } from "@itheum/sdk-mx-data-nft/out";
+import { Address } from "@multiversx/sdk-core/out";
+import { useGetAccountInfo, useGetNetworkConfig } from "@multiversx/sdk-dapp/hooks";
+import { useGetPendingTransactions } from "@multiversx/sdk-dapp/hooks/transactions";
+import { sendTransactions } from "@multiversx/sdk-dapp/services";
+import BigNumber from "bignumber.js";
+import { IS_DEVNET, contractsForChain } from "../../../libs/config";
+
+type CompensationNftPair = {
+  compensation: Compensation;
+  dataNft: DataNft;
+};
+
+export const CompensationCards: React.FC = () => {
+  const { address } = useGetAccountInfo();
+  const { chainID } = useGetNetworkConfig();
+  const { hasPendingTransactions } = useGetPendingTransactions();
+  const bondContract = new BondContract(IS_DEVNET ? "devnet" : "mainnet");
+  const [compensationPairs, setCompensationPairs] = useState<Array<CompensationNftPair>>([]);
+  const [compensationRefund, setCompensationRefund] = useState<Record<number, Refund>>({});
+
+  const hasPassedSafeTime = (endDate: number) => {
+    const currentTime = new Date().getTime();
+    const endDateInMs = endDate * 1000;
+    const differenceInMs = currentTime - endDateInMs;
+    const safeTime = IS_DEVNET ? 300000 : 86400000;
+    return differenceInMs <= safeTime || endDate === 0;
+  };
+
+  useEffect(() => {
+    (async () => {
+      const contractBonds = await bondContract.viewAllBonds();
+      const dataNftTicker = contractsForChain(chainID).dataNftTokens[0].id;
+      const dataNfts: DataNft[] = await DataNft.ownedByAddress(address, [dataNftTicker]);
+
+      const compensationsT = await getCompensationsFromBondSc(bondContract, contractBonds);
+
+      const { compsInScT, compPairsT }: { compsInScT: Compensation[]; compPairsT: CompensationNftPair[] } = getNftsForCompensations(compensationsT, dataNfts);
+
+      const refundObjT: Record<number, Refund> = await getRefundsObject(bondContract, address, compsInScT);
+
+      const nftsInScT = compsInScT.map((comp) => {
+        return { nonce: comp.nonce, tokenIdentifier: comp.tokenIdentifier };
+      });
+      const dataNftsInScT = [];
+      for (let i = 0; i < nftsInScT.length; i += 50) {
+        const dataNftsInScTChunk = await DataNft.createManyFromApi(nftsInScT.slice(i, i + 50));
+        dataNftsInScT.push(...dataNftsInScTChunk);
+      }
+      for (const compT of compsInScT) {
+        const dataNftForComp = dataNftsInScT.find((dataNft) => dataNft.nonce === compT.nonce && dataNft.collection === compT.tokenIdentifier);
+        if (dataNftForComp) {
+          const refundForComp = refundObjT[compT.compensationId];
+          if (refundForComp) {
+            dataNftForComp.updateDataNft({ balance: Number(refundForComp.proofOfRefund.amount) });
+            const compNftPair: CompensationNftPair = { compensation: compT, dataNft: dataNftForComp };
+            compPairsT.push(compNftPair);
+          }
+        }
+      }
+      setCompensationRefund(refundObjT);
+      setCompensationPairs(compPairsT.filter((pair) => pair.compensation.endDate > 0));
+    })();
+  }, [hasPendingTransactions]);
+
+  const handleDeposit = async (tokenIdentifier: string, nonce: number, amount: BigNumber.Value) => {
+    const payments = { amount: amount, nonce: nonce, tokenIdentifier: tokenIdentifier };
+    const tx = bondContract.proof(new Address(address), payments);
+    await sendTransactions({
+      transactions: [tx],
+    });
+  };
+
+  const handleClaim = async (tokenIdentifier: string, nonce: number) => {
+    const tx = bondContract.claimRefund(new Address(address), tokenIdentifier, nonce);
+    await sendTransactions({
+      transactions: [tx],
+    });
+  };
+
+  return (
+    <>
+      <Flex>
+        {compensationPairs.length === 0 ? (
+          <Text>No compensation available</Text>
+        ) : (
+          <Flex flexDirection="column" gap={6} w="full" px={14}>
+            {compensationPairs.map((item, index) => {
+              const proofAmount = compensationRefund[item.compensation.compensationId]
+                ? Number(compensationRefund[item.compensation.compensationId].proofOfRefund.amount)
+                : 0;
+              return (
+                <Flex key={index} w="full" flexDirection={{ base: "column", md: "row" }} alignItems="center" gap={6}>
+                  <img src={item.dataNft.nftImgUrl} alt="NFT" width="150rem" height="150rem" />
+                  <Flex flexDirection="column" gap={1}>
+                    <Text fontSize="2xl">
+                      {item.compensation.endDate * 1000 < new Date().getTime() ? (
+                        proofAmount === 0 ? (
+                          <>You were eligible for compensation, but you did not deposit the Data NFT for proof</>
+                        ) : (
+                          <> You have some $ITHEUM compensation to claim on this Data NFT!</>
+                        )
+                      ) : (
+                        <>You can deposit this Data NFT as proof for your $ITHEUM compensation</>
+                      )}
+                    </Text>
+                    <Flex gap={2} alignItems="center">
+                      <Text fontSize="2xl">Token Name:</Text>
+                      <Text fontSize="xl" textColor="teal.200">
+                        {item.dataNft.tokenName}
+                      </Text>
+                    </Flex>
+                    <Flex gap={2} alignItems="center">
+                      <Text fontSize="2xl">Supply:</Text>
+                      <Text fontSize="xl" textColor="teal.200">
+                        {Number(item.dataNft.balance)}
+                      </Text>
+                    </Flex>
+                    <Flex gap={2} alignItems="center">
+                      <Text fontSize="2xl">Deposit this Data NFT before: </Text>
+                      <Text fontSize="xl" textColor="teal.200">
+                        {new Date(item.compensation.endDate * 1000).toLocaleString()}
+                      </Text>
+                    </Flex>
+                    <Flex gap={3} flexDirection={{ base: "column", md: "row" }}>
+                      <Button
+                        variant="outline"
+                        colorScheme="teal"
+                        isDisabled={item.compensation.endDate * 1000 < new Date().getTime()}
+                        onClick={() => handleDeposit(item.dataNft.collection, item.dataNft.nonce, item.dataNft.balance)}>
+                        Deposit all Data NFTs to claim $ITHEUM
+                      </Button>
+                      <Button
+                        variant="outline"
+                        colorScheme="teal"
+                        isDisabled={hasPassedSafeTime(item.compensation.endDate) || proofAmount === 0}
+                        onClick={() => handleClaim(item.dataNft.collection, item.dataNft.nonce)}>
+                        Claim back your Data NFT +&nbsp;
+                        {Number(item.compensation.accumulatedAmount) !== 0 && Number(item.compensation.proofAmount) !== 0
+                          ? (BigNumber(item.compensation.accumulatedAmount)
+                              .dividedBy(10 ** 18)
+                              .toNumber() /
+                              Number(item.compensation.proofAmount)) *
+                            proofAmount
+                          : 0}
+                        &nbsp;$ITHEUM
+                      </Button>
+                    </Flex>
+                  </Flex>
+                </Flex>
+              );
+            })}
+          </Flex>
+        )}
+      </Flex>
+    </>
+  );
+};
+async function getRefundsObject(bondContract: BondContract, address: string, compsInScT: Compensation[]) {
+  const refunds = await bondContract.viewAddressRefunds(
+    new Address(address),
+    compsInScT.map((comp) => comp.compensationId)
+  );
+  const refundObjT: Record<number, Refund> = {};
+  for (const refund of refunds) {
+    refundObjT[refund.compensationId] = refund;
+  }
+  return refundObjT;
+}
+
+function getNftsForCompensations(compensationsT: Compensation[], dataNfts: DataNft[]) {
+  const compPairsT: CompensationNftPair[] = [];
+  const compsInScT: Compensation[] = [];
+  for (const compT of compensationsT) {
+    const dataNftForComp = dataNfts.find((dataNft) => dataNft.nonce === compT.nonce && dataNft.collection === compT.tokenIdentifier);
+    if (dataNftForComp) {
+      const compNftPair: CompensationNftPair = { compensation: compT, dataNft: dataNftForComp };
+      compPairsT.push(compNftPair);
+    } else {
+      compsInScT.push(compT);
+    }
+  }
+  return { compsInScT, compPairsT };
+}
+
+async function getCompensationsFromBondSc(bondContract: BondContract, contractBonds: Bond[]) {
+  return await bondContract.viewCompensations(
+    contractBonds.map((bond) => {
+      return { nonce: bond.nonce, tokenIdentifier: bond.tokenIdentifier };
+    })
+  );
+}
diff --git a/src/pages/Enterprise/Enterprise.tsx b/src/pages/Enterprise/Enterprise.tsx
index 0272d4a9..c47ff3d2 100644
--- a/src/pages/Enterprise/Enterprise.tsx
+++ b/src/pages/Enterprise/Enterprise.tsx
@@ -15,8 +15,8 @@ export const Enterprise: React.FC = () => {
   const [isWhitelistNeeded, setWhitelistNeeded] = useState<boolean>(false);
   const [factoryTaxPercentage, setFactoryTaxPercentage] = useState<number>(0);
   const [factoryVersions, setFactoryVersions] = useState<Array<string>>([]);
-  const [factoryTreasuryAddress, setFactoryTreasuryAddress] = useState<IAddress>(new Address());
-  const [claimsContractAddress, setClaimsContractAddress] = useState<IAddress>(new Address());
+  const [factoryTreasuryAddress, setFactoryTreasuryAddress] = useState<IAddress>(new Address(""));
+  const [claimsContractAddress, setClaimsContractAddress] = useState<IAddress>(new Address(""));
   const [claimsTokenIdentifier, setClaimsTokenIdentifier] = useState<string>("");
   const [viewAddressContracts, setViewAddressContracts] = useState<Array<DeployedContract>>([]);
   const [readTermsChecked, setReadTermsChecked] = useState<boolean>(false);
diff --git a/src/pages/Enterprise/components/DataNftCollection/ClaimRoyalties.tsx b/src/pages/Enterprise/components/DataNftCollection/ClaimRoyalties.tsx
index 19ce4924..1b6b4dc9 100644
--- a/src/pages/Enterprise/components/DataNftCollection/ClaimRoyalties.tsx
+++ b/src/pages/Enterprise/components/DataNftCollection/ClaimRoyalties.tsx
@@ -36,7 +36,7 @@ export const ClaimRoyalties: React.FC<ClaimRoyaltiesProps> = (props) => {
     const { data: externalTokenData } = await axios.get(urlForExternalToken);
     const { data: egldBalance } = await axios.get(egldAccountBalance);
     // request for claims portal
-    const getClaimsDatadex = await mxClaimsContract.getClaims(new Address(minterAddress));
+    const getClaimsDatadex = await mxClaimsContract.getClaims(new Address(minterAddress ?? ""));
     setAddressToken(externalTokenData);
 
     // setting the data from claims portal into claim object + adding egld balance
diff --git a/src/pages/Enterprise/components/DataNftCollection/CurateNfts.tsx b/src/pages/Enterprise/components/DataNftCollection/CurateNfts.tsx
index 6b1b6db2..c2a24638 100644
--- a/src/pages/Enterprise/components/DataNftCollection/CurateNfts.tsx
+++ b/src/pages/Enterprise/components/DataNftCollection/CurateNfts.tsx
@@ -48,21 +48,21 @@ export const CurateNfts: React.FC<CurateNftsProp> = (props) => {
     setHasRequestLoaded(true);
   };
   const freezeDataNft = async (creator: string, nonce: number, owner: string | undefined) => {
-    const tx = await nftMinter.freezeSingleNFT(new Address(address), nonce, new Address(owner));
+    const tx = await nftMinter.freezeSingleNFT(new Address(address), nonce, new Address(owner ?? ""));
     tx.setGasLimit(100000000);
     await sendTransactions({
       transactions: [tx],
     });
   };
   const unFreezeDataNft = async (creator: string, nonce: number, owner: string | undefined) => {
-    const tx = await nftMinter.unFreezeSingleNFT(new Address(address), nonce, new Address(owner));
+    const tx = await nftMinter.unFreezeSingleNFT(new Address(address), nonce, new Address(owner ?? ""));
     tx.setGasLimit(100000000);
     await sendTransactions({
       transactions: [tx],
     });
   };
   const wipeDataNft = async (creator: string, nonce: number, owner: string | undefined) => {
-    const tx = await nftMinter.wipeSingleNFT(new Address(address), nonce, new Address(owner));
+    const tx = await nftMinter.wipeSingleNFT(new Address(address), nonce, new Address(owner ?? ""));
     tx.setGasLimit(100000000);
     await sendTransactions({
       transactions: [tx],
diff --git a/src/pages/Enterprise/components/MinterDashboard.tsx b/src/pages/Enterprise/components/MinterDashboard.tsx
index 1e36d592..b9d85448 100644
--- a/src/pages/Enterprise/components/MinterDashboard.tsx
+++ b/src/pages/Enterprise/components/MinterDashboard.tsx
@@ -2,7 +2,6 @@ import React, { useEffect, useState } from "react";
 import { Box, Flex, Text } from "@chakra-ui/react";
 import { ContractConfiguration, NftMinter } from "@itheum/sdk-mx-data-nft/out";
 import { Address } from "@multiversx/sdk-core/out";
-import { useGetNetworkConfig } from "@multiversx/sdk-dapp/hooks";
 import { useGetPendingTransactions } from "@multiversx/sdk-dapp/hooks/transactions";
 import { useParams } from "react-router-dom";
 import { IS_DEVNET } from "libs/config";
@@ -15,7 +14,7 @@ export const MinterDashboard: React.FC = () => {
   const { hasPendingTransactions } = useGetPendingTransactions();
   const { minterAddress } = useParams();
 
-  const nftMinter = new NftMinter(IS_DEVNET ? "devnet" : "mainnet", new Address(minterAddress));
+  const nftMinter = new NftMinter(IS_DEVNET ? "devnet" : "mainnet", new Address(minterAddress ?? ""));
   useEffect(() => {
     (async () => {
       try {
diff --git a/src/pages/Profile/components/DataCreatorTabs.tsx b/src/pages/Profile/components/DataCreatorTabs.tsx
index 902aee78..572611fb 100644
--- a/src/pages/Profile/components/DataCreatorTabs.tsx
+++ b/src/pages/Profile/components/DataCreatorTabs.tsx
@@ -43,6 +43,7 @@ import { DataNftMarketContract } from "../../../libs/MultiversX/dataNftMarket";
 import { DataNftMintContract } from "../../../libs/MultiversX/dataNftMint";
 import { backendApi, createNftId, sleep } from "../../../libs/utils";
 import { useMarketStore } from "../../../store";
+import { Address } from "@multiversx/sdk-core/out";
 
 interface PropsType {
   tabState: number;
@@ -212,7 +213,7 @@ export const DataCreatorTabs: React.FC<PropsType> = ({ tabState }) => {
       // start loading offers
       setIsLoadingSecond(true);
 
-      const _offers = await marketContract.viewPagedOffers(pageIndex * pageSize, (pageIndex + 1) * pageSize - 1, profileAddress);
+      const _offers = await marketContract.viewPagedOffers(pageIndex * pageSize, (pageIndex + 1) * pageSize - 1, new Address(profileAddress));
       updateOffers(_offers);
 
       //
diff --git a/src/store/StoreProvider.tsx b/src/store/StoreProvider.tsx
index 43ac5f62..ad708724 100644
--- a/src/store/StoreProvider.tsx
+++ b/src/store/StoreProvider.tsx
@@ -7,6 +7,7 @@ import { useSearchParams } from "react-router-dom";
 import { GET_BITZ_TOKEN, IS_DEVNET, viewDataJSONCore } from "libs/config";
 import {
   contractsForChain,
+  getAddressBoughtOffersFromBackendApi,
   getFavoritesFromBackendApi,
   getHealthCheckFromBackendApi,
   getMarketplaceHealthCheckFromBackendApi,
@@ -40,6 +41,8 @@ export const StoreProvider = ({ children }: PropsWithChildren) => {
   const isApiUp = useMarketStore((state) => state.isApiUp);
   const updateIsApiUp = useMarketStore((state) => state.updateIsApiUp);
   const updateIsMarketplaceApiUp = useMarketStore((state) => state.updateIsMarketplaceApiUp);
+  const addressBoughtOffers = useMarketStore((state) => state.addressBoughtOffers);
+  const updateAddressBoughtOffers = useMarketStore((state) => state.updateAddressBoughtOffers);
 
   // MINT STORE
   const updateUserData = useMintStore((state) => state.updateUserData);
@@ -53,7 +56,6 @@ export const StoreProvider = ({ children }: PropsWithChildren) => {
     (async () => {
       if (bondingContract) {
         const bondingAmount = await bondingContract.viewLockPeriodsWithBonds();
-
         updateLockPeriodForBond(bondingAmount);
       }
     })();
@@ -126,7 +128,7 @@ export const StoreProvider = ({ children }: PropsWithChildren) => {
   useEffect(() => {
     (async () => {
       let _marketRequirements: MarketplaceRequirements | undefined;
-      _marketRequirements = await getMarketRequirements(chainID);
+      _marketRequirements = await getMarketRequirements();
       if (_marketRequirements) {
         updateMarketRequirements(_marketRequirements);
       } else {
@@ -134,8 +136,6 @@ export const StoreProvider = ({ children }: PropsWithChildren) => {
         updateMarketRequirements(_marketRequirements);
       }
 
-      // const _marketRequirements = await marketContract.viewRequirements();
-
       const _maxPaymentFeeMap: Record<string, number> = {};
       if (_marketRequirements) {
         for (let i = 0; i < _marketRequirements.acceptedPayments.length; i++) {
@@ -197,5 +197,13 @@ export const StoreProvider = ({ children }: PropsWithChildren) => {
     return () => clearInterval(interval);
   }, []);
 
+  useEffect(() => {
+    if (address) {
+      getAddressBoughtOffersFromBackendApi(chainID, tokenLogin?.nativeAuthToken ?? "");
+    } else {
+      updateAddressBoughtOffers([]);
+    }
+  }, [address, hasPendingTransactions]);
+
   return <>{children}</>;
 };
diff --git a/src/store/market.ts b/src/store/market.ts
index 778110e3..752fefe0 100644
--- a/src/store/market.ts
+++ b/src/store/market.ts
@@ -1,18 +1,18 @@
 import { MarketplaceRequirements } from "@itheum/sdk-mx-data-nft/out";
 import { create } from "zustand";
-import { ExtendedOffer } from "libs/types";
+import { AddressBoughtOffer, ExtendedOffer } from "libs/types";
 
 type State = {
   itheumPrice: number;
   marketRequirements: MarketplaceRequirements;
   maxPaymentFeeMap: Record<string, number>;
   isMarketPaused: boolean;
-
   isApiUp: boolean;
   isMarketplaceApiUp: boolean;
   offers: Array<ExtendedOffer>;
   loadingOffers: boolean;
   pageCount: number;
+  addressBoughtOffers: Array<AddressBoughtOffer>;
 };
 
 type Action = {
@@ -26,6 +26,7 @@ type Action = {
   updateOffers: (offers: State["offers"]) => void;
   updateLoadingOffers: (loadingOffers: State["loadingOffers"]) => void;
   updatePageCount: (pageCount: State["pageCount"]) => void;
+  updateAddressBoughtOffers: (addressBoughtOffers: State["addressBoughtOffers"]) => void;
 };
 
 export const useMarketStore = create<State & Action>((set) => ({
@@ -57,4 +58,7 @@ export const useMarketStore = create<State & Action>((set) => ({
   updateOffers: (value: Array<ExtendedOffer>) => set((state) => ({ ...state, offers: value })),
   updateLoadingOffers: (value: boolean) => set((state) => ({ ...state, loadingOffers: value })),
   updatePageCount: (value: number) => set((state) => ({ ...state, pageCount: value })),
+
+  addressBoughtOffers: [],
+  updateAddressBoughtOffers: (value: any) => set((state) => ({ ...state, addressBoughtOffers: value })),
 }));