diff --git a/src/components/Elements/MainModal/backend/TabNavbar.jsx b/src/components/Elements/MainModal/backend/TabNavbar.jsx
index 268fb430..10c94051 100644
--- a/src/components/Elements/MainModal/backend/TabNavbar.jsx
+++ b/src/components/Elements/MainModal/backend/TabNavbar.jsx
@@ -60,7 +60,7 @@ const TabNavbar = ({ modalClose }) => {
           filterUnits="userSpaceOnUse"
           color-interpolation-filters="sRGB"
         >
-          <feFlood flood-opacity="0" result="BackgroundImageFix" />
+          <feFlood floodOpacity="0" result="BackgroundImageFix" />
           <feColorMatrix
             in="SourceAlpha"
             type="matrix"
@@ -144,11 +144,30 @@ const TabNavbar = ({ modalClose }) => {
       <div className="flex flex-row gap-5 items-center">
         {navbarLogo}
         <div className="flex flex-row items-center gap-2">
-          <span onClick={() => changeTab(activeTab)} className={clsx("text-xl capitalize tracking-normal transition-all duration-150 ease-in-out", { 'text-neutral-300 cursor-pointer hover:text-neutral-100': subTab !== '' && activeTab === 'marketplace' })}>{variables.getMessage(`modals.main.navbar.${activeTab}`)}</span>
+          <span
+            onClick={() => changeTab(activeTab)}
+            className={clsx(
+              'text-xl capitalize tracking-normal transition-all duration-150 ease-in-out',
+              {
+                'text-neutral-300 cursor-pointer hover:text-neutral-100':
+                  subTab !== '' && activeTab === 'marketplace',
+              },
+            )}
+          >
+            {variables.getMessage(`modals.main.navbar.${activeTab}`)}
+          </span>
           {subTab !== '' && (
             <>
               <MdOutlineKeyboardArrowRight />
-              <span onClick={() => setSubSection('')} className={clsx("text-xl capitalize tracking-normal transition-all duration-150 ease-in-out", { 'text-neutral-300 cursor-pointer hover:text-neutral-100': subSection !== '' })}>{subTab}</span>
+              <span
+                onClick={() => setSubSection('')}
+                className={clsx(
+                  'text-xl capitalize tracking-normal transition-all duration-150 ease-in-out',
+                  { 'text-neutral-300 cursor-pointer hover:text-neutral-100': subSection !== '' },
+                )}
+              >
+                {subTab}
+              </span>
             </>
           )}
           {subSection !== '' && (
@@ -161,7 +180,7 @@ const TabNavbar = ({ modalClose }) => {
       </div>
       <div className="flex flex-row gap-5">
         <AnimatePresence>
-          {activeTab === 'marketplace' && (
+          {activeTab === 'marketplace' && subTab === '' && (
             <motion.div
               initial={{ opacity: 0, y: '-100%' }}
               animate={{ opacity: 1, y: 0 }}
diff --git a/src/features/marketplace/views/newItemPage.jsx b/src/features/marketplace/views/newItemPage.jsx
index 237e20c3..904701cd 100644
--- a/src/features/marketplace/views/newItemPage.jsx
+++ b/src/features/marketplace/views/newItemPage.jsx
@@ -24,42 +24,78 @@ import { Button } from 'components/Elements';
 const NewItemPage = () => {
   const { subTab } = useTab();
   const controller = new AbortController();
-  const [itemName, setItemName] = useState('');
-  const [ItemDescription, setItemDescription] = useState('');
-  const [ItemAuthor, setItemAuthor] = useState('');
-  const [ItemType, setItemType] = useState('');
-  const [ItemIcon, setItemIcon] = useState('');
   const [count, setCount] = useState(5);
-  let quotes = [];
-  let ItemData;
-  //const [ItemData, setItemData] = useState([]);
+  const [itemData, setItemData] = useState(null);
 
   async function getItemData() {
-    const item = await (
-      await fetch(`${variables.constants.API_URL}/marketplace/item/quote_packs/${subTab}`, {
+    let testType = 'quote_packs';
+    // Fetch data from API
+    const response = await fetch(
+      `${variables.constants.API_URL}/marketplace/item/${testType}/${subTab}`,
+      {
         signal: controller.signal,
-      })
-    ).json();
+      },
+    );
+    const item = await response.json();
     console.log(item);
 
-    setItemName(item.data.display_name);
-    setItemType(item.data.type);
-    setItemDescription(item.data.description);
-    setItemAuthor(item.data.author);
-    setItemType(item.data.type);
-    setItemIcon(item.data.icon_url);
-    console.log(ItemType)
-    if (ItemType === 'quotes') {
-      quotes = item.data.quotes
-      console.log(quotes)
-    }
-    ItemData = item.data.data;
+    // Extract all the information you need
+    const {
+      onCollection,
+      type,
+      display_name,
+      author,
+      description,
+      version,
+      icon_url,
+      data,
+      local,
+      slug,
+      quotes,
+    } = item;
+
+    // Return an object with all the information
+    return {
+      onCollection,
+      type,
+      display_name,
+      author,
+      description,
+      version,
+      icon_url,
+      data,
+      local,
+      slug,
+      quotes,
+    };
   }
 
   useEffect(() => {
-    getItemData();
+    async function fetchData() {
+      const data = await getItemData();
+      setItemData(data.data);
+    }
+
+    fetchData();
   }, []);
 
+  if (!itemData) {
+    return null; // or a loading spinner
+  }
+
+  const {
+    onCollection,
+    type,
+    display_name,
+    author,
+    description,
+    version,
+    icon,
+    data,
+    local,
+    slug,
+  } = itemData;
+
   const moreInfoItem = (icon, header, text) => (
     <div className="infoItem">
       {icon}
@@ -209,7 +245,7 @@ const NewItemPage = () => {
             {moreInfoItem(
               <MdAccountCircle />,
               variables.getMessage('modals.main.marketplace.product.created_by'),
-              ItemAuthor,
+              itemData.author,
             )}
             {itemWarning()}
           </div>
@@ -235,10 +271,10 @@ const NewItemPage = () => {
             <span className="title">
               {variables.getMessage('modals.main.marketplace.product.description')}
             </span>
-            <Markdown>{ItemDescription}</Markdown>
+            <Markdown>{itemData.description}</Markdown>
           </div>
-          {quotes[0]}
-          {ItemType === 'quotes' && (
+          {itemData.quotes && itemData.quotes.length > 0 ? itemData.quotes[0].quote : 'Loading...'}
+          {itemData.type === 'quotes' && (
             <>
               <table>
                 <tbody>
@@ -246,7 +282,7 @@ const NewItemPage = () => {
                     <th>{variables.getMessage('modals.main.settings.sections.quote.title')}</th>
                     <th>{variables.getMessage('modals.main.settings.sections.quote.author')}</th>
                   </tr>
-                  {quotes.slice(0, count).map((quote, index) => (
+                  {itemData.quotes.slice(0, count).map((quote, index) => (
                     <tr key={index}>
                       <td>{quote.quote}</td>
                       <td>{quote.author}</td>
@@ -255,8 +291,8 @@ const NewItemPage = () => {
                 </tbody>
               </table>
               <div className="showMoreItems">
-                <span className="link" onClick={() => count === quotes.length}>
-                  {count !== quotes.length
+                <span className="link" onClick={() => count === itemData.quotes.length}>
+                  {count !== itemData.quotes.length
                     ? variables.getMessage('modals.main.marketplace.product.show_all')
                     : variables.getMessage('modals.main.marketplace.product.show_less')}
                 </span>
@@ -301,19 +337,19 @@ const NewItemPage = () => {
                   variables.getMessage('modals.main.marketplace.product.updated_at'),
                   formattedDate,
                 )}*/}
-              {ItemData?.quotes &&
+              {itemData?.quotes &&
                 moreInfoItem(
                   <MdFormatQuote />,
-                  variables.getMessage('modals.main.marketplace.product.no_quotes'),
-                  ItemData.quotes.length,
+                  variables.getMessage('modals.main.marketplace.product.no_itemData.quotes'),
+                  itemData.quotes.length,
                 )}
-              {ItemData?.photos &&
+              {itemData?.photos &&
                 moreInfoItem(
                   <MdImage />,
                   variables.getMessage('modals.main.marketplace.product.no_images'),
-                  ItemData.photos.length,
+                  itemData.photos.length,
                 )}
-              {/*{ItemData.quotes && ItemData.language
+              {/*{itemData.itemData.quotes && itemData.language
                 ? moreInfoItem(
                     <MdTranslate />,
                     variables.getMessage('modals.main.settings.sections.language.title'),
@@ -333,7 +369,7 @@ const NewItemPage = () => {
         <div
           className="itemInfo"
           style={{
-            backgroundImage: `url("${ItemIcon}")`,
+            backgroundImage: `url("${itemData.icon_url || placeholderIcon}")`,
           }}
         >
           <div className="front">
@@ -341,7 +377,7 @@ const NewItemPage = () => {
               className="icon"
               alt="icon"
               draggable={false}
-              src={ItemIcon}
+              src={itemData.icon_url}
               onError={(e) => {
                 e.target.onerror = null;
                 e.target.src = placeholderIcon;
diff --git a/src/features/misc/views/Marketplace.jsx b/src/features/misc/views/Marketplace.jsx
index 9a734139..6d821665 100644
--- a/src/features/misc/views/Marketplace.jsx
+++ b/src/features/misc/views/Marketplace.jsx
@@ -6,6 +6,7 @@ import { sortItems } from '../../marketplace/api';
 import { NewItems as Items } from '../../marketplace/components/Items/NewItems';
 import { useTab } from 'components/Elements/MainModal/backend/TabContext';
 import { NewItemPage } from '../../marketplace/views/newItemPage';
+import { AnimatePresence, motion } from 'framer-motion';
 
 function Marketplace(props) {
   const [done, setDone] = useState(false);
@@ -68,17 +69,25 @@ function Marketplace(props) {
     </Tabs>*/
     },
     (
-      <div className="modalTabContent">
-        {/*<MarketplaceTab type="all" />
-        {selectedItem !== null ? <span>{selectedItem?.display_name}</span> : null}*/}
-        {subTab === '' ? (
-          <Items items={items} />
-        ) : (
-          <>
-            <NewItemPage />
-          </>
-        )}
-      </div>
+      <AnimatePresence mode="wait">
+        <motion.div
+          className="modalTabContent"
+          initial={{ opacity: 0 }}
+          animate={{ opacity: 1 }}
+          exit={{ opacity: 0 }}
+          transition={{ duration: 10 }}
+        >
+          {subTab === '' ? (
+            <motion.div key="items">
+              <Items items={items} />
+            </motion.div>
+          ) : (
+            <motion.div key="itempage">
+              <NewItemPage />
+            </motion.div>
+          )}
+        </motion.div>
+      </AnimatePresence>
     )
   );
 }