diff --git a/package.json b/package.json
index 9900994..d728255 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "react-error-boundary": "^3.1.4",
     "react-flippy": "^1.1.0",
     "react-helmet": "^6.1.0",
+    "react-html5video": "^2.5.1",
     "react-infinite-scroll-component": "^6.1.0",
     "react-lazy-load-image-component": "^1.5.1",
     "react-lazyload": "^3.2.0",
diff --git a/src/components/AssetImageFigure/index.js b/src/components/AssetImageFigure/index.js
index 4469eb4..e6d4398 100644
--- a/src/components/AssetImageFigure/index.js
+++ b/src/components/AssetImageFigure/index.js
@@ -9,7 +9,7 @@ const AssetImageFigure = ({ asset, setShow, show_trigger, width, no_figure, clas
     <>
       {
         no_figure ? (
-          <FadeImg className={className} src={get_asset_image_source(asset.details.onchainMetadata.image)} alt={asset.details.onchainMetadata.name} style={{ width: width, height: width }} />
+          <img className={className} src={get_asset_image_source(asset.details.onchainMetadata.image)} alt={asset.details.onchainMetadata.name} style={{ width: width, height: width }} />
         ) :
           setShow ? (
             <div onClick={() => setShow(show_trigger ? show_trigger : false)} style={{ cursor: "pointer" }}>
diff --git a/src/components/CollectionBanner/index.js b/src/components/CollectionBanner/index.js
index 88183d3..a72f1ed 100644
--- a/src/components/CollectionBanner/index.js
+++ b/src/components/CollectionBanner/index.js
@@ -139,10 +139,11 @@ const CollectionBanner = ({thisCollection, size, asset, is_collection_page, is_a
                             <div>
                               <p className="heading has-text-weight-semibold">Floor price</p>
                               <p className="is-size-4">
-                                ₳{
+                                ₳{numFormatter(
                                 thisCollection.opencnft.reduce(function (result, policy){
                                   return Math.min(result, policy.floor_price)
-                                },999999*1000000)/1000000}</p>
+                                },999999*1000000)/1000000)
+                                }</p>
                             </div>
                           </div>
                         </td>
@@ -151,10 +152,10 @@ const CollectionBanner = ({thisCollection, size, asset, is_collection_page, is_a
                             <div>
                               <p className="heading has-text-weight-semibold">Total assets</p>
                               <p className="is-size-4">
-                                {
+                                {numFormatter(
                                   thisCollection.opencnft.reduce(function (result, policy){
                                     return result + policy.asset_minted
-                                  },0)
+                                  },0))
                                 }
                               </p>
                             </div>
@@ -165,10 +166,10 @@ const CollectionBanner = ({thisCollection, size, asset, is_collection_page, is_a
                             <div>
                               <p className="heading has-text-weight-semibold">Number owners</p>
                               <p className="is-size-4">
-                                {
+                                {numFormatter(
                               thisCollection.opencnft.reduce(function (result, policy){
                                   return result + policy.asset_holders
-                                },0)
+                                },0))
                               }
                               </p>
                             </div>
diff --git a/src/components/Navbar/index.js b/src/components/Navbar/index.js
index bfac4ff..a12a1da 100644
--- a/src/components/Navbar/index.js
+++ b/src/components/Navbar/index.js
@@ -18,8 +18,8 @@ const Navbar = () => {
 
       <div className="navbar-menu">
         <div className="navbar-start">
-          <Link className="navbar-item" to="/explore">
-            Explore
+          <Link className="navbar-item" to="/marketplace">
+            Marketplace
           </Link>
 
           <div className="navbar-item has-dropdown is-hoverable">
@@ -34,10 +34,14 @@ const Navbar = () => {
             </div>
           </div>
 
-          <Link className="navbar-item" to="/about">
+          <a
+            className="navbar-item"
+            href="https://martify.io"
+            target="_blank"
+            rel="noreferrer"
+          >
             About Us
-          </Link>
-          
+          </a>
         </div>
 
         <div className="navbar-end">
diff --git a/src/components/VideoPlayer/index.jsx b/src/components/VideoPlayer/index.jsx
new file mode 100644
index 0000000..1cbef98
--- /dev/null
+++ b/src/components/VideoPlayer/index.jsx
@@ -0,0 +1,10 @@
+import videoConnect from "react-html5video";
+import "react-html5video/dist/styles.css";
+
+const VideoPlayer = ({ video, videoEl, children, ...restProps }) => (
+  <div>
+    <video {...restProps}>{children}</video>
+  </div>
+);
+
+export default videoConnect(VideoPlayer);
diff --git a/src/database/assets.js b/src/database/assets.js
index b531236..c047e57 100644
--- a/src/database/assets.js
+++ b/src/database/assets.js
@@ -192,8 +192,8 @@ export const getLockedAssets = async (count = 100, lastVisible) => {
     const reference = await query(
       collection(firestore, "assets"),
       where("status.locked", "==", true),
-      orderBy("status.submittedOn"),
-      startAfter(lastVisible?.status?.submittedOn ?? 0),
+      orderBy("status.submittedOn", "desc"),
+      startAfter(lastVisible?.status?.submittedOn ?? Number.MAX_VALUE),
       limit(count)
     );
 
diff --git a/src/database/collections.js b/src/database/collections.js
index d5a9be3..23d3dff 100644
--- a/src/database/collections.js
+++ b/src/database/collections.js
@@ -53,3 +53,134 @@ export const setCollectionCreator = async (address, percentage, policyId) => {
 export const setCollectionStatus = async (verified: Boolean, policyId) => {
   await saveCollection({ verified }, policyId);
 };
+
+
+/* get opencnft */
+
+export const saveOpencnft = async (data, key) => {
+  try {
+    if (data) {
+      const reference = doc(firestore, "opencnft", key);
+      await setDoc(reference, data, { merge: true });
+    }
+  } catch (error) {
+    console.error(
+      `Unexpected error in saveCollection. [Message: ${error.message}]`
+    );
+    throw error;
+  }
+};
+
+export const getOpencnftTopProjects = async (time) => {
+  try {
+    
+    let time_outdated = 60 * 60 * 1000; // every hour
+    let time_now = new Date().getTime();
+
+    const reference = doc(firestore, "opencnft", "_top_projects_"+time);
+    const snapshot = await getDoc(reference);
+
+    let return_top_projects = false;
+    let backup_return_top_projects = false
+
+    if (snapshot.exists()){
+      let data = snapshot.data();
+      // console.log("gotten data", data);
+      // console.log("get existing top projects", time_now, data.last_updated, (time_now - data.last_updated) < time_outdated);
+      if((time_now - data.last_updated) < time_outdated){
+        return_top_projects = data.rankings;
+      }else{
+        backup_return_top_projects = data.rankings;
+      }
+    }
+
+    if(return_top_projects == false){
+      const top_projects = await fetch(`https://api.opencnft.io/1/rank?window=${time}` , {})
+        .then((res) => res.json())
+        .then((res) => {
+          return res.ranking ? res.ranking : res;
+        })
+        .catch((err) => {
+          return false;
+        });
+      if(top_projects){
+        let to_db = {
+          last_updated: time_now,
+          rankings: top_projects
+        }
+        
+        await saveOpencnft(to_db, "_top_projects_"+time);
+        return_top_projects = top_projects;
+      }
+      else if(backup_return_top_projects){ // for some reason opencnft is down, but lucky we have records in our own database
+        return_top_projects = backup_return_top_projects;
+      }
+    }
+    return return_top_projects;
+  
+  } catch (error) {
+    console.error(
+      `Unexpected error in getOpencnft. [Message: ${error.message}]`
+    );
+    throw error;
+  }
+};
+
+export const getOpencnftPolicy = async (policy_id) => {
+  try {
+    
+    let time_outdated = 60 * 60 * 1000; // every hour
+    let time_now = new Date().getTime();
+
+    const reference = doc(firestore, "opencnft", "policy_"+policy_id);
+    const snapshot = await getDoc(reference);
+
+    let return_project_stats = false;
+    let backup_return_project_stats = false
+
+    if (snapshot.exists()){
+      let data = snapshot.data();
+      // console.log("gotten data", data);
+      if((time_now - data.last_updated) < time_outdated){
+        // console.log("get existing opencnft data", time_now, data.last_updated, (time_now - data.last_updated) < time_outdated);
+        return_project_stats = data.rankings;
+      }else{
+        backup_return_project_stats = data.rankings;
+      }
+    }
+
+    if(return_project_stats == false){
+      
+      const project_stats = await fetch(`https://api.opencnft.io/1/policy/${policy_id}`, {})
+        .then((res) => res.json())
+        .then((res) => {
+          return res;
+        })
+        .catch((err) => {
+          return false;
+        });
+      
+      if(project_stats){
+        let to_db = {
+          last_updated: time_now,
+          rankings: project_stats
+        }
+        
+        await saveOpencnft(to_db, "policy_"+policy_id);
+        // console.log("updated opencnft collection", policy_id);
+        return_project_stats = project_stats;
+      }
+      else if(backup_return_project_stats){ // for some reason opencnft is down, but lucky we have records in our own database
+        return_project_stats = backup_return_project_stats;
+      }
+      
+    }
+    return return_project_stats;
+  
+  } catch (error) {
+    console.error(
+      `Unexpected error in getOpencnft. [Message: ${error.message}]`
+    );
+    throw error;
+  }
+};
diff --git a/src/hooks/usePolicyMetadatas.js b/src/hooks/usePolicyMetadatas.js
index 1ad0d7a..1eea503 100644
--- a/src/hooks/usePolicyMetadatas.js
+++ b/src/hooks/usePolicyMetadatas.js
@@ -17,19 +17,26 @@ export const usePolicyMetadatas = (policyIds) => {
           })
         );
 
+        let validMetadatas = [];
+
         if (metadatas.length === 1) {
           if (metadatas[0].statusCode === 404) {
             console.log(
               "usePolicyMetadatas: this collection is not in opencnft",
               policyIds
             );
+            validMetadatas.push({policy: policyIds[0]});
           }
         }
 
-        const validMetadatas = metadatas.filter(
-          (metadata) => metadata.policy !== undefined
-        );
+        if(validMetadatas.length==0){
+          validMetadatas = metadatas.filter(
+            (metadata) => metadata.policy !== undefined
+          );
+        }
+
         setPolicyMetadatas(validMetadatas);
+        
       } catch (error) {
         // console.error(
         //   `Unexpected error in usePolicyMetadatas. [Message: ${error.message}]`
diff --git a/src/pages/About/index.js b/src/pages/About/index.js
index 55515d4..ed47b6d 100644
--- a/src/pages/About/index.js
+++ b/src/pages/About/index.js
@@ -128,6 +128,7 @@ const About = () => {
             <div className="content is-medium">
               <ul>
                 <li>Handle Audio & Video Assets.</li>
+                <li>Add Support for More Wallets (GeroWallet, ccvault.io...).</li>
                 <li>Build The Martify Backend APIs.</li>
                 <li>Implement Trading & Bundle Swaps for NFTs.</li>
                 <li>Enable Buying & Selling NFTs Using Native Tokens.</li>
@@ -150,7 +151,7 @@ const About = () => {
             <div className="content is-medium">
               <ul>
                 <li>Implement On-Chain Auctions & Bidding.</li>
-                <li>Add Support to More Wallets (Yoroi, ccvault.io...).</li>
+                <li>Add Support for More Wallets (Yoroi...).</li>
                 <li>Create & Launch a Stake Pool for Martify.</li>
                 <li>
                   Write a Whitepaper for Smart Contract On-Chain Governance.
diff --git a/src/pages/Account/AllAssets.js b/src/pages/Account/AllAssets.js
index 7ff986b..b9cca45 100644
--- a/src/pages/Account/AllAssets.js
+++ b/src/pages/Account/AllAssets.js
@@ -258,7 +258,7 @@ const NoAssetFound = ({ state_wallet }) => {
               <p className="title">No assets</p>
               <p className="subtitle">
                 Looks like your wallet is empty,{" "}
-                <a href="/explore">start browsing</a>!
+                <a href="/marketplace">Start browsing marketplace</a>!
               </p>
             </>
           ) : (
diff --git a/src/pages/Account/Holdings.js b/src/pages/Account/Holdings.js
index 1f8dafd..c3bb5a0 100644
--- a/src/pages/Account/Holdings.js
+++ b/src/pages/Account/Holdings.js
@@ -248,7 +248,7 @@ const NoAssetFound = ({ state_wallet }) => {
               <p className="title">No assets</p>
               <p className="subtitle">
                 Looks like your wallet is empty,{" "}
-                <a href="/explore">start browsing</a>!
+                <a href="/marketplace">Start browsing marketplace</a>!
               </p>
             </>
           ) : (
diff --git a/src/pages/Asset/index.js b/src/pages/Asset/index.js
index b86bc03..be149ae 100644
--- a/src/pages/Asset/index.js
+++ b/src/pages/Asset/index.js
@@ -1,8 +1,10 @@
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useState, useRef } from "react";
 import { useSelector, useDispatch } from "react-redux";
 import { Link, useParams } from "react-router-dom";
 import Moment from "react-moment";
 import SweetAlert from "react-bootstrap-sweetalert";
+import { DefaultPlayer as Video } from "react-html5video";
+import "react-html5video/dist/styles.css";
 
 import { urls } from "config";
 import {
@@ -254,21 +256,30 @@ const Listing = ({
   purchase_token,
   asset_add_offer,
 }) => {
-  let is_owner = false;
-  if (asset.details.asset in state_wallet.data.assets) {
-    is_owner = true;
-  }
-  if (asset.status && state_wallet.connected) {
-    if (asset.status.locked) {
-      if (asset.status.submittedBy === state_wallet.data.address) {
-        is_owner = true;
+  const [isOwner, setIsOwner] = useState(false);
+
+  useEffect(() => {
+    if (asset.details.asset in state_wallet.data.assets) {
+      setIsOwner(true);
+    } else if (asset.status && state_wallet.connected) {
+      if (asset.status.locked) {
+        if (asset.status.submittedBy === state_wallet.data.address) {
+          setIsOwner(true);
+        }
       }
+    } else {
+      setIsOwner(false);
     }
-  }
+  }, [
+    asset,
+    state_wallet.connected,
+    state_wallet.data.address,
+    state_wallet.data.assets,
+  ]);
 
   return (
     <div className="block">
-      {is_owner ? (
+      {isOwner ? (
         <OwnerListAsset
           state_wallet={state_wallet}
           asset={asset}
@@ -1032,64 +1043,124 @@ const AssetRawMetaData = ({ asset }) => {
 };
 
 const AssetImage = ({ asset }) => {
+  const mediaPlayerRef = useRef();
   const [show, setShow] = useState(false);
   const [contentType, setContentType] = useState("image");
   const [contentSource, setContentSource] = useState(null);
 
   useEffect(() => {
     // detect html, require cleaning
-    if(asset&&show&&contentSource==null){
+    if (asset && show && contentSource == null) {
       setContentSource(false);
       let ipfs_root = "https://infura-ipfs.io/ipfs/";
-      if(asset.details.onchainMetadata.files){
-        if(asset.details.onchainMetadata.files.length){
+      if (asset.details.onchainMetadata.files) {
+        if (asset.details.onchainMetadata.files.length) {
           let thisContentType = false;
-          if(asset.details.onchainMetadata.files[0].mediaType == "text/html"){
+          if (
+            asset.details.onchainMetadata.files[0].mediaType === "text/html"
+          ) {
             thisContentType = "html";
-          }
-          else if(asset.details.onchainMetadata.files[0].mediaType == "audio/mpeg"){
+          } else if (
+            asset.details.onchainMetadata.files[0].mediaType === "audio/mpeg"     ||
+            asset.details.onchainMetadata.files[0].mediaType === "audio/wave"     ||
+            asset.details.onchainMetadata.files[0].mediaType === "audio/wav"      ||
+            asset.details.onchainMetadata.files[0].mediaType === "audio/x-wav"    ||
+            asset.details.onchainMetadata.files[0].mediaType === "audio/x-pn-wav" ||
+            asset.details.onchainMetadata.files[0].mediaType === "audio/webm"     ||
+            asset.details.onchainMetadata.files[0].mediaType === "audio/ogg"
+          ) {
             thisContentType = "audio";
+          } else if (
+            asset.details.onchainMetadata.files[0].mediaType === "video/mp4"  ||
+            asset.details.onchainMetadata.files[0].mediaType === "video/webm" ||
+            asset.details.onchainMetadata.files[0].mediaType === "video/ogg"
+          ) {
+            thisContentType = "video";
           }
 
-          if(thisContentType!="image"){
+          if (thisContentType !== "image") {
             setContentType(thisContentType);
-            // prepare src link
-            if(asset.details.onchainMetadata.files[0].src.includes("ipfs://")){
-              let s = ipfs_root + asset.details.onchainMetadata.files[0].src.split("ipfs://")[1];
-              setContentSource(s);
-            }else{
-              let s = ipfs_root + asset.details.onchainMetadata.files[0].src;
-              setContentSource(s);
+            const src = typeof asset.details.onchainMetadata.files[0].src === "string"
+              ? asset.details.onchainMetadata.files[0].src
+              : asset.details.onchainMetadata.files[0].src[0];
+            
+            if (src.includes("ipfs://")) {
+              setContentSource(ipfs_root + src.split("ipfs://")[1]);
+            } else {
+              setContentSource(ipfs_root + src);
             }
           }
-        }  
+        }
       }
     }
-    
-  }, [asset, show]);
-  
+  }, [asset, contentSource, show]);
+
+  useEffect(() => {
+    if (show === false && mediaPlayerRef.current !== undefined) {
+      if (contentType === "audio") {
+        mediaPlayerRef.current.pause();
+        mediaPlayerRef.current.currentTime = 0;
+      } else if (contentType === "video") {
+        mediaPlayerRef.current.videoEl.pause();
+        mediaPlayerRef.current.videoEl.currentTime = 0;
+      }
+    }
+  }, [contentType, show]);
+
   return (
     <div className="block">
       <AssetImageFigure asset={asset} setShow={setShow} show_trigger={true} />
       <div className={"modal " + (show ? "is-active" : "")}>
-        <div className="modal-background" onClick={() => setShow(false)}></div>
+        <div
+          className="modal-background"
+          onClick={() => {
+            setShow(false);
+          }}
+        ></div>
         <div className="modal-content">
-          {
-            contentType === "html" && contentSource ? 
-              <iframe src={contentSource} height="500px" width="100%"></iframe>
-            :
-            // contentType == "audio" && contentSource ? 
-            //   <audio controls="" preload="none" style="max-width: 697px; max-height: 387px;">
-            //     <source src={contentSource} type="audio/mpeg"/>
-            //   </audio>
-            // :
-            <AssetImageFigure asset={asset} setShow={setShow} no_figure={true} />
-          }
+          {contentType === "html" && contentSource ? (
+            <iframe title="asset" src={contentSource} height="500px" width="100%"></iframe>
+          ) : contentType === "audio" && contentSource ? (
+            <div>
+              <p className="image is-1by1">
+                <AssetImageFigure
+                  asset={asset}
+                  setShow={setShow}
+                  no_figure={true}
+                />
+              </p>
+              <audio controls src={contentSource} ref={mediaPlayerRef}></audio>
+            </div>
+          ) : contentType === "video" && contentSource ? (
+            <div>
+              <Video
+                autoPlay
+                controls={["PlayPause", "Seek", "Time", "Volume", "Fullscreen"]}
+                poster={asset.details.onchainMetadata.image}
+                onCanPlayThrough={() => {}}
+                ref={mediaPlayerRef}
+              >
+                <source src={contentSource} />
+              </Video>
+            </div>
+          ) : (
+            <>
+              <p className="image is-1by1">
+                <AssetImageFigure
+                  asset={asset}
+                  setShow={setShow}
+                  no_figure={true}
+                />
+              </p>
+            </>
+          )}
         </div>
         <button
           className="modal-close is-large"
           aria-label="close"
-          onClick={() => setShow(false)}
+          onClick={() => {
+            setShow(false);
+          }}
         ></button>
       </div>
     </div>
diff --git a/src/pages/Asset/style.css b/src/pages/Asset/style.css
index 50f2fc2..1bc03dc 100644
--- a/src/pages/Asset/style.css
+++ b/src/pages/Asset/style.css
@@ -21,3 +21,14 @@
 .asset .image img{
   object-fit: contain;
 }
+
+.asset .rh5v-Volume_icon {
+  padding: 4px;
+}
+
+.asset audio {
+  max-width: none;
+  margin-left: 1rem;
+  width: calc(100% - 2rem);
+  transform: translateY(calc(-100% - 1rem));
+}
\ No newline at end of file
diff --git a/src/pages/Collection/ListingSection.js b/src/pages/Collection/ListingSection.js
index 17d45ed..bf015aa 100644
--- a/src/pages/Collection/ListingSection.js
+++ b/src/pages/Collection/ListingSection.js
@@ -16,7 +16,7 @@ const ListingSection = ({ state_collection, policyIds }) => {
   const [lastVisible, setLastVisible] = useState(null);
   const [paginationObject, setPaginationObject] = useState(undefined);
   const [policyMetadatas, loadingData] = usePolicyMetadatas(policyIds);
-
+  
   const resetComponentState = useCallback(() => {
     if (policyMetadatas.length > 0) {
       let tmpPaginationObject = {};
diff --git a/src/pages/Collection/index.js b/src/pages/Collection/index.js
index 0d3d8eb..e66e221 100644
--- a/src/pages/Collection/index.js
+++ b/src/pages/Collection/index.js
@@ -62,7 +62,7 @@ const Collection = () => {
         if (currentCollectionIterator.hasOwnProperty("policy_id")) {
           setPolicyIds([currentCollectionIterator.policy_id]);
         }
-
+        
         for (let policyIdx in policy_ids) {
           let policy_id = policy_ids[policyIdx];
           dispatch(
diff --git a/src/pages/GuideBuy/index.js b/src/pages/GuideBuy/index.js
index 069f7b6..bb7ce02 100644
--- a/src/pages/GuideBuy/index.js
+++ b/src/pages/GuideBuy/index.js
@@ -1,101 +1,107 @@
-import React from "react";
-// import image_3_collateral from './step3-collateral.png';
-// import image_3_collateral2 from './step3-collateral2.png';
-// import image_4_assetpage from './step4-asset-page.png';
-
-const GuideBuy = () => {
-  return (
-    <div className="section container">
-      <div className="content is-large has-text-centered">
-        <h1 className="is-size-1">Buying</h1>
-        <p className="subtitle is-3">
-          Learn how to purchase your first NFT
-        </p>
-      </div>
-
-      <div className="content">
-        <h2>Overview</h2>
-        <ol>
-          <li><b>Buy cryptocurrency</b>: Join a cryptocurrency exchange like Coinbase and fund your account with ADA.</li>
-          <li><b>Setup a cryptocurrency wallet</b>: Signup for a "Non-custodial" wallet like Nami Wallet, which is where you can store and control your cryptocurrency and digital assets. Transfer your ADA coins from Coinbase to your wallet, which gives you the control to purchase NFTs across the various NFT marketplaces.</li>
-          <li><b>Connect Nami Wallet on Martify and add collateral</b>: That is easy!</li>
-          <li><b>Purchase your first NFT</b>: Purchasing your first NFT on <a href="explore">Martify</a>.</li>
-        </ol>
-
-        <h2>Step 1: Acquiring Cardano (ADA) cryptocurrency</h2>
-        {/* <h3>Overview: Step 1</h3> */}
-        <ol>
-          <li><b>Join a cryptocurrency exchange</b>: Join a cryptocurrency exchange like Coinbase or Binance to purchase, store, and transfer your cryptocurrency. Coinbase recommends a minimum of $50 to get started.</li>
-          <li><b>Send in required documents</b>: Just like any standard trading platforms, you will need to be approved to begin buying and selling cryptocurrency. Send in your required documents and sync a payment source.</li>
-          <li><b>Buy ADA coins</b>: ADA coin is a cryptocurrency that is part of the Cardano blockchain, which is the system and currency used to purchase and store NFTs.</li>
-        </ol>
-
-        <p>Your first step on this NFT journey is purchasing cryptocurrency in the form of ADA. ADA is the cryptocurrency that coincides with the Cardano network and is what is used when purchasing NFTs on the Cardano network. The purchase of ADA will allow you to make bids on and purchase NFTs through various NFT marketplaces.</p>
-
-        <p>To purchase ADA, you will need to join a centralized exchange such as <a href="https://www.coinbase.com/">Coinbase</a>. Coinbase is an exchange where one can purchase, buy, sell, convert, and send cryptocurrency. In a way, Coinbase is like how one would interact with the stock market. If you are familiar with stock trading platforms, you will be extremely comfortable in Coinbase.</p>
-        <p>Coinbase is quick to set up, but you may need a few days before everything is approved. Coinbase needs <a href="https://help.coinbase.com/en/coinbase/getting-started/getting-started-with-coinbase/id-doc-verification">Identity Documentation</a> such as a passport or driver’s license and then approval of a <a href="https://help.coinbase.com/en/coinbase/getting-started#add-a-payment-method">Payment Method</a>.</p>
-
-        <h2>Step 2: Setup a cryptocurrency wallet</h2>
-        {/* <h3>Overview: Step 2</h3> */}
-        <ol>
-          <li><b>Download a cryptocurrency wallet</b>: Download the <a href="https://namiwallet.io/">Nami Wallet</a> browser extension, which will be your own personal "digital wallet". With Nami Wallet, you get to store and use your cryptocurrency and digital assets (like NFTs).</li>
-          <li><b>Setup Nami Wallet</b>: Write down and confirm your seed phrase, and input a new password.</li>
-          <li><b>Fund your Nami Wallet</b>: Transfer your ADA from Coinbase to Nami Wallet.</li>
-        </ol>
-
-        <p>Now that you have purchased your ADA coins, you may want to put them into action, like purchasing an NFT from Martify or any of the various Cardano NFT marketplaces. To do so, you need a "Non-Custodial" wallet such as Nami Wallet. "Non-Custodial" wallets give you complete control over your crypto assets, as there is no third party involved. You cannot simply take your ADA coin from Coinbase to make purchases on an NFT marketplace as Coinbase is still technically controlling your assets. Once you transfer your currency from Coinbase to your wallet, you are free to do as you please!</p>
-
-        <p>Go to <a href="https://namiwallet.io/">Nami Wallet</a> to download the browser extension. <b>Important</b>: To avoid any scam, we recommend you to visit their official page and then select the desired browser type to install the application. If you click on Chrome, you will be automatically taken to the Google Chrome web store. Click "Add extension" and it will be downloaded and installed. Once installed, you will be able to view the Nami Wallet icon (a blue "N") in the top right corner of your browser.</p>
-
-        <p>If you open up the Nami Wallet for the first time. Make sure no one is watching your screen and click on "New Wallet". Then, it will show you 24-words sequence, these words are called "seed phrase", these sequence of words are the access to your wallet. Remember, this must be hidden and never shared with anyone. Do not take a picture or screenshot of your seed phrase. Instead, write it down immediately on a piece of paper and put it in a secret and safe location. Even better, write your seed phrase down on 2-3 pieces of paper and store each paper in a separate secure location (like one in a personal safe and one in a bank safety deposit box). Alternatively, you can download the seed phrase and keep it offline on an encrypted hard drive. Having multiple backups of your seed phrase is good practice just in case one copy is ever lost or destroyed. After documenting your seed phrase, click "Next".</p>
-
-        <p>Nami Wallet will prompt you to input all those words in the next step. You confirm your seed phrase in the correct order of your 24-word sequence. You will also be prompt to input a password, which is needed whenever you have to sign a transaction. You can now access your Nami Wallet via "N" icon in your browser and begin purchasing and receiving crypto. If you already have ADA in your Coinbase, you can use your brand new Cardano address to transfer them over into your Nami Wallet.</p>
-
-        <p>Now that you have your Nami Wallet, you will want to transfer your funds out of Coinbase. You need to get your wallet address, by clicking on the "Receive" button, you can copy your Cardano address. If you are using Coinbase on your smartphone, you can also scan the QR code from the Coinbase application. <b>Important</b>: you must send your ADA via the Cardano network. It would take a few minutes to get your ADA transfer from Coinbase to your Nami Wallet.</p>
-
-        <h2>Step 3: Connect Nami Wallet on Martify and add collateral</h2>
-
-        {/* <h3>Overview: Step 3</h3> */}
-        <ol>
-          <li><b>Connect wallet</b>: Click on connect and allow access.</li>
-          <li><b>Add collateral</b>: Deposit 5₳ as collateral from Nami Wallet.</li>
-        </ol>
-
-        <p>You have purchased your ADA coins, and transferred it to your Nami Wallet, now you are ready to browse and purchase some NFTs on the marketplace. Click on "Connect" on the top right corner. It should recognized that you have Nami Wallet installed and it will prompt your for access on the first time. If it does not, you may have to restart your web browser. Click on "Access" to allow Martify to connect to your Nami Wallet. No transaction will take place until you decided to make a purchase and provided your signature.</p>
-
-        <p>The Nami Wallet allows you to deposit a fixed amount (5₳) as collateral to avoid any circumstances that arise due to contract failure. In the event of a contract failure, a collateral is taken to cover the blockchain resources used by the node to verify the contract. That means collateral aims to secure the network and avoid network failure. When a script runs successfully, the collateral is not taken. The chances of losing the collateral are very low; however, Nami seeks to minimize the risk by only allowing a determined amount (5₳) of collateral to be used. In a worst case scenario, malicious, or poorly built dApps, would only be able to take this amount. To deposit tokens into collateral, go to the Setting tab, and click on Collateral. A window will pop up where you need to enter your wallet’s password to confirm the process. At any time, you can remove the collateral by clicking on the "Remove" button.</p>
-        
-        {/* <div className="columns">
-          <div className="column">
-            <figure className="image">
-              <img src={image_3_collateral} />
-            </figure>
-          </div>
-          <div className="column">
-            <figure className="image">
-              <img src={image_3_collateral2} />
-            </figure>
-          </div>
-        </div> */}
-
-        <h2>Step 4: Purchase your first NFT</h2>
-
-        {/* <h3>Overview: Step 4</h3> */}
-
-        {/* <figure className="image">
-          <img src={image_4_assetpage} />
-        </figure> */}
-
-        <ol>
-          <li><b>Browse NFTs</b>: Browse the <a href="explore">explore page</a>.</li>
-          <li><b>Make the transaction</b>: Click on Buy Now to confirm the transaction.</li>
-        </ol>
-
-        <p>Start by browsing listed assets on the <a href="explore">explore page</a>, there you can sort the assets by price or filter by the projects you are interested in. Clicking on the the asset will bring you to the asset page, here you can see the asset's metadata, past transactions on all marketplaces, as well as the current listing price. Click on "Buy Now", your Nami Wallet will prompt you for your password. Sign it to approve the transaction and the NFT will be in your Nami Wallet in a few minutes. If your "Buy Now" button is disabled, check that you have connected your wallet and added the collateral.</p>
-
-      </div>
-    </div>
-  );
-};
-
-export default GuideBuy;
+import React from "react";
+// import image_3_collateral from './step3-collateral.png';
+// import image_3_collateral2 from './step3-collateral2.png';
+// import image_4_assetpage from './step4-asset-page.png';
+
+const GuideBuy = () => {
+  return (
+    <div className="section container">
+      <div className="content is-large has-text-centered">
+        <h1 className="is-size-1">Buying</h1>
+        <p className="subtitle is-3">
+          Learn how to purchase your first NFT
+        </p>
+      </div>
+
+      <div className="content">
+        <h2>Overview</h2>
+        <ol>
+          <li><b>Buy cryptocurrency</b>: Join a cryptocurrency exchange like Coinbase and fund your account with ADA.</li>
+          <li><b>Setup a cryptocurrency wallet</b>: Signup for a "Non-custodial" wallet like Nami Wallet, GeroWallet or ccvault.io, which is where you can store and control your cryptocurrency and digital assets. Transfer your ADA coins from Coinbase to your wallet, which gives you the control to purchase NFTs across the various NFT marketplaces.</li>
+          <li><b>Connect your wallet (Nami Wallet, GeroWallet, ccvault.io...) on Martify and add collateral</b>: That is easy!</li>
+          <li><b>Purchase your first NFT</b>: Purchasing your first NFT on <a href="explore">Martify</a>.</li>
+        </ol>
+
+        <h2>Step 1: Acquiring Cardano (ADA) cryptocurrency</h2>
+        {/* <h3>Overview: Step 1</h3> */}
+        <ol>
+          <li><b>Join a cryptocurrency exchange</b>: Join a cryptocurrency exchange like Coinbase or Binance to purchase, store, and transfer your cryptocurrency. Coinbase recommends a minimum of $50 to get started.</li>
+          <li><b>Send in required documents</b>: Just like any standard trading platforms, you will need to be approved to begin buying and selling cryptocurrency. Send in your required documents and sync a payment source.</li>
+          <li><b>Buy ADA coins</b>: ADA coin is a cryptocurrency that is part of the Cardano blockchain, which is the system and currency used to purchase and store NFTs.</li>
+        </ol>
+
+        <p>Your first step on this NFT journey is purchasing cryptocurrency in the form of ADA. ADA is the cryptocurrency that coincides with the Cardano network and is what is used when purchasing NFTs on the Cardano network. The purchase of ADA will allow you to make bids on and purchase NFTs through various NFT marketplaces.</p>
+
+        <p>To purchase ADA, you will need to join a centralized exchange such as <a href="https://www.coinbase.com/" target="_blank" rel="noreferrer">Coinbase</a>. Coinbase is an exchange where one can purchase, buy, sell, convert, and send cryptocurrency. In a way, Coinbase is like how one would interact with the stock market. If you are familiar with stock trading platforms, you will be extremely comfortable in Coinbase.</p>
+        <p>Coinbase is quick to set up, but you may need a few days before everything is approved. Coinbase needs <a href="https://help.coinbase.com/en/coinbase/getting-started/getting-started-with-coinbase/id-doc-verification" target="_blank" rel="noreferrer">Identity Documentation</a> such as a passport or driver’s license and then approval of a <a href="https://help.coinbase.com/en/coinbase/getting-started#add-a-payment-method" target="_blank" rel="noreferrer">Payment Method</a>.</p>
+
+        <h2>Step 2: Setup a cryptocurrency wallet</h2>
+        {/* <h3>Overview: Step 2</h3> */}
+        <ol>
+          <li><b>Download a cryptocurrency wallet</b>:  Download one of the browser extension which will be your own personal "digital wallet" : <br/>
+          <a href="https://namiwallet.io/" target="_blank" rel="noreferrer">Nami Wallet</a> (Chrome, Brave and Edge compatible), <br/>
+          <a href="https://gerowallet.io/" target="_blank" rel="noreferrer">GeroWallet</a> (Chrome, Brave and Edge compatible) or <br/>
+          <a href="https://ccvault.io/" target="_blank" rel="noreferrer">ccvault.io</a> (Chrome, Brave, Edge and Opera compatible). <br/>
+          With your "digital wallet", you get to store and use your cryptocurrency and digital assets (like NFTs).</li>
+          <li><b>Setup your wallet</b>: Write down and confirm your seed phrase, and input a new password.</li>
+          <li><b>Fund your wallet</b>: Transfer your ADA from Coinbase to your wallet.</li>
+        </ol>
+
+        <p>Now that you have purchased your ADA coins, you may want to put them into action, like purchasing an NFT from Martify or any of the various Cardano NFT marketplaces. To do so, you need a "Non-Custodial" wallet such as Nami Wallet, GeroWallet or ccvault.io. "Non-Custodial" wallets give you complete control over your crypto assets, as there is no third party involved. You cannot simply take your ADA coin from Coinbase to make purchases on an NFT marketplace as Coinbase is still technically controlling your assets. Once you transfer your currency from Coinbase to your wallet, you are free to do as you please!</p>
+
+        <p>Go to <a href="https://namiwallet.io/" target="_blank" rel="noreferrer">Nami Wallet</a>, <a href="https://gerowallet.io/" target="_blank" rel="noreferrer">GeroWallet</a> or <a href="https://ccvault.io/" target="_blank" rel="noreferrer">ccvault</a> or  to download the browser extension. <b>Important</b>: To avoid any scam, we recommend you to visit their official page and then select the desired browser type to install the application. If you click on Chrome, you will be automatically taken to the Google Chrome web store. Click "Add extension" and it will be downloaded and installed. Once installed, you will be able to view the wallet icon (a blue "N" for Nami Wallet) in the top right corner of your browser.</p>
+
+        <p><b>The following instructions (for Nami Wallet) apply more or less to all wallets. </b></p>
+
+        <p>If you open up the Nami Wallet for the first time. Make sure no one is watching your screen and click on "New Wallet". Then, it will show you 24-words sequence, these words are called "seed phrase", these sequence of words are the access to your wallet. Remember, this must be hidden and never shared with anyone. Do not take a picture or screenshot of your seed phrase. Instead, write it down immediately on a piece of paper and put it in a secret and safe location. Even better, write your seed phrase down on 2-3 pieces of paper and store each paper in a separate secure location (like one in a personal safe and one in a bank safety deposit box). Alternatively, you can download the seed phrase and keep it offline on an encrypted hard drive. Having multiple backups of your seed phrase is good practice just in case one copy is ever lost or destroyed. After documenting your seed phrase, click "Next".</p>
+
+        <p>Nami Wallet will prompt you to input all those words in the next step. You confirm your seed phrase in the correct order of your 24-word sequence. You will also be prompt to input a password, which is needed whenever you have to sign a transaction. You can now access your Nami Wallet via "N" icon in your browser and begin purchasing and receiving crypto. If you already have ADA in your Coinbase, you can use your brand new Cardano address to transfer them over into your Nami Wallet.</p>
+
+        <p>Now that you have your cryptocurrency wallet, you will want to transfer your funds out of Coinbase. You need to get your wallet address, by clicking on the "Receive" button, you can copy your Cardano address. If you are using Coinbase on your smartphone, you can also scan the QR code from the Coinbase application. <b>Important</b>: you must send your ADA via the Cardano network. It would take a few minutes to get your ADA transfer from Coinbase to your Nami Wallet.</p>
+
+        <h2>Step 3: Connect your wallet on Martify and add collateral</h2>
+
+        {/* <h3>Overview: Step 3</h3> */}
+        <ol>
+          <li><b>Connect wallet</b>: Click on connect and allow access.</li>
+          <li><b>Add collateral</b>: Deposit 5₳ as collateral from Nami Wallet.</li>
+        </ol>
+
+        <p>You have purchased your ADA coins, and transferred it to your Nami Wallet, now you are ready to browse and purchase some NFTs on the marketplace. Click on "Connect" on the top right corner. It should recognized that you have Nami Wallet installed and it will prompt your for access on the first time. If it does not, you may have to restart your web browser. Click on "Access" to allow Martify to connect to your Nami Wallet. No transaction will take place until you decided to make a purchase and provided your signature.</p>
+
+        <p>The Nami Wallet allows you to deposit a fixed amount (5₳) as collateral to avoid any circumstances that arise due to contract failure. In the event of a contract failure, a collateral is taken to cover the blockchain resources used by the node to verify the contract. That means collateral aims to secure the network and avoid network failure. When a script runs successfully, the collateral is not taken. The chances of losing the collateral are very low; however, Nami seeks to minimize the risk by only allowing a determined amount (5₳) of collateral to be used. In a worst case scenario, malicious, or poorly built dApps, would only be able to take this amount. To deposit tokens into collateral, go to the Setting tab, and click on Collateral. A window will pop up where you need to enter your wallet’s password to confirm the process. At any time, you can remove the collateral by clicking on the "Remove" button.</p>
+        
+        {/* <div className="columns">
+          <div className="column">
+            <figure className="image">
+              <img src={image_3_collateral} />
+            </figure>
+          </div>
+          <div className="column">
+            <figure className="image">
+              <img src={image_3_collateral2} />
+            </figure>
+          </div>
+        </div> */}
+
+        <h2>Step 4: Purchase your first NFT</h2>
+
+        {/* <h3>Overview: Step 4</h3> */}
+
+        {/* <figure className="image">
+          <img src={image_4_assetpage} />
+        </figure> */}
+
+        <ol>
+          <li><b>Browse NFTs</b>: Browse the <a href="explore">explore page</a>.</li>
+          <li><b>Make the transaction</b>: Click on Buy Now to confirm the transaction.</li>
+        </ol>
+
+        <p>Start by browsing listed assets on the <a href="explore">explore page</a>, there you can sort the assets by price or filter by the projects you are interested in. Clicking on the the asset will bring you to the asset page, here you can see the asset's metadata, past transactions on all marketplaces, as well as the current listing price. Click on "Buy Now", your Nami Wallet will prompt you for your password. Sign it to approve the transaction and the NFT will be in your Nami Wallet in a few minutes. If your "Buy Now" button is disabled, check that you have connected your wallet and added the collateral.</p>
+
+      </div>
+    </div>
+  );
+};
+
+export default GuideBuy;
diff --git a/src/pages/GuideSell/index.js b/src/pages/GuideSell/index.js
index 2fa7826..cfbab2d 100644
--- a/src/pages/GuideSell/index.js
+++ b/src/pages/GuideSell/index.js
@@ -1,65 +1,71 @@
-import React from "react";
-
-const GuideSell = () => {
-  return (
-    <div className="section container">
-      <div className="content is-large has-text-centered">
-        <h1 className="is-size-1">Selling</h1>
-        <p className="subtitle is-3">
-          Learn how list your NFTs for sale
-        </p>
-      </div>
-
-      <div className="content">
-        <h2>Overview</h2>
-        <ol>
-          <li><b>Setup Nami Wallet</b>: Download Nami Wallet.</li>
-          <li><b>Connect Nami Wallet on Martify and add collateral</b>: That is easy!</li>
-          <li><b>List your first NFT</b>: Transfer your assets from Yoroi to your Nami Wallet and list them on Martify.</li>
-        </ol>
-
-        <h2>Step 1: Setup Nami Wallet</h2>
-        
-        <ol>
-          <li><b>Download Nami Wallet</b>: Download the <a href="https://namiwallet.io/">Nami Wallet</a> browser extension, which will be your own personal "digital wallet". With Nami Wallet, you get to store and use your cryptocurrency and digital assets (like NFTs).</li>
-          <li><b>Setup Nami Wallet</b>: Write down and confirm your seed phrase, and input a new password.</li>
-        </ol>
-
-        <p>Go to <a href="https://namiwallet.io/">Nami Wallet</a> to download the browser extension. <b>Important</b>: To avoid any scam, we recommend you to visit their official page and then select the desired browser type to install the application. If you click on Chrome, you will be automatically taken to the Google Chrome web store. Click "Add extension" and it will be downloaded and installed. Once installed, you will be able to view the Nami Wallet icon (a blue "N") in the top right corner of your browser.</p>
-
-        <p>If you open up the Nami Wallet for the first time. Make sure no one is watching your screen and click on "New Wallet". Then, it will show you 24-words sequence, these words are called "seed phrase", these sequence of words are the access to your wallet. Remember, this must be hidden and never shared with anyone. Do not take a picture or screenshot of your seed phrase. Instead, write it down immediately on a piece of paper and put it in a secret and safe location. Even better, write your seed phrase down on 2-3 pieces of paper and store each paper in a separate secure location (like one in a personal safe and one in a bank safety deposit box). Alternatively, you can download the seed phrase and keep it offline on an encrypted hard drive. Having multiple backups of your seed phrase is good practice just in case one copy is ever lost or destroyed. After documenting your seed phrase, click "Next".</p>
-
-        <p>Nami Wallet will prompt you to input all those words in the next step. You confirm your seed phrase in the correct order of your 24-word sequence. You will also be prompt to input a password, which is needed whenever you have to sign a transaction. You can now access your Nami Wallet via "N" icon in your browser.</p>
-
-        <h2>Step 2: Connect Nami Wallet on Martify and add collateral</h2>
-
-        <ol>
-          <li><b>Connect wallet</b>: Click on connect and allow access.</li>
-          <li><b>Add collateral</b>: Deposit 5₳ as collateral from Nami Wallet.</li>
-        </ol>
-
-        <p>With Nami Wallet installed, click on "Connect" on the top right corner. It should recognized that you have Nami Wallet installed and it will prompt your for access on the first time. If it does not, you may have to restart your web browser. Click on "Access" to allow Martify to connect to your Nami Wallet.</p>
-
-        <p>The Nami Wallet allows you to deposit a fixed amount (5₳) as collateral to avoid any circumstances that arise due to contract failure. In the event of a contract failure, a collateral is taken to cover the blockchain resources used by the node to verify the contract to avoid network failure. When a script runs successfully, the collateral is not taken. The chances of losing the collateral are very low; however, Nami seeks to minimize the risk by only allowing a determined amount (5₳) of collateral to be used. In a worst case scenario, malicious, or poorly built dApps, it would only be able to take this amount. To deposit ADA into collateral, go to the Setting tab, and click on Collateral. A window will pop up where you need to enter your wallet’s password to confirm the process. At any time, you can remove from collateral by clicking on the "Remove" button.</p>
-
-        <h2>Step 3: List your first NFT</h2>
-
-        <ol>
-          <li><b>Transfer your assets</b>: Send your assets into Nami Wallet.</li>
-          <li><b>List on Martify</b>: Connect and list your NFTs for sale.</li>
-        </ol>
-
-        <p>Now that you have your Nami Wallet, you will want to transfer your assets from other wallets into your new Nami Wallet. For that, you need to get your wallet address, by click on the "Recieve" button, you can copy your Cardano address. It would take a few minutes to get your assets transfer from your wallet to your new Nami Wallet.</p>
-
-        <p>Click on Connect if you have not, and click on Account to browse the assets in your Nami Wallet. Clicking on an asset will bring you to the asset page, here you can see the asset's metadata. On this page, you can set your listing price, your Nami Wallet will prompt you for your password. Sign it to approve the transaction and the NFT will be transfered to the smart contract. If you are unable to list the asset, check that you have connected your wallet and added the collateral.</p>
-
-
-        {/* <h2>How to add royalties?</h2>
-        NFTs can be programmed so that each transaction includes royalties, allowing creators to be rewarded fairly for their work online. The fact that NFTs are created and stored on the blockchain, means they can be traded seamlessly from wallet to wallet, with royalties paid every time they move. On Martify, creators can set royalties up to 10%, and connect us via <a href="https://twitter.com/MartifyLabs">Twitter</a> or <a href="https://twitter.com/MartifyLabs">Discord</a> */}
-
-      </div>
-    </div>
-  );
-};
-
-export default GuideSell;
+import React from "react";
+
+const GuideSell = () => {
+  return (
+    <div className="section container">
+      <div className="content is-large has-text-centered">
+        <h1 className="is-size-1">Selling</h1>
+        <p className="subtitle is-3">
+          Learn how list your NFTs for sale
+        </p>
+      </div>
+
+      <div className="content">
+        <h2>Overview</h2>
+        <ol>
+          <li><b>Setup your cryptocurrency wallet (Nami Wallet, GeroWallet or ccvault.io</b>: Download Nami Wallet, GeroWallet or ccvault.io.</li>
+          <li><b>Connect your wallet on Martify and add collateral</b>: That is easy!</li>
+          <li><b>List your first NFT</b>: Transfer your assets from Yoroi to your Nami Wallet, GeroWallet or ccvault.io and list them on Martify.</li>
+        </ol>
+
+        <h2>Step 1: Setup Nami Wallet, GeroWallet or ccvault.io</h2>
+        
+        <ol>
+          <li><b>Download your cryptocurrency wallet</b>: Download one of the browser extension which will be your own personal "digital wallet" : <br/>
+          <a href="https://namiwallet.io/" target="_blank">Nami Wallet</a> (Chrome, Brave and Edge compatible), <br/>
+          <a href="https://gerowallet.io/" target="_blank">GeroWallet</a> (Chrome, Brave and Edge compatible) or <br/>
+          <a href="https://ccvault.io/" target="_blank">ccvault.io</a> (Chrome, Brave, Edge and Opera compatible). <br/>
+          With your "digital wallet", you get to store and use your cryptocurrency and digital assets (like NFTs).</li>
+          <li><b>Setup your cryptocurrency wallet</b>: Write down and confirm your seed phrase, and input a new password.</li>
+        </ol>
+
+        <p>Go to <a href="https://namiwallet.io/" target="_blank">Nami Wallet</a>, <a href="https://gerowallet.io/" target="_blank">GeroWallet</a> or <a href="https://ccvault.io/" target="_blank">ccvault.io</a> to download the browser extension. <b>Important</b>: To avoid any scam, we recommend you to visit their official page and then select the desired browser type to install the application. If you click on Chrome, you will be automatically taken to the Google Chrome web store. Click "Add extension" and it will be downloaded and installed. Once installed, you will be able to view the Nami Wallet icon (a blue "N") in the top right corner of your browser.</p>
+
+        <p><b>The following instructions (for Nami Wallet) apply more or less to all wallets. </b></p>
+
+        <p>If you open up the Nami Wallet for the first time. Make sure no one is watching your screen and click on "New Wallet". Then, it will show you 24-words sequence, these words are called "seed phrase", these sequence of words are the access to your wallet. Remember, this must be hidden and never shared with anyone. Do not take a picture or screenshot of your seed phrase. Instead, write it down immediately on a piece of paper and put it in a secret and safe location. Even better, write your seed phrase down on 2-3 pieces of paper and store each paper in a separate secure location (like one in a personal safe and one in a bank safety deposit box). Alternatively, you can download the seed phrase and keep it offline on an encrypted hard drive. Having multiple backups of your seed phrase is good practice just in case one copy is ever lost or destroyed. After documenting your seed phrase, click "Next".</p>
+
+        <p>Nami Wallet will prompt you to input all those words in the next step. You confirm your seed phrase in the correct order of your 24-word sequence. You will also be prompt to input a password, which is needed whenever you have to sign a transaction. You can now access your Nami Wallet via "N" icon in your browser.</p>
+
+        <h2>Step 2: Connect your cryptocurrency wallet on Martify and add collateral</h2>
+
+        <ol>
+          <li><b>Connect wallet</b>: Click on connect and allow access.</li>
+          <li><b>Add collateral</b>: Deposit 5₳ as collateral from Nami Wallet.</li>
+        </ol>
+
+        <p>With Nami Wallet installed, click on "Connect" on the top right corner. It should recognized that you have Nami Wallet installed and it will prompt your for access on the first time. If it does not, you may have to restart your web browser. Click on "Access" to allow Martify to connect to your Nami Wallet.</p>
+
+        <p>The Nami Wallet allows you to deposit a fixed amount (5₳) as collateral to avoid any circumstances that arise due to contract failure. In the event of a contract failure, a collateral is taken to cover the blockchain resources used by the node to verify the contract to avoid network failure. When a script runs successfully, the collateral is not taken. The chances of losing the collateral are very low; however, Nami seeks to minimize the risk by only allowing a determined amount (5₳) of collateral to be used. In a worst case scenario, malicious, or poorly built dApps, it would only be able to take this amount. To deposit ADA into collateral, go to the Setting tab, and click on Collateral. A window will pop up where you need to enter your wallet’s password to confirm the process. At any time, you can remove from collateral by clicking on the "Remove" button.</p>
+
+        <h2>Step 3: List your first NFT</h2>
+
+        <ol>
+          <li><b>Transfer your assets</b>: Send your assets into Nami Wallet.</li>
+          <li><b>List on Martify</b>: Connect and list your NFTs for sale.</li>
+        </ol>
+
+        <p>Now that you have your Nami Wallet, you will want to transfer your assets from other wallets into your new Nami Wallet. For that, you need to get your wallet address, by click on the "Recieve" button, you can copy your Cardano address. It would take a few minutes to get your assets transfer from your wallet to your new Nami Wallet.</p>
+
+        <p>Click on Connect if you have not, and click on Account to browse the assets in your Nami Wallet. Clicking on an asset will bring you to the asset page, here you can see the asset's metadata. On this page, you can set your listing price, your Nami Wallet will prompt you for your password. Sign it to approve the transaction and the NFT will be transfered to the smart contract. If you are unable to list the asset, check that you have connected your wallet and added the collateral.</p>
+
+
+        {/* <h2>How to add royalties?</h2>
+        NFTs can be programmed so that each transaction includes royalties, allowing creators to be rewarded fairly for their work online. The fact that NFTs are created and stored on the blockchain, means they can be traded seamlessly from wallet to wallet, with royalties paid every time they move. On Martify, creators can set royalties up to 10%, and connect us via <a href="https://twitter.com/MartifyLabs">Twitter</a> or <a href="https://twitter.com/MartifyLabs">Discord</a> */}
+
+      </div>
+    </div>
+  );
+};
+
+export default GuideSell;
diff --git a/src/pages/Explore/index.js b/src/pages/Marketplace/index.js
similarity index 98%
rename from src/pages/Explore/index.js
rename to src/pages/Marketplace/index.js
index b7b24ab..eb208dd 100644
--- a/src/pages/Explore/index.js
+++ b/src/pages/Marketplace/index.js
@@ -8,7 +8,7 @@ import { ListingDisplayListing } from "components";
 import "bulma-checkradio/dist/css/bulma-checkradio.min.css";
 import "./style.css";
 
-const Explore = () => {
+const Marketplace = () => {
   const ITEMS_PER_PAGE = 48;
   const dispatch = useDispatch();
   const [isFetching, setIsFetching] = useState(false);
@@ -73,7 +73,7 @@ const Explore = () => {
   };
 
   return (
-    <div className="section explore">
+    <div className="section marketplace">
       <div className="columns">
         <div className="column is-one-quarter-tablet one-fifth-desktop is-one-fifth-widescreen is-one-fifth-fullhd">
           <Filter
@@ -270,4 +270,4 @@ const ListingSection = ({ listings }) => {
   );
 };
 
-export default Explore;
+export default Marketplace;
diff --git a/src/pages/Explore/style.css b/src/pages/Marketplace/style.css
similarity index 74%
rename from src/pages/Explore/style.css
rename to src/pages/Marketplace/style.css
index 040e932..4a34734 100644
--- a/src/pages/Explore/style.css
+++ b/src/pages/Marketplace/style.css
@@ -1,11 +1,11 @@
-.explore .filter .field{
+.marketplace .filter .field{
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
   padding-top: 1px;
 }
 
-.explore .filter_label{
+.marketplace .filter_label{
   cursor: pointer
 }
 
diff --git a/src/pages/index.js b/src/pages/index.js
index 3f09164..085ca0a 100644
--- a/src/pages/index.js
+++ b/src/pages/index.js
@@ -2,7 +2,8 @@ import About from "./About";
 import Account from "./Account";
 import Asset from "./Asset";
 import Collection from "./Collection";
-import Explore from "./Explore";
+//import Explore from "./Explore";
+import Marketplace from "./Marketplace";
 import FAQ from "./FAQ";
 import Guide from "./Guide";
 import GuideBuy from "./GuideBuy";
@@ -14,7 +15,8 @@ export {
     Account,
     Asset,
     Collection,
-    Explore,
+    //Explore,
+    Marketplace,
     FAQ,
     Guide,
     GuideBuy,
diff --git a/src/routes.js b/src/routes.js
index cf4b191..8ce9984 100644
--- a/src/routes.js
+++ b/src/routes.js
@@ -10,7 +10,8 @@ import {
   Guide,
   GuideBuy,
   GuideSell,
-  Explore
+  //Explore, 
+  Marketplace
 } from 'pages'
 
 import { MainLayout } from "layouts";
@@ -42,10 +43,15 @@ const RenderRoutes = () => {
           <Account />
         </MainLayout>
       </Route>
-      <Route exact path="/explore">
+      {/* <Route exact path="/explore">
         <MainLayout>
           <Explore />
         </MainLayout>
+      </Route> */}
+      <Route exact path="/marketplace">
+        <MainLayout>
+          <Marketplace />
+        </MainLayout>
       </Route>
       <Route exact path="/about">
         <MainLayout>
diff --git a/src/store/collection/api.js b/src/store/collection/api.js
index b3edcec..a19616e 100644
--- a/src/store/collection/api.js
+++ b/src/store/collection/api.js
@@ -18,6 +18,12 @@ import {
   getLockedAssets,
 } from "../../database/assets";
 
+import {
+  getOpencnftTopProjects,
+  getOpencnftPolicy,
+} from "../../database/collections";
+
+
 export const load_collection = (callback) => async (dispatch) => {
   let all_collections = {};
 
@@ -237,26 +243,37 @@ export const asset_add_offer =
 
 export const opencnft_get_top_projects =
   (time, callback) => async (dispatch) => {
-    fetch("https://api.opencnft.io/1/rank?window=" + time, {})
-      .then((res) => res.json())
-      .then((res) => {
-        callback({ success: true, data: res.ranking });
-      })
-      .catch((err) => {
-        console.error(err);
-      });
+
+    let rankings = await getOpencnftTopProjects(time);
+    callback({ success: true, data: rankings });
+
+    // old - to be removed - query opencnft without caching
+    // fetch("https://api.opencnft.io/1/rank?window=" + time, {})
+    //   .then((res) => res.json())
+    //   .then((res) => {
+    //     callback({ success: true, data: res.ranking });
+    //   })
+    //   .catch((err) => {
+    //     console.error(err);
+    //   });
   };
 
 export const opencnft_get_policy =
   (policy_id, callback) => async (dispatch) => {
-    fetch(`https://api.opencnft.io/1/policy/${policy_id}`, {})
-      .then((res) => res.json())
-      .then((res) => {
-        callback({ success: true, data: res });
-      })
-      .catch((err) => {
-        console.error(err);
-      });
+
+    let project_stats = await getOpencnftPolicy(policy_id);
+    callback({ success: true, data: project_stats });
+
+    // old - to be removed - query opencnft without caching
+    // fetch(`https://api.opencnft.io/1/policy/${policy_id}`, {})
+    //   .then((res) => res.json())
+    //   .then((res) => {
+    //     console.log(res);
+    //     callback({ success: true, data: res });
+    //   })
+    //   .catch((err) => {
+    //     console.error(err);
+    //   });
   };
 
 export const opencnft_get_asset_tx =
diff --git a/src/utils/converter.js b/src/utils/converter.js
index 40de54c..1ce52cc 100644
--- a/src/utils/converter.js
+++ b/src/utils/converter.js
@@ -21,6 +21,7 @@ export const toString = (bytes) => String.fromCharCode.apply(String, bytes);
 
 export const convertMetadataPropToString = (src) => {
   if (typeof src === "string") return src;
+  else if (typeof src === "object") return Object.values(src).join("");
   else if (Array.isArray(src)) return src.join("");
   return null;
 };
@@ -69,19 +70,21 @@ export const get_asset_image_source = (image) => {
   // return "";
 
   if (image) {
-    if (image.includes("ipfs/")) {
-      image = "ipfs://" + image.split("ipfs/")[1];
+    if (typeof image === 'string') {
+      if (image.includes("ipfs/")) {
+        image = "ipfs://" + image.split("ipfs/")[1];
+      }
     }
     return linkToSrc(convertMetadataPropToString(image));
   }
 };
 
 export const numFormatter = (num) => {
-  if (num > 999 && num < 1000000) {
+  if (num >= 1000 && num < 1000000) {
     return (num / 1000).toFixed(1) + "K"; // convert to K for number from > 1000 < 1 million
   } else if (num > 1000000) {
     return (num / 1000000).toFixed(1) + "M"; // convert to M for number from > 1 million
-  } else if (num < 900) {
+  } else if (num < 1000) {
     return num; // if value < 1000, nothing to do
   }
 };
diff --git a/yarn.lock b/yarn.lock
index 48f8e79..0934037 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9941,6 +9941,11 @@ react-helmet@^6.1.0:
     react-fast-compare "^3.1.1"
     react-side-effect "^2.1.0"
 
+react-html5video@^2.5.1:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/react-html5video/-/react-html5video-2.5.1.tgz#bbc4314be1d583cb991a11ca3480e70a3c964caf"
+  integrity sha1-u8QxS+HVg8uZGhHKNIDnCjyWTK8=
+
 react-infinite-scroll-component@^6.1.0:
   version "6.1.0"
   resolved "https://registry.npmjs.org/react-infinite-scroll-component/-/react-infinite-scroll-component-6.1.0.tgz"