diff --git a/src/components/AuthPages/AuthProfile/CollectionTab.jsx b/src/components/AuthPages/AuthProfile/CollectionTab.jsx
index 679f5e3..674d76f 100644
--- a/src/components/AuthPages/AuthProfile/CollectionTab.jsx
+++ b/src/components/AuthPages/AuthProfile/CollectionTab.jsx
@@ -43,7 +43,7 @@ export default function CollectionTab({ className, products }) {
               <DataIteration
                 datas={products}
                 startLength={process.env.REACT_APP_ZERO_STATE}
-                endLength={products.length}
+                endLength={products?.length}
               >
                 {({ datas }) => (
                   <CollectionCard key={datas.uniqKey} collectionData={datas} />
diff --git a/src/components/AuthPages/AuthProfile/CreateSaleSlider.jsx b/src/components/AuthPages/AuthProfile/CreateSaleSlider.jsx
index c78ef81..f083343 100644
--- a/src/components/AuthPages/AuthProfile/CreateSaleSlider.jsx
+++ b/src/components/AuthPages/AuthProfile/CreateSaleSlider.jsx
@@ -42,7 +42,9 @@ export default function CreateSaleSlider({
       {/* heading */}
       <div className="flex justify-between items-center mb-6">
         <div>
-          <h1 className="text-26 font-bold   text-dark-gray dark:text-white">Create for Sell</h1>
+          <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
+            Create for Sell
+          </h1>
         </div>
         <div className="slider-btns flex space-x-4">
           <button onClick={nextHandler} type="button">
@@ -89,7 +91,7 @@ export default function CreateSaleSlider({
       <div className="trending-products relative w-full">
         <SliderCom selector={trendingSlider} settings={settings}>
           {products &&
-            products.length > 0 &&
+            products?.length > 0 &&
             products.map((item) => (
               <ProductCardStyleTwo
                 key={item.id}
diff --git a/src/components/AuthPages/AuthProfile/CreatedBidsSlider.jsx b/src/components/AuthPages/AuthProfile/CreatedBidsSlider.jsx
index b416ae9..b9f5bb1 100644
--- a/src/components/AuthPages/AuthProfile/CreatedBidsSlider.jsx
+++ b/src/components/AuthPages/AuthProfile/CreatedBidsSlider.jsx
@@ -49,7 +49,9 @@ export default function CreatedBidsSlider({
       {/* heading */}
       <div className="flex justify-between items-center mb-6">
         <div>
-          <h1 className="text-26 font-bold   text-dark-gray dark:text-white">Create for Bits</h1>
+          <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
+            Create for Bits
+          </h1>
         </div>
         <div className="slider-btns flex space-x-4">
           <button onClick={nextHandler} type="button">
@@ -96,7 +98,7 @@ export default function CreatedBidsSlider({
       <div className="trending-products relative w-full">
         <SliderCom selector={trendingSlider} settings={settings}>
           {products &&
-            products.length > 0 &&
+            products?.length > 0 &&
             products.map((item) => (
               <ProductCardStyleOne
                 key={item.id}
diff --git a/src/components/AuthPages/AuthProfile/OnSaleTab.jsx b/src/components/AuthPages/AuthProfile/OnSaleTab.jsx
index c4c510b..b5f0eeb 100644
--- a/src/components/AuthPages/AuthProfile/OnSaleTab.jsx
+++ b/src/components/AuthPages/AuthProfile/OnSaleTab.jsx
@@ -43,7 +43,7 @@ export default function OnSaleTab({ className, products }) {
               <DataIteration
                 datas={products}
                 startLength={process.env.REACT_APP_ZERO_STATE}
-                endLength={products.length}
+                endLength={products?.length}
               >
                 {({ datas }) => (
                   <ProductCardStyleTwo key={datas.id} datas={datas} />
diff --git a/src/components/AuthPages/AuthProfile/OwnTab.jsx b/src/components/AuthPages/AuthProfile/OwnTab.jsx
index da7d29d..fca8dec 100644
--- a/src/components/AuthPages/AuthProfile/OwnTab.jsx
+++ b/src/components/AuthPages/AuthProfile/OwnTab.jsx
@@ -43,7 +43,7 @@ export default function OwnTab({ className, products }) {
               <DataIteration
                 datas={products}
                 startLength={process.env.REACT_APP_ZERO_STATE}
-                endLength={products.length}
+                endLength={products?.length}
               >
                 {({ datas }) => (
                   <ProductCardStyleOne key={datas.id} datas={datas} />
diff --git a/src/components/AuthPages/UserProfile/CollectionTab.jsx b/src/components/AuthPages/UserProfile/CollectionTab.jsx
index 679f5e3..674d76f 100644
--- a/src/components/AuthPages/UserProfile/CollectionTab.jsx
+++ b/src/components/AuthPages/UserProfile/CollectionTab.jsx
@@ -43,7 +43,7 @@ export default function CollectionTab({ className, products }) {
               <DataIteration
                 datas={products}
                 startLength={process.env.REACT_APP_ZERO_STATE}
-                endLength={products.length}
+                endLength={products?.length}
               >
                 {({ datas }) => (
                   <CollectionCard key={datas.uniqKey} collectionData={datas} />
diff --git a/src/components/AuthPages/UserProfile/CreateSaleSlider.jsx b/src/components/AuthPages/UserProfile/CreateSaleSlider.jsx
index c78ef81..f083343 100644
--- a/src/components/AuthPages/UserProfile/CreateSaleSlider.jsx
+++ b/src/components/AuthPages/UserProfile/CreateSaleSlider.jsx
@@ -42,7 +42,9 @@ export default function CreateSaleSlider({
       {/* heading */}
       <div className="flex justify-between items-center mb-6">
         <div>
-          <h1 className="text-26 font-bold   text-dark-gray dark:text-white">Create for Sell</h1>
+          <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
+            Create for Sell
+          </h1>
         </div>
         <div className="slider-btns flex space-x-4">
           <button onClick={nextHandler} type="button">
@@ -89,7 +91,7 @@ export default function CreateSaleSlider({
       <div className="trending-products relative w-full">
         <SliderCom selector={trendingSlider} settings={settings}>
           {products &&
-            products.length > 0 &&
+            products?.length > 0 &&
             products.map((item) => (
               <ProductCardStyleTwo
                 key={item.id}
diff --git a/src/components/AuthPages/UserProfile/CreatedBidsSlider.jsx b/src/components/AuthPages/UserProfile/CreatedBidsSlider.jsx
index b416ae9..b9f5bb1 100644
--- a/src/components/AuthPages/UserProfile/CreatedBidsSlider.jsx
+++ b/src/components/AuthPages/UserProfile/CreatedBidsSlider.jsx
@@ -49,7 +49,9 @@ export default function CreatedBidsSlider({
       {/* heading */}
       <div className="flex justify-between items-center mb-6">
         <div>
-          <h1 className="text-26 font-bold   text-dark-gray dark:text-white">Create for Bits</h1>
+          <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
+            Create for Bits
+          </h1>
         </div>
         <div className="slider-btns flex space-x-4">
           <button onClick={nextHandler} type="button">
@@ -96,7 +98,7 @@ export default function CreatedBidsSlider({
       <div className="trending-products relative w-full">
         <SliderCom selector={trendingSlider} settings={settings}>
           {products &&
-            products.length > 0 &&
+            products?.length > 0 &&
             products.map((item) => (
               <ProductCardStyleOne
                 key={item.id}
diff --git a/src/components/AuthPages/UserProfile/OnSaleTab.jsx b/src/components/AuthPages/UserProfile/OnSaleTab.jsx
index c4c510b..b5f0eeb 100644
--- a/src/components/AuthPages/UserProfile/OnSaleTab.jsx
+++ b/src/components/AuthPages/UserProfile/OnSaleTab.jsx
@@ -43,7 +43,7 @@ export default function OnSaleTab({ className, products }) {
               <DataIteration
                 datas={products}
                 startLength={process.env.REACT_APP_ZERO_STATE}
-                endLength={products.length}
+                endLength={products?.length}
               >
                 {({ datas }) => (
                   <ProductCardStyleTwo key={datas.id} datas={datas} />
diff --git a/src/components/AuthPages/UserProfile/OwnTab.jsx b/src/components/AuthPages/UserProfile/OwnTab.jsx
index da7d29d..fca8dec 100644
--- a/src/components/AuthPages/UserProfile/OwnTab.jsx
+++ b/src/components/AuthPages/UserProfile/OwnTab.jsx
@@ -43,7 +43,7 @@ export default function OwnTab({ className, products }) {
               <DataIteration
                 datas={products}
                 startLength={process.env.REACT_APP_ZERO_STATE}
-                endLength={products.length}
+                endLength={products?.length}
               >
                 {({ datas }) => (
                   <ProductCardStyleOne key={datas.id} datas={datas} />
diff --git a/src/components/Cards/ProductCardStyleOne.jsx b/src/components/Cards/ProductCardStyleOne.jsx
index 41ed30d..30abcc6 100644
--- a/src/components/Cards/ProductCardStyleOne.jsx
+++ b/src/components/Cards/ProductCardStyleOne.jsx
@@ -1,4 +1,4 @@
-import React, { useState } from "react";
+import { useState } from "react";
 import { Link } from "react-router-dom";
 import { toast } from "react-toastify";
 import localImgLoad from "../../lib/localImgLoad";
@@ -17,6 +17,8 @@ export default function ProductCardStyleOne({ datas, hidden = false }) {
       toast.warn("Remove to Favorite List");
     }
   };
+
+  
   return (
     <div className="card-style-one flex flex-col justify-between w-full h-[387px] bg-white dark:bg-dark-white   p-3 pb rounded-2xl">
       <div className="content">
diff --git a/src/components/Resources/index.jsx b/src/components/Resources/index.jsx
index cc9fb81..f2e5af4 100644
--- a/src/components/Resources/index.jsx
+++ b/src/components/Resources/index.jsx
@@ -6,19 +6,18 @@ import { Link } from "react-router-dom";
 // import marketPlace from "../../data/marketplace_data.json";
 import products from "../../data/product_data.json";
 import Layout from "../Partials/Layout";
-import ActivitiesTab from "./ActivitiesTab";
-import CollectionTab from "./CollectionTab";
-import CreatedTab from "./CreatedTab";
-import HiddenProductsTab from "./HiddenProductsTab";
-import OnSaleTab from "./OnSaleTab";
-import OwnTab from "./OwnTab";
-import LoadingSpinner from "../Spinners/LoadingSpinner";
+import {
+  ActivitiesTab,
+  CollectionTab,
+  CreatedTab,
+  HiddenProductsTab,
+  OnSaleTab,
+  OwnTab,
+} from "./tabs";
 
 export default function Resources(props) {
   // console.log("RESOURCES=>", props);
-  // const mainProducts = products.datas;
   const ownProducts = products.datas;
-
   // Resource Props
   const __resources = props.MyResourceData;
 
@@ -89,7 +88,7 @@ export default function Resources(props) {
   const TabList = ({ tabCategories }) => {
     return (
       <ul className="lg:flex lg:space-x-14 space-x-8">
-        {tabCategories.length > 0 &&
+        {tabCategories?.length > 0 &&
           tabCategories?.map((tabValue, idx) => (
             <TabItem
               key={tabValue.id}
@@ -105,39 +104,39 @@ export default function Resources(props) {
     <>
       <Layout>
         <div className="nft-authprofile-wrapper w-full">
-          {props.MyResourceData.length == 0 ||
-          Object.keys(props.MyResourceData).length == 0 ? (
+          {/* {__resources.length == 0 ||
+          Object.keys(__resources).length == 0 ? (
             <div className="w-full h-full flex items-center justify-center">
               <LoadingSpinner size={16} color="sky-blue" />
             </div>
-          ) : (
-            <div className="main-wrapper w-full">
-              <div className="content-wrapper-profile-only w-full mb-6">
-                <div className="auth-tab-content relative mb-10">
-                  <div className="lg:flex justify-between">
-                    <div className="tab-items">
-                      <ul className="lg:flex lg:space-x-14 space-x-8">
-                        <TabList tabCategories={tab_categories} />
-                      </ul>
-                    </div>
-                    <div style={{ transform: "translateY(-22px)" }}>
-                      <Link
-                        to="/upload-product"
-                        className="btn-gradient lg:flex hidden w-[153px] h-[46px] rounded-full text-white justify-center items-center"
-                      >
-                        Upload Product
-                      </Link>
-                    </div>
+          ) : ( */}
+          <div className="main-wrapper w-full">
+            <div className="content-wrapper-profile-only w-full mb-6">
+              <div className="auth-tab-content relative mb-10">
+                <div className="lg:flex justify-between">
+                  <div className="tab-items">
+                    <ul className="lg:flex lg:space-x-14 space-x-8">
+                      <TabList tabCategories={tab_categories} />
+                    </ul>
+                  </div>
+                  <div style={{ transform: "translateY(-22px)" }}>
+                    <Link
+                      to="/upload-product"
+                      className="btn-gradient lg:flex hidden w-[153px] h-[46px] rounded-full text-white justify-center items-center"
+                    >
+                      Upload Product
+                    </Link>
                   </div>
-                  <div className="hidden lg:block w-full h-[1px] bg-[#DCD5FE] dark:bg-[#5356fb29] absolute top-[42px] left-0"></div>
                 </div>
-              </div>
-
-              <div className="tab-cotainer w-full mb-10">
-                {selectedTabComponent}
+                <div className="hidden lg:block w-full h-[1px] bg-[#DCD5FE] dark:bg-[#5356fb29] absolute top-[42px] left-0"></div>
               </div>
             </div>
-          )}
+
+            <div className="tab-cotainer w-full mb-10">
+              {selectedTabComponent}
+            </div>
+          </div>
+          {/* )} */}
         </div>
       </Layout>
     </>
diff --git a/src/components/Resources/ActivitiesTab.jsx b/src/components/Resources/tabs/ActivitiesTab.jsx
similarity index 99%
rename from src/components/Resources/ActivitiesTab.jsx
rename to src/components/Resources/tabs/ActivitiesTab.jsx
index dc31392..21fdcb4 100644
--- a/src/components/Resources/ActivitiesTab.jsx
+++ b/src/components/Resources/tabs/ActivitiesTab.jsx
@@ -1,8 +1,7 @@
-import React from "react";
-import dataImage1 from "../../assets/images/data-table-user-1.png";
-import dataImage2 from "../../assets/images/data-table-user-2.png";
-import dataImage3 from "../../assets/images/data-table-user-3.png";
-import dataImage4 from "../../assets/images/data-table-user-4.png";
+import dataImage1 from "../../../assets/images/data-table-user-1.png";
+import dataImage2 from "../../../assets/images/data-table-user-2.png";
+import dataImage3 from "../../../assets/images/data-table-user-3.png";
+import dataImage4 from "../../../assets/images/data-table-user-4.png";
 
 export default function ActivitiesTab({ className }) {
   return (
diff --git a/src/components/Resources/CollectionTab.jsx b/src/components/Resources/tabs/CollectionTab.jsx
similarity index 93%
rename from src/components/Resources/CollectionTab.jsx
rename to src/components/Resources/tabs/CollectionTab.jsx
index c46f24a..e460786 100644
--- a/src/components/Resources/CollectionTab.jsx
+++ b/src/components/Resources/tabs/CollectionTab.jsx
@@ -1,7 +1,6 @@
-import React from "react";
-import CollectionCard from "../Cards/CollectionCard";
-import DataIteration from "../Helpers/DataIteration";
-import SearchCom from "../Helpers/SearchCom";
+import CollectionCard from "../../Cards/CollectionCard";
+import DataIteration from "../../Helpers/DataIteration";
+import SearchCom from "../../Helpers/SearchCom";
 
 export default function CollectionTab({ className, products }) {
   return (
diff --git a/src/components/Resources/CreateSaleSlider.jsx b/src/components/Resources/tabs/CreateSaleSlider.jsx
similarity index 91%
rename from src/components/Resources/CreateSaleSlider.jsx
rename to src/components/Resources/tabs/CreateSaleSlider.jsx
index 292c40a..0880b85 100644
--- a/src/components/Resources/CreateSaleSlider.jsx
+++ b/src/components/Resources/tabs/CreateSaleSlider.jsx
@@ -1,7 +1,7 @@
-import React, { useRef } from "react";
-import ProductCardStyleTwo from "../Cards/ProductCardStyleTwo";
-import Icons from "../Helpers/Icons";
-import SliderCom from"../Helpers/SliderCom";
+import { useRef } from "react";
+import ProductCardStyleTwo from "../../Cards/ProductCardStyleTwo";
+import Icons from "../../Helpers/Icons";
+import SliderCom from "../../Helpers/SliderCom";
 
 export default function CreateSaleSlider({
   className,
@@ -42,7 +42,9 @@ export default function CreateSaleSlider({
       {/* heading */}
       <div className="flex justify-between items-center mb-6">
         <div>
-          <h1 className="text-26 font-bold   text-dark-gray dark:text-white">Create for Sell</h1>
+          <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
+            Create for Sell
+          </h1>
         </div>
         <div className="slider-btns flex space-x-4">
           <button onClick={nextHandler} type="button">
@@ -89,7 +91,7 @@ export default function CreateSaleSlider({
       <div className="trending-products relative w-full">
         <SliderCom selector={trendingSlider} settings={settings}>
           {products &&
-            products.length > 0 &&
+            products?.length > 0 &&
             products.map((item) => (
               <ProductCardStyleTwo
                 key={item.id}
diff --git a/src/components/Resources/CreatedBidsSlider.jsx b/src/components/Resources/tabs/CreatedBidsSlider.jsx
similarity index 91%
rename from src/components/Resources/CreatedBidsSlider.jsx
rename to src/components/Resources/tabs/CreatedBidsSlider.jsx
index 88d735e..e098e04 100644
--- a/src/components/Resources/CreatedBidsSlider.jsx
+++ b/src/components/Resources/tabs/CreatedBidsSlider.jsx
@@ -1,7 +1,7 @@
-import React, { useRef } from "react";
-import ProductCardStyleOne from "../Cards/ProductCardStyleOne";
-import Icons from "../Helpers/Icons";
-import SliderCom from "../Helpers/SliderCom";
+import { useRef } from "react";
+import ProductCardStyleOne from "../../Cards/ProductCardStyleOne";
+import Icons from "../../Helpers/Icons";
+import SliderCom from "../../Helpers/SliderCom";
 
 export default function CreatedBidsSlider({
   className,
@@ -49,7 +49,9 @@ export default function CreatedBidsSlider({
       {/* heading */}
       <div className="flex justify-between items-center mb-6">
         <div>
-          <h1 className="text-26 font-bold   text-dark-gray dark:text-white">Create for Bits</h1>
+          <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
+            Create for Bits
+          </h1>
         </div>
         <div className="slider-btns flex space-x-4">
           <button onClick={nextHandler} type="button">
@@ -96,7 +98,7 @@ export default function CreatedBidsSlider({
       <div className="trending-products relative w-full">
         <SliderCom selector={trendingSlider} settings={settings}>
           {products &&
-            products.length > 0 &&
+            products?.length > 0 &&
             products.map((item) => (
               <ProductCardStyleOne
                 key={item.id}
diff --git a/src/components/Resources/CreatedTab.jsx b/src/components/Resources/tabs/CreatedTab.jsx
similarity index 97%
rename from src/components/Resources/CreatedTab.jsx
rename to src/components/Resources/tabs/CreatedTab.jsx
index 20febdc..0780290 100644
--- a/src/components/Resources/CreatedTab.jsx
+++ b/src/components/Resources/tabs/CreatedTab.jsx
@@ -1,5 +1,4 @@
-import React from "react";
-import SearchCom from "../Helpers/SearchCom";
+import SearchCom from "../../Helpers/SearchCom";
 import CreatedBidsSlider from "./CreatedBidsSlider";
 import CreateSaleSlider from "./CreateSaleSlider";
 
diff --git a/src/components/Resources/HiddenProductsTab.jsx b/src/components/Resources/tabs/HiddenProductsTab.jsx
similarity index 97%
rename from src/components/Resources/HiddenProductsTab.jsx
rename to src/components/Resources/tabs/HiddenProductsTab.jsx
index d7cf4e9..8312584 100644
--- a/src/components/Resources/HiddenProductsTab.jsx
+++ b/src/components/Resources/tabs/HiddenProductsTab.jsx
@@ -1,5 +1,4 @@
-import React from "react";
-import SearchCom from "../Helpers/SearchCom";
+import SearchCom from "../../Helpers/SearchCom";
 import CreatedBidsSlider from "./CreatedBidsSlider";
 import CreateSaleSlider from "./CreateSaleSlider";
 
diff --git a/src/components/Resources/OnSaleTab.jsx b/src/components/Resources/tabs/OnSaleTab.jsx
similarity index 92%
rename from src/components/Resources/OnSaleTab.jsx
rename to src/components/Resources/tabs/OnSaleTab.jsx
index 7685cae..816da84 100644
--- a/src/components/Resources/OnSaleTab.jsx
+++ b/src/components/Resources/tabs/OnSaleTab.jsx
@@ -1,7 +1,6 @@
-import React from "react";
-import ProductCardStyleTwo from "../Cards/ProductCardStyleTwo";
-import DataIteration from "../Helpers/DataIteration";
-import SearchCom from "../Helpers/SearchCom";
+import ProductCardStyleTwo from "../../Cards/ProductCardStyleTwo";
+import DataIteration from "../../Helpers/DataIteration";
+import SearchCom from "../../Helpers/SearchCom";
 
 export default function OnSaleTab({ className, products }) {
   return (
@@ -43,7 +42,7 @@ export default function OnSaleTab({ className, products }) {
               <DataIteration
                 datas={products}
                 startLength={process.env.REACT_APP_ZERO_STATE}
-                endLength={products.length}
+                endLength={products?.length}
               >
                 {({ datas }) => (
                   <ProductCardStyleTwo key={datas.id} datas={datas} />
diff --git a/src/components/Resources/OwnTab.jsx b/src/components/Resources/tabs/OwnTab.jsx
similarity index 92%
rename from src/components/Resources/OwnTab.jsx
rename to src/components/Resources/tabs/OwnTab.jsx
index 36b0155..1133567 100644
--- a/src/components/Resources/OwnTab.jsx
+++ b/src/components/Resources/tabs/OwnTab.jsx
@@ -1,7 +1,6 @@
-import React from "react";
-import ProductCardStyleOne from "../Cards/ProductCardStyleOne";
-import DataIteration from "../Helpers/DataIteration";
-import SearchCom from "../Helpers/SearchCom";
+import ProductCardStyleOne from "../../Cards/ProductCardStyleOne";
+import DataIteration from "../../Helpers/DataIteration";
+import SearchCom from "../../Helpers/SearchCom";
 
 export default function OwnTab({ className, products }) {
   return (
@@ -43,7 +42,7 @@ export default function OwnTab({ className, products }) {
               <DataIteration
                 datas={products}
                 startLength={process.env.REACT_APP_ZERO_STATE}
-                endLength={products.length}
+                endLength={products?.length}
               >
                 {({ datas }) => (
                   <ProductCardStyleOne key={datas.id} datas={datas} />
diff --git a/src/components/Resources/tabs/index.js b/src/components/Resources/tabs/index.js
new file mode 100644
index 0000000..f1bb4b9
--- /dev/null
+++ b/src/components/Resources/tabs/index.js
@@ -0,0 +1,15 @@
+import ActivitiesTab from "./ActivitiesTab";
+import CollectionTab from "./CollectionTab";
+import CreatedTab from "./CreatedTab";
+import HiddenProductsTab from "./HiddenProductsTab";
+import OnSaleTab from "./OnSaleTab";
+import OwnTab from "./OwnTab";
+
+export {
+  ActivitiesTab,
+  CollectionTab,
+  CreatedTab,
+  HiddenProductsTab,
+  OnSaleTab,
+  OwnTab,
+};
\ No newline at end of file
diff --git a/src/components/Saved/MainSection.jsx b/src/components/Saved/MainSection.jsx
index fe73254..f2cc4d0 100644
--- a/src/components/Saved/MainSection.jsx
+++ b/src/components/Saved/MainSection.jsx
@@ -8,7 +8,7 @@ export default function MainSection({ products }) {
       <DataIteration
         datas={products}
         startLength={process.env.REACT_APP_ZERO_STATE}
-        endLength={products.length}
+        endLength={products?.length}
       >
         {({ datas }) => (
           <div key={datas.id + Math.random()} className="item">