diff --git a/package.json b/package.json
index 06f8befc..2c8296a9 100644
--- a/package.json
+++ b/package.json
@@ -8,11 +8,12 @@
     "@emotion/react": "11.1.4",
     "@emotion/styled": "11.0.0",
     "@reduxjs/toolkit": "1.5.0",
-    "@taquito/beacon-wallet": "8.0.6-beta.0",
-    "@taquito/signer": "8.0.6-beta.0",
-    "@taquito/taquito": "8.0.6-beta.0",
-    "@taquito/tzip16": "8.0.6-beta.0",
-    "@taquito/tzip12": "8.0.6-beta.0",
+    "@taquito/beacon-wallet": "8.1.0",
+    "@taquito/signer": "8.1.0",
+    "@taquito/taquito": "8.1.0",
+    "@taquito/tzip16": "8.1.0",
+    "@taquito/tzip12": "8.1.0",
+    "@tqtezos/minter-contracts": "1.0.3",
     "@types/lodash": "4.14.165",
     "@types/react": "16.9.12",
     "@types/react-dom": "16.9.0",
diff --git a/public/index.html b/public/index.html
index 2462d30d..1bcb0621 100644
--- a/public/index.html
+++ b/public/index.html
@@ -6,10 +6,10 @@
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
     <meta
-      name="description"
-      content="Web site created using create-react-app"
+      name="OpenMinter"
+      content="Create NFTs on Tezos"
     />
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
+    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo.png" />
     <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
diff --git a/public/logo.png b/public/logo.png
new file mode 100644
index 00000000..da6c59f1
Binary files /dev/null and b/public/logo.png differ
diff --git a/public/logo192.png b/public/logo192.png
deleted file mode 100644
index fc44b0a3..00000000
Binary files a/public/logo192.png and /dev/null differ
diff --git a/scripts/bootstrap-contracts-config.ts b/scripts/bootstrap-contracts-config.ts
index 517ea8e2..db7bd7e4 100644
--- a/scripts/bootstrap-contracts-config.ts
+++ b/scripts/bootstrap-contracts-config.ts
@@ -1,28 +1,14 @@
 import fs from 'fs';
 import path from 'path';
 import { $log } from '@tsed/logger';
-import axios from 'axios';
 import retry from 'async-retry';
 import Configstore from 'configstore';
 import { MichelsonMap, TezosToolkit } from '@taquito/taquito';
 import { InMemorySigner } from '@taquito/signer';
-
-interface BoostrapStorageCallback {
-  (): object;
-}
-
-interface BootstrapContractParams {
-  configKey: string;
-  contractFilename: string;
-  contractGitHash: string;
-  contractAlias: string;
-  initStorage: BoostrapStorageCallback;
-}
-
-interface ContractCodeResponse {
-  code: string;
-  url: string;
-}
+import {
+  Fa2MultiNftFaucetCode,
+  FixedPriceSaleMarketTezCode
+} from '@tqtezos/minter-contracts';
 
 function toHexString(input: string) {
   return Buffer.from(input).toString('hex');
@@ -63,16 +49,6 @@ async function getContractAddress(
     .catch(() => '');
 }
 
-async function fetchContractCode(
-  contractFilename: string,
-  contractGitHash: string
-): Promise<ContractCodeResponse> {
-  const rawRepoUrl = 'https://raw.githubusercontent.com/tqtezos/minter-sdk';
-  const contractCodeUrl = `${rawRepoUrl}/${contractGitHash}/contracts/bin/${contractFilename}`;
-  const response = await axios.get(contractCodeUrl);
-  return { code: response.data, url: contractCodeUrl };
-}
-
 async function waitForNetwork(toolkit: TezosToolkit): Promise<void> {
   await retry(async () => await toolkit.rpc.getBlockHeader({ block: '2' }), {
     retries: 8
@@ -115,6 +91,17 @@ function readEnv(): string {
   return env;
 }
 
+interface BoostrapStorageCallback {
+  (): object;
+}
+
+interface BootstrapContractParams {
+  configKey: string;
+  contractAlias: string;
+  contractCode: object[];
+  initStorage: BoostrapStorageCallback;
+}
+
 async function bootstrapContract(
   config: Configstore,
   toolkit: TezosToolkit,
@@ -130,18 +117,11 @@ async function bootstrapContract(
 
   let contract;
   try {
-    const { code, url: contractCodeUrl } = await fetchContractCode(
-      params.contractFilename,
-      params.contractGitHash
-    );
-
-    $log.info(
-      `Originating ${params.contractAlias} contract from ${contractCodeUrl} ...`
-    );
+    $log.info(`Originating ${params.contractAlias} contract...`);
 
     const storage = params.initStorage();
     const origOp = await toolkit.contract.originate({
-      code: code,
+      code: params.contractCode,
       storage: storage
     });
 
@@ -176,8 +156,7 @@ async function bootstrap(env: string) {
   await bootstrapContract(bootstrappedConfig, toolkit, {
     configKey: 'contracts.nftFaucet',
     contractAlias: 'nftFaucet',
-    contractFilename: 'fa2_multi_nft_faucet.tz',
-    contractGitHash: 'aec441412d53653fa0048fee7c12c1eb1365909b',
+    contractCode: Fa2MultiNftFaucetCode.code,
     initStorage: initStorageNftFaucet
   });
 
@@ -185,9 +164,8 @@ async function bootstrap(env: string) {
   await bootstrapContract(bootstrappedConfig, toolkit, {
     configKey: 'contracts.marketplace.fixedPrice.tez',
     contractAlias: 'fixedPriceMarketTez',
-    contractFilename: 'fixed_price_sale_market_tez.tz',
-    contractGitHash: '8f67bb8c2abc12b8e6f8e529e1412262972deab3',
-    initStorage: () => new MichelsonMap()
+    contractCode: FixedPriceSaleMarketTezCode.code,
+    initStorage: () => ({ sales: new MichelsonMap() })
   });
 }
 
diff --git a/src/components/App/index.tsx b/src/components/App/index.tsx
index aeef2417..bb92cc2f 100644
--- a/src/components/App/index.tsx
+++ b/src/components/App/index.tsx
@@ -3,6 +3,7 @@ import { Switch, Route } from 'wouter';
 import SplashPage from '../SplashPage';
 import CreateNonFungiblePage from '../CreateNonFungiblePage';
 import CollectionsCatalog from '../Collections/Catalog';
+import CollectionDisplay from '../Collections/Catalog/CollectionDisplay';
 import CollectionsTokenDetail from '../Collections/TokenDetail';
 import MarketplaceCatalog from '../Marketplace/Catalog';
 import Header from '../common/Header';
@@ -10,13 +11,20 @@ import { Flex } from '@chakra-ui/react';
 import Notifications from '../common/Notifications';
 import { useSelector, useDispatch } from '../../reducer';
 import { reconnectWallet } from '../../reducer/async/wallet';
+import { getMarketplaceNftsQuery } from '../../reducer/async/queries';
 
 export default function App() {
   const dispatch = useDispatch();
-  const walletReconnectAttempted = useSelector(
-    s => s.system.walletReconnectAttempted
+  const state = useSelector(
+    s => s
   );
 
+  let walletReconnectAttempted = state.system.walletReconnectAttempted
+
+  useEffect(() => {
+    dispatch(getMarketplaceNftsQuery(state.marketplace.marketplace.address));
+  }, [ state.marketplace.marketplace.address, dispatch ]);
+
   useEffect(() => {
     if (!walletReconnectAttempted) {
       dispatch(reconnectWallet());
@@ -44,6 +52,11 @@ export default function App() {
           <Route path="/marketplace">
             <MarketplaceCatalog />
           </Route>
+          <Route path="/collection/:contractAddress">
+            {({ contractAddress }) => (
+              <CollectionDisplay address={contractAddress} ownedOnly={false} />
+            )}
+          </Route>
           <Route path="/collection/:contractAddress/token/:tokenId">
             {({ contractAddress, tokenId }) => (
               <CollectionsTokenDetail
diff --git a/src/components/Collections/Catalog/CollectionDisplay.tsx b/src/components/Collections/Catalog/CollectionDisplay.tsx
new file mode 100644
index 00000000..f143081d
--- /dev/null
+++ b/src/components/Collections/Catalog/CollectionDisplay.tsx
@@ -0,0 +1,299 @@
+import React, { useEffect, useState } from 'react';
+import { useLocation } from 'wouter';
+import {
+  AspectRatio,
+  Box,
+  Flex,
+  Heading,
+  Image,
+  Link,
+  SimpleGrid,
+  Spinner,
+  Text
+} from '@chakra-ui/react';
+import { MinterButton } from '../../common';
+import { RefreshCw, ExternalLink, Wind, HelpCircle } from 'react-feather';
+import { Token } from '../../../reducer/slices/collections';
+import { ipfsUriToGatewayUrl } from '../../../lib/util/ipfs';
+import { useDispatch, useSelector } from '../../../reducer';
+import { getContractNftsQuery } from '../../../reducer/async/queries';
+import CollectionsDropdown from './CollectionsDropdown';
+
+function MediaNotFound() {
+  return (
+    <Flex
+      flexDir="column"
+      align="center"
+      justify="center"
+      flex="1"
+      bg="gray.100"
+      color="gray.300"
+      height="100%"
+    >
+      <HelpCircle size="70px" />
+    </Flex>
+  );
+}
+
+function TokenImage(props: { src: string }) {
+  const [errored, setErrored] = useState(false);
+  const [obj, setObj] = useState<{ url: string; type: string } | null>(null);
+  useEffect(() => {
+    (async () => {
+      let blob;
+      try {
+        blob = await fetch(props.src).then(r => r.blob());
+      } catch (e) {
+        return setErrored(true);
+      }
+      setObj({
+        url: URL.createObjectURL(blob),
+        type: blob.type
+      });
+    })();
+  }, [props.src]);
+
+  if (errored) {
+    return <MediaNotFound />;
+  }
+
+  if (!obj) return null;
+
+  if (/^image\/.*/.test(obj.type)) {
+    return (
+      <Image
+        src={props.src}
+        objectFit="scale-down"
+        flex="1"
+        height="100%"
+        onError={() => setErrored(true)}
+      />
+    );
+  }
+
+  if (/^video\/.*/.test(obj.type)) {
+    return (
+      <video
+        loop
+        onClick={e => e.preventDefault()}
+        onMouseEnter={e => e.currentTarget.play()}
+        onMouseLeave={e => e.currentTarget.pause()}
+      >
+        <source src={obj.url} type={obj.type} />
+      </video>
+    );
+  }
+
+  return <MediaNotFound />;
+}
+
+interface TokenTileProps extends Token {
+  network: string;
+  address: string;
+}
+
+function TokenTile(props: TokenTileProps) {
+  const [, setLocation] = useLocation();
+  return (
+    <Flex
+      flexDir="column"
+      ratio={1}
+      w="100%"
+      bg="white"
+      border="1px solid"
+      borderColor="brand.lightBlue"
+      borderRadius="3px"
+      overflow="hidden"
+      boxShadow="0px 0px 0px 4px rgba(15, 97, 255, 0)"
+      transition="all linear 50ms"
+      _hover={{
+        cursor: 'pointer',
+        boxShadow: '0px 0px 0px 4px rgba(15, 97, 255, 0.1)'
+      }}
+      onClick={() =>
+        setLocation(`/collection/${props.address}/token/${props.id}`)
+      }
+    >
+      <AspectRatio ratio={3 / 2}>
+        <Box p={4}>
+          <TokenImage
+            src={ipfsUriToGatewayUrl(props.network, props.artifactUri)}
+          />
+        </Box>
+      </AspectRatio>
+      <Flex
+        width="100%"
+        px={4}
+        py={4}
+        bg="white"
+        borderTop="1px solid"
+        borderColor="brand.lightBlue"
+      >
+        <Text>{props.title}</Text>
+      </Flex>
+    </Flex>
+  );
+}
+
+interface CollectionDisplayProps {
+  address: string | null;
+  ownedOnly?: boolean;
+}
+
+export default function CollectionDisplay({
+  address,
+  ownedOnly = true
+}: CollectionDisplayProps) {
+  const collections = useSelector(s => s.collections);
+  const { config, tzPublicKey, wallet } = useSelector(s => s.system);
+  const dispatch = useDispatch();
+
+  useEffect(() => {
+    if (address !== null) {
+      dispatch(getContractNftsQuery(address));
+    }
+  }, [address, dispatch]);
+
+  if (address === null) {
+    return <></>;
+  }
+
+  const collection = collections.collections[address];
+
+  if (!collection) {
+    return <></>;
+  }
+
+  if (!collection.loaded) {
+    return (
+      <Flex flexDir="column" align="center" flex="1" pt={20}>
+        <Spinner size="xl" mb={6} color="gray.300" />
+        <Heading size="lg" textAlign="center" color="gray.500">
+          Loading...
+        </Heading>
+      </Flex>
+    );
+  }
+
+  if (collection.tokens === null) {
+    return <></>;
+  }
+
+  const tokens = ownedOnly
+    ? collection.tokens.filter(
+        ({ owner, sale }) =>
+          owner === tzPublicKey || sale?.seller === tzPublicKey
+      )
+    : collection.tokens;
+
+  if (tokens.length === 0) {
+    return (
+      <Flex w="100%" flex="1" flexDir="column" align="center">
+        <Flex
+          px={20}
+          py={10}
+          bg="gray.200"
+          textAlign="center"
+          align="center"
+          borderRadius="5px"
+          flexDir="column"
+          fontSize="xl"
+          color="gray.400"
+          mt={28}
+        >
+          <Wind />
+          <Text fontWeight="600" pt={5}>
+            {ownedOnly
+              ? 'No owned tokens to display in this collection'
+              : 'No tokens to display in this collection'}
+          </Text>
+        </Flex>
+      </Flex>
+    );
+  }
+
+  return (
+    <Flex
+      flexDir="column"
+      h="100%"
+      w="100%"
+      px={{ base: 6, md: 10 }}
+      pt={6}
+      flex="1"
+      bg="brand.brightGray"
+      borderLeftWidth="1px"
+      borderLeftColor="brand.lightBlue"
+      overflowY="scroll"
+      justify="start"
+    >
+      {ownedOnly && wallet !== null ? (
+        <Flex display={{ base: 'flex', md: 'none' }} mb={4}>
+          <CollectionsDropdown />
+        </Flex>
+      ) : null}
+      <Flex
+        w="100%"
+        pb={6}
+        justify="space-between"
+        align={{
+          base: 'flex-start',
+          md: 'center'
+        }}
+        flexDir={{
+          base: 'column',
+          md: 'row'
+        }}
+      >
+        <Flex flexDir="column" width="100%">
+          <Flex justify="space-between" width="100%">
+            <Heading size="lg">{collection.metadata.name || ''}</Heading>
+          </Flex>
+          <Flex align="center" display={{ base: 'none', md: 'flex' }}>
+            <Text fontFamily="mono" color="brand.lightGray">
+              {collection.address}
+            </Text>
+            <Link
+              href={config.bcd.gui + '/' + collection.address}
+              color="brand.darkGray"
+              isExternal
+              ml={2}
+            >
+              <ExternalLink size={16} />
+            </Link>
+          </Flex>
+        </Flex>
+        <MinterButton
+          display={{ base: 'none', md: 'flex' }}
+          variant="primaryActionInverted"
+          onClick={() => {
+            const selectedCollection = collections.selectedCollection;
+            if (selectedCollection !== null) {
+              dispatch(getContractNftsQuery(selectedCollection));
+            }
+          }}
+          mt={{
+            base: 4,
+            md: 0
+          }}
+        >
+          <Box color="currentcolor">
+            <RefreshCw size={16} strokeWidth="3" />
+          </Box>
+          <Text ml={2}>Refresh</Text>
+        </MinterButton>
+      </Flex>
+      <SimpleGrid columns={{ sm: 1, md: 2, lg: 3, xl: 4 }} gap={8} pb={8}>
+        {tokens.map(token => {
+          return (
+            <TokenTile
+              key={token.id}
+              address={address}
+              network={config.network}
+              {...token}
+            />
+          );
+        })}
+      </SimpleGrid>
+    </Flex>
+  );
+}
diff --git a/src/components/Collections/Catalog/CollectionsDropdown.tsx b/src/components/Collections/Catalog/CollectionsDropdown.tsx
index 0976b938..7e062eb0 100644
--- a/src/components/Collections/Catalog/CollectionsDropdown.tsx
+++ b/src/components/Collections/Catalog/CollectionsDropdown.tsx
@@ -12,55 +12,84 @@ import {
 } from '@chakra-ui/react';
 import { useSelector, useDispatch } from '../../../reducer';
 import { selectCollection } from '../../../reducer/slices/collections';
-import { ChevronDown } from 'react-feather';
+import { ChevronDown, RefreshCw } from 'react-feather';
+import { getContractNftsQuery } from '../../../reducer/async/queries';
 
 export default function CollectionsDropdown() {
   const state = useSelector(s => s.collections);
   const dispatch = useDispatch();
 
   return (
-    <Menu>
-      <MenuButton as={Button} border="1px solid" borderColor="brand.gray">
-        <Flex align="center">
-          <Box mr={3}>
-            <ChevronDown />
-          </Box>
-          Collections
-        </Flex>
-      </MenuButton>
-      <MenuList>
-        <MenuOptionGroup
-          type="radio"
-          defaultValue={state.selectedCollection || ''}
+    <Flex width="100%" align="center">
+      <Menu>
+        <MenuButton
+          as={Button}
+          border="1px solid"
+          borderColor="brand.gray"
+          flex="1"
         >
-          <Text ml={4} my={2} fontWeight="600">
-            Featured
-          </Text>
-          <MenuItemOption
-            key={state.globalCollection}
-            selected={state.globalCollection === state.selectedCollection}
-            value={state.globalCollection}
-            onSelect={() => dispatch(selectCollection(state.globalCollection))}
+          <Flex align="center">
+            <Box mr={3}>
+              <ChevronDown />
+            </Box>
+            {state.selectedCollection
+              ? state.collections[state.selectedCollection].metadata.name
+              : '-'}
+          </Flex>
+        </MenuButton>
+        <MenuList>
+          <MenuOptionGroup
+            type="radio"
+            defaultValue={state.selectedCollection || ''}
           >
-            {state.collections[state.globalCollection].metadata.name}
-          </MenuItemOption>
-          <Text ml={4} my={2} fontWeight="600">
-            Your Collections
-          </Text>
-          {Object.keys(state.collections)
-            .filter(address => address !== state.globalCollection)
-            .map(address => (
-              <MenuItemOption
-                key={address}
-                value={address}
-                selected={address === state.selectedCollection}
-                onClick={() => dispatch(selectCollection(address))}
-              >
-                {state.collections[address].metadata.name}
-              </MenuItemOption>
-            ))}
-        </MenuOptionGroup>
-      </MenuList>
-    </Menu>
+            <Text ml={4} my={2} fontWeight="600">
+              Featured
+            </Text>
+            <MenuItemOption
+              key={state.globalCollection}
+              selected={state.globalCollection === state.selectedCollection}
+              value={state.globalCollection}
+              onSelect={() =>
+                dispatch(selectCollection(state.globalCollection))
+              }
+            >
+              {state.collections[state.globalCollection].metadata.name}
+            </MenuItemOption>
+            <Text ml={4} my={2} fontWeight="600">
+              Your Collections
+            </Text>
+            {Object.keys(state.collections)
+              .filter(address => address !== state.globalCollection)
+              .map(address => (
+                <MenuItemOption
+                  key={address}
+                  value={address}
+                  selected={address === state.selectedCollection}
+                  onClick={() => dispatch(selectCollection(address))}
+                >
+                  {state.collections[address].metadata.name}
+                </MenuItemOption>
+              ))}
+          </MenuOptionGroup>
+        </MenuList>
+      </Menu>
+      <Box
+        color="brand.blue"
+        onClick={() => {
+          const selectedCollection = state.selectedCollection;
+          if (selectedCollection !== null) {
+            dispatch(getContractNftsQuery(selectedCollection));
+          }
+        }}
+        padding={2}
+        borderRadius="5px"
+        border="1px solid"
+        borderColor="brand.blue"
+        marginLeft={3}
+        cursor="pointer"
+      >
+        <RefreshCw size={20} strokeWidth="3" />
+      </Box>
+    </Flex>
   );
 }
diff --git a/src/components/Collections/Catalog/Sidebar.tsx b/src/components/Collections/Catalog/Sidebar.tsx
index b0fe3a9e..42fedd83 100644
--- a/src/components/Collections/Catalog/Sidebar.tsx
+++ b/src/components/Collections/Catalog/Sidebar.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Flex, Heading, Text } from '@chakra-ui/react';
-import { CreateCollectionButton } from '../../common/CreateCollection';
+import { CreateCollectionButton } from '../../common/modals/CreateCollection';
 import { useSelector, useDispatch } from '../../../reducer';
 import {
   selectCollection,
diff --git a/src/components/Collections/Catalog/TokenGrid.tsx b/src/components/Collections/Catalog/TokenGrid.tsx
deleted file mode 100644
index f11a131a..00000000
--- a/src/components/Collections/Catalog/TokenGrid.tsx
+++ /dev/null
@@ -1,185 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { useLocation } from 'wouter';
-import { AspectRatio, Box, Flex, SimpleGrid, Image, Text } from '@chakra-ui/react';
-import { Wind, HelpCircle } from 'react-feather';
-import { Token, CollectionsState } from '../../../reducer/slices/collections';
-import { ipfsUriToGatewayUrl } from '../../../lib/util/ipfs';
-import { useSelector } from '../../../reducer';
-
-interface TokenTileProps extends Token {
-  network: string;
-  selectedCollection: string;
-}
-
-function MediaNotFound() {
-  return (
-    <Flex
-      flexDir="column"
-      align="center"
-      justify="center"
-      flex="1"
-      bg="gray.100"
-      color="gray.300"
-      height="100%"
-    >
-      <HelpCircle size="70px" />
-    </Flex>
-  );
-}
-
-function TokenImage(props: { src: string }) {
-  const [errored, setErrored] = useState(false);
-  const [obj, setObj] = useState<{ url: string; type: string } | null>(null);
-  useEffect(() => {
-    (async () => {
-      let blob;
-      try {
-        blob = await fetch(props.src).then(r => r.blob());
-      } catch (e) {
-        return setErrored(true);
-      }
-      setObj({
-        url: URL.createObjectURL(blob),
-        type: blob.type
-      });
-    })();
-  }, [props.src]);
-
-  if (errored) {
-    return <MediaNotFound />;
-  }
-
-  if (!obj) return null;
-
-  if (/^image\/.*/.test(obj.type)) {
-    return (
-      <Image
-        src={props.src}
-        objectFit="contain"
-        flex="1"
-        onError={() => setErrored(true)}
-      />
-    );
-  }
-
-  if (/^video\/.*/.test(obj.type)) {
-    return (
-      <video
-        loop
-        onClick={e => e.preventDefault()}
-        onMouseEnter={e => e.currentTarget.play()}
-        onMouseLeave={e => e.currentTarget.pause()}
-      >
-        <source src={obj.url} type={obj.type} />
-      </video>
-    );
-  }
-
-  return <MediaNotFound />;
-}
-
-function TokenTile(props: TokenTileProps) {
-  const [, setLocation] = useLocation();
-  return (
-    <Flex
-      flexDir="column"
-      ratio={1}
-      w="100%"
-      bg="white"
-      border="1px solid"
-      borderColor="brand.lightBlue"
-      borderRadius="3px"
-      overflow="hidden"
-      boxShadow="0px 0px 0px 4px rgba(15, 97, 255, 0)"
-      transition="all linear 50ms"
-      _hover={{
-        cursor: 'pointer',
-        boxShadow: '0px 0px 0px 4px rgba(15, 97, 255, 0.1)'
-      }}
-      onClick={() =>
-        setLocation(`/collection/${props.selectedCollection}/token/${props.id}`)
-      }
-    >
-      <AspectRatio ratio={3 / 2}>
-        <Box p={4}>
-          <TokenImage
-            src={ipfsUriToGatewayUrl(props.network, props.artifactUri)}
-          />
-        </Box>
-      </AspectRatio>
-      <Flex
-        width="100%"
-        px={4}
-        py={4}
-        bg="white"
-        borderTop="1px solid"
-        borderColor="brand.lightBlue"
-      >
-        <Text>{props.title}</Text>
-      </Flex>
-    </Flex>
-  );
-}
-
-interface TokenGridProps {
-  state: CollectionsState;
-  walletAddress: string;
-}
-
-export default function TokenGrid({ state, walletAddress }: TokenGridProps) {
-  const network = useSelector(s => s.system.config.network);
-  const selectedCollection = state.selectedCollection;
-
-  if (selectedCollection === null) {
-    return <></>;
-  }
-
-  const collection = state.collections[selectedCollection];
-
-  if (!collection || collection.tokens === null) {
-    return <></>;
-  }
-
-  const tokens = collection.tokens.filter(
-    ({ owner, sale }) => owner === walletAddress || sale?.seller === walletAddress
-  );
-
-  if (tokens.length === 0) {
-    return (
-      <Flex w="100%" flex="1" flexDir="column" align="center">
-        <Flex
-          px={20}
-          py={10}
-          bg="gray.200"
-          textAlign="center"
-          align="center"
-          borderRadius="5px"
-          flexDir="column"
-          fontSize="xl"
-          color="gray.400"
-          mt={28}
-        >
-          <Wind />
-          <Text fontWeight="600" pt={5}>
-            No owned tokens to display in this collection
-          </Text>
-        </Flex>
-      </Flex>
-    );
-  }
-
-  return (
-    <SimpleGrid columns={{sm: 1, md: 2, lg: 3, xl: 4}} gap={8} pb={8}>
-      {tokens.map(token => {
-        return (
-          <TokenTile
-            key={token.id}
-            selectedCollection={selectedCollection}
-            network={network}
-            {...token}
-          />
-        );
-      })}
-    </SimpleGrid>
-  );
-}
diff --git a/src/components/Collections/Catalog/index.tsx b/src/components/Collections/Catalog/index.tsx
index bbe8c1fd..6f14915e 100644
--- a/src/components/Collections/Catalog/index.tsx
+++ b/src/components/Collections/Catalog/index.tsx
@@ -1,37 +1,23 @@
 import React, { useEffect } from 'react';
-import { Box, Flex, Heading, Text, Link, Spinner } from '@chakra-ui/react';
+import { Flex } from '@chakra-ui/react';
 import { useLocation } from 'wouter';
-import { RefreshCw, ExternalLink } from 'react-feather';
-import { MinterButton } from '../../common';
 import Sidebar from './Sidebar';
-import TokenGrid from './TokenGrid';
-import CollectionsDropdown from './CollectionsDropdown';
-
+import CollectionDisplay from './CollectionDisplay';
 import { useSelector, useDispatch } from '../../../reducer';
-import {
-  getContractNftsQuery,
-  getWalletAssetContractsQuery
-} from '../../../reducer/async/queries';
+import { getWalletAssetContractsQuery } from '../../../reducer/async/queries';
 import { selectCollection } from '../../../reducer/slices/collections';
 
 export default function Catalog() {
   const [, setLocation] = useLocation();
-  const { system, collections: state } = useSelector(s => s);
+  const system = useSelector(s => s.system);
+  const collections = useSelector(s => s.collections);
   const dispatch = useDispatch();
 
   useEffect(() => {
-    const selectedCollection = state.selectedCollection;
-    if (selectedCollection === null) {
-      dispatch(selectCollection(state.globalCollection));
-    } else {
-      dispatch(getContractNftsQuery(selectedCollection));
+    if (collections.selectedCollection === null) {
+      dispatch(selectCollection(collections.globalCollection));
     }
-  }, [
-    system.status,
-    state.selectedCollection,
-    state.globalCollection,
-    dispatch
-  ]);
+  }, [collections.selectedCollection, collections.globalCollection, dispatch]);
 
   useEffect(() => {
     if (system.status !== 'WalletConnected') {
@@ -41,13 +27,11 @@ export default function Catalog() {
     }
   }, [system.status, setLocation, dispatch]);
 
-  const selectedCollection = state.selectedCollection;
+  const selectedCollection = collections.selectedCollection;
   if (system.status !== 'WalletConnected' || !selectedCollection) {
     return null;
   }
 
-  const collection = state.collections[selectedCollection];
-
   return (
     <Flex
       flex="1"
@@ -70,83 +54,7 @@ export default function Catalog() {
       >
         <Sidebar />
       </Flex>
-      <Flex
-        flexDir="column"
-        h="100%"
-        w="100%"
-        px={10}
-        pt={6}
-        flex="1"
-        bg="brand.brightGray"
-        borderLeftWidth="1px"
-        borderLeftColor="brand.lightBlue"
-        overflowY="scroll"
-        justify="start"
-      >
-        <Flex
-          w="100%"
-          pb={6}
-          justify="space-between"
-          align={{
-            base: 'flex-start',
-            md: 'center'
-          }}
-          flexDir={{
-            base: 'column',
-            md: 'row'
-          }}
-        >
-          <Flex flexDir="column" width="100%">
-            <Flex justify="space-between" width="100%">
-              <Heading size="lg">{collection.metadata.name || ''}</Heading>
-              <Flex display={{ base: 'flex', md: 'none' }}>
-                <CollectionsDropdown />
-              </Flex>
-            </Flex>
-            <Flex align="center">
-              <Text fontFamily="mono" color="brand.lightGray">
-                {collection.address}
-              </Text>
-              <Link
-                href={system.config.bcd.gui + '/' + collection.address}
-                color="brand.darkGray"
-                isExternal
-                ml={2}
-              >
-                <ExternalLink size={16} />
-              </Link>
-            </Flex>
-          </Flex>
-          <MinterButton
-            variant="primaryActionInverted"
-            onClick={() => {
-              const selectedCollection = state.selectedCollection;
-              if (selectedCollection !== null) {
-                dispatch(getContractNftsQuery(selectedCollection));
-              }
-            }}
-            mt={{
-              base: 4,
-              md: 0
-            }}
-          >
-            <Box color="currentcolor">
-              <RefreshCw size={16} strokeWidth="3" />
-            </Box>
-            <Text ml={2}>Refresh</Text>
-          </MinterButton>
-        </Flex>
-        {!collection.loaded ? (
-          <Flex flexDir="column" align="center" flex="1" pt={20}>
-            <Spinner size="xl" mb={6} color="gray.300" />
-            <Heading size="lg" textAlign="center" color="gray.500">
-              Loading...
-            </Heading>
-          </Flex>
-        ) : (
-          <TokenGrid state={state} walletAddress={system.tzPublicKey} />
-        )}
-      </Flex>
+      <CollectionDisplay address={selectedCollection} />
     </Flex>
   );
 }
diff --git a/src/components/Collections/TokenDetail/index.tsx b/src/components/Collections/TokenDetail/index.tsx
index 4f31c4c4..f3086da2 100644
--- a/src/components/Collections/TokenDetail/index.tsx
+++ b/src/components/Collections/TokenDetail/index.tsx
@@ -1,5 +1,4 @@
 import React, { useEffect, useState } from 'react';
-import { useLocation } from 'wouter';
 import {
   Accordion,
   AccordionButton,
@@ -17,7 +16,6 @@ import {
   Modal,
   ModalCloseButton,
   ModalContent,
-  ModalOverlay,
   ResponsiveValue,
   Slider,
   SliderFilledTrack,
@@ -28,9 +26,10 @@ import {
 } from '@chakra-ui/react';
 import { ChevronLeft, HelpCircle, MoreHorizontal, Star } from 'react-feather';
 import { MinterButton, MinterMenuButton, MinterMenuItem } from '../../common';
-import { TransferTokenModal } from '../../common/TransferToken';
-import { SellTokenButton, CancelTokenSaleButton } from '../../common/SellToken';
-import { BuyTokenButton } from '../../common/BuyToken';
+import { TransferTokenModal } from '../../common/modals/TransferToken';
+import { SellTokenButton } from '../../common/modals/SellToken';
+import { CancelTokenSaleButton } from '../../common/modals/CancelTokenSale';
+import { BuyTokenButton } from '../../common/modals/BuyToken';
 import { ipfsUriToGatewayUrl } from '../../../lib/util/ipfs';
 import { useSelector, useDispatch } from '../../../reducer';
 import {
@@ -94,6 +93,7 @@ function TokenImage(props: {
   src: string;
   width?: string;
   maxWidth?: string;
+  maxHeight?: string;
   height?: string;
   objectFit?: ResponsiveValue<any>;
   onLoad?: (event: React.SyntheticEvent<HTMLImageElement, Event>) => void;
@@ -128,9 +128,13 @@ function TokenImage(props: {
         id={props.id || 'assetImage'}
         key={props.id || 'assetImage'}
         src={props.src}
-        objectFit={props.objectFit}
+        objectFit={props.objectFit ?? "scale-down"}
+        flex="1"
+        height={props.height ?? "100%"}
+        width={props.width}
+        maxWidth={props.maxWidth}
+        maxHeight={props.maxHeight ?? 'unset'}
         onError={() => setErrored(true)}
-        height={props.height}
         onLoad={props.onLoad}
       />
     );
@@ -138,7 +142,15 @@ function TokenImage(props: {
 
   if (/^video\/.*/.test(obj.type)) {
     return (
-      <video controls style={{ margin: 'auto', height: '100%' }}>
+      <video
+        controls
+        style={{
+          margin: 'auto', height: props.height || '100%',
+          width: props.width,
+          maxWidth: props.maxWidth ?? 'unset',
+          maxHeight: props.maxHeight ?? 'unset'
+        }}
+      >
         <source src={obj.url} type={obj.type} />
       </video>
     );
@@ -153,18 +165,16 @@ interface TokenDetailProps {
 }
 
 function TokenDetail({ contractAddress, tokenId }: TokenDetailProps) {
-  const [, setLocation] = useLocation();
   const { system, collections: state } = useSelector(s => s);
   const disclosure = useDisclosure();
   const dispatch = useDispatch();
   const collection = state.collections[contractAddress];
   const { isOpen, onOpen, onClose } = useDisclosure();
   const [zoom, setZoom] = useState(0);
-  const [initialZoom, setInitialZoom] = useState(0);
-  const [imageHeight, setImageHeight] = useState(0);
-  const [imageWidth, setImageWidth] = useState(0);
-  const [mediaType, setMediaType] = useState('');
-  const [shouldScroll, setShouldScroll] = useState(false);
+  const [initialZoom] = useState(0);
+  const [imageHeight] = useState(0);
+  const [imageWidth] = useState(0);
+  const [mediaType] = useState('');
 
   const collectionUndefined = collection === undefined;
 
@@ -187,9 +197,8 @@ function TokenDetail({ contractAddress, tokenId }: TokenDetailProps) {
       img.style.width = `${imageWidth * zoom}px`;
       img.style.height = `${imageHeight * zoom}px`;
       if (isPortrait && imageHeight > imageWidth) {
-        img.style.margin = `calc((((${
-          imageHeight - wHeight
-        }px) / 2) * ${initialZoom} - 80px) * ${1 - zoom}) auto`;
+        img.style.margin = `calc((((${imageHeight - wHeight
+          }px) / 2) * ${initialZoom} - 80px) * ${1 - zoom}) auto`;
       }
     }
   }, [imageHeight, imageWidth, initialZoom, zoom]);
@@ -216,44 +225,20 @@ function TokenDetail({ contractAddress, tokenId }: TokenDetailProps) {
         size="full"
         scrollBehavior="inside"
       >
-        <ModalOverlay />
         <ModalContent
-          overflow="auto"
-          m="1rem"
-          maxHeight="calc(100vh - 2rem)"
-          display="unset"
-          onLoad={e => {
-            const img = document.getElementById('fullScreenAssetView');
-            const wHeight = window.innerHeight - 80;
-            const wWidth = window.innerWidth - 32;
-            const isLandscape = wHeight < wWidth;
-            const isPortrait = wHeight > wWidth;
-
-            if (img) {
-              if (!shouldScroll) {
-                img.style.margin = `calc(${
-                  (e.currentTarget.scrollHeight - imageHeight) / 2
-                }px - 3rem) auto`;
-              }
-              if (isLandscape) {
-                if (imageHeight > e.currentTarget.scrollHeight) {
-                  img.style.height = `calc(100% - 3rem)`;
-                  img.style.margin = 'auto';
-                } else if (imageWidth > e.currentTarget.scrollWidth) {
-                  img.style.width = `100%`;
-                  img.style.paddingTop = `calc(25% - 3rem)`;
-                }
-              } else if (isPortrait) {
-                if (imageHeight > e.currentTarget.scrollHeight) {
-                  img.style.margin = `calc(((${
-                    imageHeight - e.currentTarget.scrollHeight
-                  }px) / 2) * ${initialZoom} - 80px) auto`;
-                } else if (imageWidth > e.currentTarget.scrollWidth) {
-                  img.style.paddingTop = `calc(25% - 3rem)`;
-                }
-              }
-            }
-          }}
+          height="100vh"
+          maxHeight="unset"
+          width="100vw"
+          display="flex"
+          flexDirection="column"
+          flexWrap="nowrap"
+          justifyContent="center"
+          alignItems="center"
+          position="relative"
+          backgroundColor="#333333f9"
+          zIndex="2000"
+          margin="0 !important"
+          borderRadius="0"
         >
           {/^image\/.*/.test(mediaType) ? (
             <Flex
@@ -263,7 +248,6 @@ function TokenDetail({ contractAddress, tokenId }: TokenDetailProps) {
               top={0}
               left={0}
             >
-              <ModalCloseButton position="relative" left={0} top={0} />
               <Slider
                 defaultValue={initialZoom}
                 min={initialZoom}
@@ -280,13 +264,19 @@ function TokenDetail({ contractAddress, tokenId }: TokenDetailProps) {
               </Slider>
             </Flex>
           ) : (
-            <ModalCloseButton />
+            ''
           )}
 
           <TokenImage
             id="fullScreenAssetView"
             src={ipfsUriToGatewayUrl(system.config.network, token.artifactUri)}
+            width="auto"
+            height="auto"
+            maxWidth="85%"
+            maxHeight="85%"
+            objectFit="contain"
           />
+          <ModalCloseButton position="absolute" right="0 !important" bottom="0 !important" display="block !important" fontSize="18px" top="unset" borderLeft="2px solid #aaa" color="white" borderTop="2px solid #aaa" width="4rem" height="4rem" borderRight="none" borderBottom="none" borderBottomStartRadius="0" borderBottomEndRadius="0" borderTopEndRadius="0" border="0" />
         </ModalContent>
       </Modal>
       <Flex pt={8} px={8}>
@@ -294,19 +284,18 @@ function TokenDetail({ contractAddress, tokenId }: TokenDetailProps) {
           variant="primaryActionInverted"
           onClick={e => {
             e.preventDefault();
-            setLocation('/collections', { replace: true });
+            window.history.back();
           }}
         >
           <Box color="currentcolor">
             <ChevronLeft size={16} strokeWidth="3" />
           </Box>
-          <Text ml={2}>Collections</Text>
         </MinterButton>
       </Flex>
       <Flex
         align="center"
         flex="1"
-        pb={[4, 16]}
+        pb={4}
         px={[4, 16]}
         mx="auto"
         width={['90%', '70%']}
@@ -315,41 +304,10 @@ function TokenDetail({ contractAddress, tokenId }: TokenDetailProps) {
       >
         <TokenImage
           src={ipfsUriToGatewayUrl(system.config.network, token.artifactUri)}
-          height="85%"
-          onLoad={e => {
-            const iHeight = e.currentTarget.height;
-            const iWidth = e.currentTarget.width;
-            const wHeight = window.innerHeight - 80;
-            const wWidth = window.innerWidth - 32;
-            const isLandscape = wHeight < wWidth;
-            const isPortrait = wWidth < wHeight;
-
-            const isImageBiggerThanModal = iHeight > wHeight || iWidth > wWidth;
-
-            setShouldScroll(isImageBiggerThanModal);
-
-            if (isImageBiggerThanModal) {
-              if (isLandscape) {
-                if (iHeight > iWidth) {
-                  const initialZoom = wHeight / iHeight;
-                  setInitialZoom(initialZoom);
-                } else {
-                  const initialZoom = wWidth / iWidth;
-                  setInitialZoom(initialZoom);
-                }
-              } else if (isPortrait) {
-                const initialZoom = wWidth / iWidth;
-                setInitialZoom(initialZoom);
-              }
-            } else {
-              setInitialZoom(1);
-            }
-            setImageHeight(iHeight);
-            setImageWidth(iWidth);
-          }}
-          onFetch={setMediaType}
-        />{' '}
-        <Flex align="center" justify="space-evenly" width={['100%']} mt="4">
+          height="75%"
+          width="auto"
+        />
+        <Flex align="center" justify="space-evenly" width={['90vw']} mt="4">
           {isOwner ? (
             <Menu>
               <MinterMenuButton variant="primary">
@@ -380,7 +338,7 @@ function TokenDetail({ contractAddress, tokenId }: TokenDetailProps) {
               />
             </Menu>
           ) : (
-            <Flex w={[10]} />
+            <></>
           )}
 
           {token.sale ? (
@@ -391,7 +349,7 @@ function TokenDetail({ contractAddress, tokenId }: TokenDetailProps) {
                     ꜩ
                   </Text>
                   <Text color="brand.black" fontSize="xl" fontWeight="700">
-                    {token.sale.price.toFixed(2)}
+                    {token.sale.price}
                   </Text>
                 </Flex>
                 <CancelTokenSaleButton
@@ -400,21 +358,12 @@ function TokenDetail({ contractAddress, tokenId }: TokenDetailProps) {
                 />
               </Flex>
             ) : (
-              <Flex
-                flexDirection="column"
-                align="stretch"
-                width={['100%', 200]}
-              >
-                <Flex align="center" justify="space-between" alignSelf="center">
-                  <Text color="black" fontSize="3xl" mr={1}>
-                    ꜩ
-                  </Text>
-                  <Text color="brand.black" fontSize="xl" fontWeight="700">
-                    {token.sale.price.toFixed(2)}
-                  </Text>
-                </Flex>
+              <>
+                <Text color="black" fontSize={['sm', 'lg']} mr={1}>
+                {token.sale.price.toFixed(2)}ꜩ
+                </Text>
                 <BuyTokenButton contract={contractAddress} token={token} />
-              </Flex>
+              </>
             )
           ) : isOwner ? (
             <SellTokenButton contract={contractAddress} tokenId={tokenId} />
@@ -426,7 +375,7 @@ function TokenDetail({ contractAddress, tokenId }: TokenDetailProps) {
           </Button>
         </Flex>
       </Flex>
-      <Flex width={['100%']} bg="white" flexDir="column" flexGrow={1}>
+      <Flex width={['100%']} bg="white" flexDir="column" flexGrow={1} borderTop="2px solid #aaa">
         <Flex
           width={['90%', '70%']}
           mx="auto"
@@ -477,9 +426,9 @@ function TokenDetail({ contractAddress, tokenId }: TokenDetailProps) {
             </Text>
             <Flex mt={[4, 8]}>
               <Flex flexDir="column" width={['100%', 'auto']}>
-                <Text color="brand.neutralGray">Owner</Text>
+                <Text color="brand.neutralGray">Collection</Text>
                 <Text color="brand.darkGray" fontWeight="bold" mt={[2, 4]}>
-                  {token.owner}
+                  {contractAddress}
                 </Text>
               </Flex>
             </Flex>
@@ -508,4 +457,4 @@ function TokenDetail({ contractAddress, tokenId }: TokenDetailProps) {
   );
 }
 
-export default TokenDetail;
+export default TokenDetail;
\ No newline at end of file
diff --git a/src/components/CreateNonFungiblePage/CollectionSelect.tsx b/src/components/CreateNonFungiblePage/CollectionSelect.tsx
index ef128688..a57c6f55 100644
--- a/src/components/CreateNonFungiblePage/CollectionSelect.tsx
+++ b/src/components/CreateNonFungiblePage/CollectionSelect.tsx
@@ -1,63 +1,23 @@
 import React, { useEffect } from 'react';
-import { Flex, Heading, Text } from '@chakra-ui/react';
-import { CreateCollectionButton } from '../common/CreateCollection';
-import { useSelector, useDispatch } from '../../reducer';
 import {
-  CreateNftState,
-  selectCollection
-} from '../../reducer/slices/createNft';
+  Flex,
+  Heading,
+  Box,
+  Button,
+  Menu,
+  MenuButton,
+  MenuList,
+  MenuOptionGroup,
+  MenuItemOption
+} from '@chakra-ui/react';
+import { CreateCollectionButton } from '../common/modals/CreateCollection';
+import { useSelector, useDispatch } from '../../reducer';
+import { selectCollection } from '../../reducer/slices/createNft';
 import { getWalletAssetContractsQuery } from '../../reducer/async/queries';
-
-interface CollectionRowProps {
-  name: string;
-  address: string;
-  state: CreateNftState;
-  dispatch: ReturnType<typeof useDispatch>;
-}
-
-function CollectionRow({ state, dispatch, name, address }: CollectionRowProps) {
-  const selected = state.collectionAddress === address;
-  return (
-    <Flex
-      align="center"
-      py={4}
-      px={4}
-      mb={4}
-      border="1px solid"
-      borderColor={selected ? 'brand.blue' : 'brand.brightGray'}
-      borderRadius="4px"
-      bg={selected ? 'brand.blue' : 'white'}
-      _hover={{
-        cursor: 'pointer'
-      }}
-      onClick={() => dispatch(selectCollection(address))}
-    >
-      <Flex
-        align="center"
-        justify="center"
-        w={8}
-        h={8}
-        bg={selected ? 'white' : 'brand.blue'}
-        color={selected ? 'brand.blue' : 'white'}
-        borderRadius="100%"
-        fontWeight="600"
-      >
-        <Text>{name[0]}</Text>
-      </Flex>
-      <Text
-        color={selected ? 'white' : 'black'}
-        pl={4}
-        fontSize="md"
-        fontWeight={selected ? '600' : 'normal'}
-      >
-        {name}
-      </Text>
-    </Flex>
-  );
-}
+import { ChevronDown } from 'react-feather';
 
 export default function CollectionSelect() {
-  const { collections } = useSelector(s => s.collections);
+  const collections = useSelector(s => s.collections.collections);
   const state = useSelector(s => s.createNft);
   const dispatch = useDispatch();
 
@@ -66,30 +26,49 @@ export default function CollectionSelect() {
   }, [collections, dispatch]);
 
   return (
-    <Flex flexDir="column" pt={8}>
-      <Flex
-        align="center"
-        justify="space-between"
-        mb={4}
-        pb={4}
-        borderBottom="1px solid"
-        borderColor="brand.brightGray"
-      >
-        <Heading size="lg">Collections</Heading>
-        <CreateCollectionButton />
+    <Flex pb={8} flexDir="column">
+      <Flex pb={4} align="center" justify="space-between">
+        <Heading size="md">Select a collection</Heading>
+        <CreateCollectionButton sync={true} />
       </Flex>
-      {Object.keys(collections).map(key => {
-        const { address, metadata } = collections[key];
-        return (
-          <CollectionRow
-            key={collections[key].address}
-            name={metadata.name || address}
-            address={address}
-            dispatch={dispatch}
-            state={state}
-          />
-        );
-      })}
+      <Menu>
+        <MenuButton
+          as={Button}
+          border="1px solid"
+          borderColor="brand.gray"
+          fontSize="lg"
+          fontWeight="normal"
+          py={3}
+          height="auto"
+          color={state.collectionAddress ? 'brand.black' : 'brand.gray'}
+        >
+          <Flex align="center">
+            <Box mr={3}>
+              <ChevronDown />
+            </Box>
+            {(state.collectionAddress &&
+              collections[state.collectionAddress]?.metadata?.name) ||
+              'No collection selected'}
+          </Flex>
+        </MenuButton>
+        <MenuList>
+          <MenuOptionGroup
+            type="radio"
+            defaultValue={state.collectionAddress || ''}
+          >
+            {Object.keys(collections).map(address => (
+              <MenuItemOption
+                key={address}
+                value={address}
+                selected={address === state.collectionAddress}
+                onClick={() => dispatch(selectCollection(address))}
+              >
+                {collections[address].metadata.name}
+              </MenuItemOption>
+            ))}
+          </MenuOptionGroup>
+        </MenuList>
+      </Menu>
     </Flex>
   );
 }
diff --git a/src/components/CreateNonFungiblePage/Confirmation.tsx b/src/components/CreateNonFungiblePage/Confirmation.tsx
new file mode 100644
index 00000000..6ead4c0a
--- /dev/null
+++ b/src/components/CreateNonFungiblePage/Confirmation.tsx
@@ -0,0 +1,71 @@
+import React from 'react';
+import {
+  Box,
+  Heading,
+  Text,
+  Flex,
+  Accordion,
+  AccordionItem,
+  AccordionButton,
+  AccordionIcon,
+  AccordionPanel
+} from '@chakra-ui/react';
+import { useSelector } from '../../reducer';
+import { FilePreview } from './FileUpload';
+
+function Label(props: { children: React.ReactNode }) {
+  return (
+    <Text fontSize="md" fontFamily="mono" color="brand.darkGray">
+      {props.children}
+    </Text>
+  );
+}
+
+export default function Confirmation() {
+  const selectedFile = useSelector(s => s.createNft.selectedFile);
+  const collections = useSelector(s => s.collections.collections);
+  const fields = useSelector(s => s.createNft.fields);
+  const attributes = useSelector(s => s.createNft.attributes);
+  const collectionAddress = useSelector(s => s.createNft.collectionAddress);
+
+  return (
+    <Box>
+      <Heading size="lg" mb={4}>
+        Confirm Details
+      </Heading>
+      <Flex w="100%" justify="center" mb={8}>
+        <FilePreview file={selectedFile!} />
+      </Flex>
+      <Label>Collection</Label>
+      <Text fontSize="md" mb={[2, 4]}>
+        {collections[collectionAddress!]?.metadata?.name}
+      </Text>
+      <Label>Name</Label>
+      <Text fontSize="md" mb={[2, 4]}>
+        {fields.name}
+      </Text>
+      <Label>Description</Label>
+      <Text fontSize="md" mb={[2, 4]}>
+        {fields.description || 'No description provided'}
+      </Text>
+      <Accordion allowToggle>
+        <AccordionItem border="none">
+          <AccordionButton mt={[4, 8]} p={0}>
+            <Text color="brand.neutralGray">Metadata</Text>
+            <AccordionIcon />
+          </AccordionButton>
+          <AccordionPanel pb={4}>
+            {attributes?.map(({ name, value }) => (
+              <Flex mt={[4, 8]}>
+                <Text color="brand.neutralGray">{name}:</Text>
+                <Text color="brand.darkGray" fontWeight="bold" ml={[1]}>
+                  {value}
+                </Text>
+              </Flex>
+            ))}
+          </AccordionPanel>
+        </AccordionItem>
+      </Accordion>
+    </Box>
+  );
+}
diff --git a/src/components/CreateNonFungiblePage/FileUpload.tsx b/src/components/CreateNonFungiblePage/FileUpload.tsx
index 997d3490..1b29154a 100644
--- a/src/components/CreateNonFungiblePage/FileUpload.tsx
+++ b/src/components/CreateNonFungiblePage/FileUpload.tsx
@@ -11,7 +11,7 @@ import {
 export function FilePreview({ file }: { file: SelectedFile }) {
   const dispatch = useDispatch();
   if (/^image\/.*/.test(file.type)) {
-    return <Image src={file.objectUrl} width="100%" height="100%" objectFit='contain' />;
+    return <Image src={file.objectUrl} width="100%" height="100%" objectFit="scale-down" />;
   }
   if (/^video\/.*/.test(file.type)) {
     const canvasRef = createRef<HTMLCanvasElement>();
@@ -76,7 +76,16 @@ export default function FileUpload() {
   });
 
   return (
-    <Flex align="center" flexDir="column" width="100%" flex="1" pt={28}>
+    <Flex
+      align="center"
+      flexDir="column"
+      width="100%"
+      flex="1"
+      pt={{
+        base: 2,
+        md: 12
+      }}
+    >
       <Heading size="lg" paddingBottom={8} textAlign="center">
         Upload your file
       </Heading>
@@ -118,11 +127,13 @@ export default function FileUpload() {
             borderWidth="1px"
             flexDir="column"
             align="center"
-            py={10}
+            py={24}
             bg="brand.brightGray"
             flex="1"
           >
-            <Text fontSize={20}>Click or drag file to this area to upload</Text>
+            <Text fontSize={20} textAlign="center" paddingX={4}>
+              Click or drag file to this area to upload
+            </Text>
             <Text fontSize={18} color="brand.gray">
               Support for single file
             </Text>
diff --git a/src/components/CreateNonFungiblePage/Form.tsx b/src/components/CreateNonFungiblePage/Form.tsx
index 72203076..ae894002 100644
--- a/src/components/CreateNonFungiblePage/Form.tsx
+++ b/src/components/CreateNonFungiblePage/Form.tsx
@@ -21,6 +21,7 @@ import {
   updateMetadataRowName,
   updateMetadataRowValue
 } from '../../reducer/slices/createNft';
+import CollectionSelect from './CollectionSelect';
 
 const DESCRIPTION_PLACEHOLDER =
   'e.g. “This is an exclusive japanese comic illustration. Once you purchase it you will be able to get the t-shirt”';
@@ -31,8 +32,9 @@ export default function Form() {
   const { name, description } = state.fields;
   return (
     <>
+      <CollectionSelect />
       <Heading size="md" paddingBottom={6}>
-        What properties would you like to give your assets?
+        What properties would you like to give your asset?
       </Heading>
       <FormControl paddingBottom={6}>
         <FormLabel fontFamily="mono">Asset Name</FormLabel>
diff --git a/src/components/CreateNonFungiblePage/StatusModal.tsx b/src/components/CreateNonFungiblePage/StatusModal.tsx
deleted file mode 100644
index 1a9ddcea..00000000
--- a/src/components/CreateNonFungiblePage/StatusModal.tsx
+++ /dev/null
@@ -1,116 +0,0 @@
-import React from 'react';
-import {
-  Box,
-  Flex,
-  Spinner,
-  Heading,
-  Modal,
-  ModalOverlay,
-  ModalContent,
-  Text
-} from '@chakra-ui/react';
-import { CheckCircle, AlertCircle, X } from 'react-feather';
-import { MinterButton } from '../common';
-import { Status } from '../../reducer/slices/status';
-
-interface StatusModalProps {
-  isOpen: boolean;
-  onClose: () => void;
-  onRetry: () => void;
-  onCancel: () => void;
-  status: Status;
-}
-
-function Content({ status, onClose, onRetry, onCancel }: StatusModalProps) {
-  if (status.error) {
-    return (
-      <Flex flexDir="column" align="center" px={4} py={10}>
-        <Box color="brand.blue" mb={6}>
-          <AlertCircle size="70px" />
-        </Box>
-        <Heading size="lg" textAlign="center" color="gray.500" mb={6}>
-          Error Creating Token
-        </Heading>
-        <Flex flexDir="row" justify="center">
-          <MinterButton variant="primaryAction" onClick={() => onRetry()}>
-            Retry
-          </MinterButton>
-          <MinterButton
-            variant="tertiaryAction"
-            onClick={() => onCancel()}
-            display="flex"
-            alignItems="center"
-            ml={4}
-          >
-            <Box color="currentcolor">
-              <X size={16} strokeWidth="3" />
-            </Box>
-            <Text fontSize={16} ml={1} fontWeight="600">
-              Close
-            </Text>
-          </MinterButton>
-        </Flex>
-      </Flex>
-    );
-  }
-  if (status.status === 'in_transit') {
-    return (
-      <Flex flexDir="column" align="center" px={4} py={10}>
-        <Spinner size="xl" mb={6} color="gray.300" />
-        <Heading size="lg" textAlign="center" color="gray.500">
-          Creating token...
-        </Heading>
-        <br/>
-        <Text size="xs" textAlign="center" color="gray.500">
-         <span role="img" aria-label="lightbulb">🌱</span> Minting on Tezos produces 1,500,000 times less CO2 emissions than Ethereum.
-        </Text>
-      </Flex>
-    );
-  }
-  if (status.status === 'complete') {
-    return (
-      <Flex flexDir="column" align="center" px={4} py={10}>
-        <Box color="brand.blue" mb={6}>
-          <CheckCircle size="70px" />
-        </Box>
-        <Heading size="lg" textAlign="center" color="gray.500" mb={6}>
-          Token creation complete
-        </Heading>
-        <MinterButton variant="primaryAction" onClick={() => onClose()}>
-          Close
-        </MinterButton>
-      </Flex>
-    );
-  }
-  return null;
-}
-
-export default function StatusModal(props: StatusModalProps) {
-  const { isOpen, onClose, status } = props;
-  const initialRef = React.useRef(null);
-
-  const close = () => {
-    if (status.status === 'complete') {
-      onClose();
-    }
-  };
-
-  return (
-    <>
-      <Modal
-        isOpen={isOpen}
-        onClose={() => close()}
-        initialFocusRef={initialRef}
-        closeOnEsc={false}
-        closeOnOverlayClick={false}
-        onEsc={() => close()}
-        onOverlayClick={() => close()}
-      >
-        <ModalOverlay />
-        <ModalContent mt={40}>
-          <Content {...props} />
-        </ModalContent>
-      </Modal>
-    </>
-  );
-}
diff --git a/src/components/CreateNonFungiblePage/index.tsx b/src/components/CreateNonFungiblePage/index.tsx
index 3ab54cc3..e291a8b2 100644
--- a/src/components/CreateNonFungiblePage/index.tsx
+++ b/src/components/CreateNonFungiblePage/index.tsx
@@ -5,8 +5,8 @@ import { MinterButton } from '../common';
 import Form from './Form';
 import FileUpload from './FileUpload';
 import CollectionSelect from './CollectionSelect';
-import Preview from './Preview';
-import StatusModal from './StatusModal';
+// import Preview from './Preview';
+import Confirmation from './Confirmation';
 import { ChevronLeft, X } from 'react-feather';
 
 import { useSelector, useDispatch } from '../../reducer';
@@ -19,12 +19,20 @@ import {
 } from '../../reducer/slices/createNft';
 import { mintTokenAction } from '../../reducer/async/actions';
 import { validateCreateNftStep } from '../../reducer/validators/createNft';
-import { clearError, setStatus } from '../../reducer/slices/status';
+import FormModal from '../common/modals/FormModal';
 
 function ProgressIndicator({ state }: { state: CreateNftState }) {
   const stepIdx = steps.indexOf(state.step);
   return (
-    <Flex align="center" flexDir="column" flex="1">
+    <Flex
+      align="center"
+      flexDir="column"
+      flex="1"
+      display={{
+        base: 'none',
+        md: 'flex'
+      }}
+    >
       <Flex width="200px" justifyContent="stretch" pb={2}>
         {steps.map((step, i) => {
           const color = stepIdx >= i ? 'brand.blue' : 'brand.lightBlue';
@@ -51,11 +59,29 @@ function LeftContent() {
   const step = useSelector(s => s.createNft.step);
   switch (step) {
     case 'file_upload':
-      return <FileUpload />;
+      return (
+        <Box w="100%" maxWidth="1200px">
+          <FileUpload />
+        </Box>
+      );
     case 'asset_details':
-      return <Form />;
+      return (
+        <Box w="100%" maxWidth="800px">
+          <Form />
+        </Box>
+      );
     case 'collection_select':
-      return <CollectionSelect />;
+      return (
+        <Box w="100%" maxWidth="800px">
+          <CollectionSelect />
+        </Box>
+      );
+    case 'confirm':
+      return (
+        <Box w="100%" maxWidth="800px">
+          <Confirmation />
+        </Box>
+      );
     default:
       return null;
   }
@@ -63,10 +89,11 @@ function LeftContent() {
 
 export default function CreateNonFungiblePage() {
   const { system, createNft: state } = useSelector(s => s);
-  const status = useSelector(s => s.status.mintToken);
   const dispatch = useDispatch();
   const [, setLocation] = useLocation();
-  const { isOpen, onClose, onOpen } = useDisclosure();
+  const disclosure = useDisclosure();
+  const { onOpen } = disclosure;
+
   useEffect(() => {
     if (system.status !== 'WalletConnected') {
       setLocation('/');
@@ -77,13 +104,13 @@ export default function CreateNonFungiblePage() {
 
   return (
     <Flex flex="1" width="100%" minHeight="0">
-      <Flex w="50%" h="100%" flexDir="column" overflowY="scroll">
+      <Flex w="100%" h="100%" flexDir="column" align="center">
         <Flex
           w="100%"
           px={8}
           py={4}
           justify="space-between"
-          align="end"
+          align="center"
           borderBottomWidth="1px"
           borderBottomColor="brand.brightGray"
         >
@@ -135,78 +162,61 @@ export default function CreateNonFungiblePage() {
                   case 'asset_details': {
                     return dispatch(incrementStep());
                   }
-                  case 'collection_select': {
-                    onOpen();
-                    return dispatch(mintTokenAction());
+                  case 'confirm': {
+                    return onOpen();
                   }
                 }
               }}
               ml={4}
             >
-              {state.step === 'collection_select' ? 'Create' : 'Next'}
+              {state.step === 'confirm' ? 'Create' : 'Next'}
             </MinterButton>
-            <StatusModal
-              isOpen={isOpen}
-              onClose={() => {
-                onClose();
-                setLocation('/collections');
-                dispatch(setStatus({ method: 'mintToken', status: 'ready' }));
-                dispatch(clearForm());
-              }}
-              onRetry={() => {
-                dispatch(clearError({ method: 'mintToken' }));
-                dispatch(mintTokenAction());
-              }}
-              onCancel={() => {
-                onClose();
-                dispatch(clearError({ method: 'mintToken' }));
-                dispatch(setStatus({ method: 'mintToken', status: 'ready' }));
-              }}
-              status={status}
+            <FormModal
+              disclosure={disclosure}
+              method="mintToken"
+              dispatchThunk={() => dispatch(mintTokenAction())}
+              onComplete={() => dispatch(clearForm())}
+              afterClose={() => setLocation('/collections')}
+              dispatchOnOpen={true}
+              pendingAsyncMessage={
+                <>
+                  Opening wallet...
+                  <br />
+                  <Text
+                    fontSize="1rem"
+                    fontWeight="normal"
+                    marginTop={4}
+                    textAlign="center"
+                    color="gray.500"
+                  >
+                    <span role="img" aria-label="lightbulb">
+                      🌱
+                    </span>{' '}
+                    Minting on Tezos produces 1,500,000 times less CO2 emissions
+                    than Ethereum.
+                  </Text>
+                </>
+              }
             />
           </Flex>
         </Flex>
-        <Box
+        <Flex
           width="100%"
           pt={10}
-          px={28}
-          overflowY="scroll"
+          px={{
+            base: 6,
+            md: 28
+          }}
+          overflowY="auto"
           minHeight="0px"
           flex="1"
-        >
-          <LeftContent />
-          <Box pb={10} w="100%" />
-        </Box>
-      </Flex>
-      {state.step === 'file_upload' && state.selectedFile === null ? (
-        <Flex
-          bg="brand.darkGray"
-          borderLeftWidth="1px"
-          borderLeftColor="brand.lightBlue"
-          w="50%"
-          h="100%"
           flexDir="column"
           align="center"
-          justify="center"
         >
-          <Text color="brand.lightGray">(Artwork TBD)</Text>
-        </Flex>
-      ) : (
-        <Flex
-          bg="brand.brightGray"
-          borderLeftWidth="1px"
-          borderLeftColor="brand.lightBlue"
-          w="50%"
-          h="100%"
-          flexDir="column"
-          align="center"
-          overflowY="scroll"
-          px={28}
-          pt={16}
-        >
-          <Preview />
+          <LeftContent />
+          <Box pb={10} w="100%" />
         </Flex>
-      )}
+      </Flex>
     </Flex>
   );
 }
diff --git a/src/components/Marketplace/Catalog/FeaturedToken.tsx b/src/components/Marketplace/Catalog/FeaturedToken.tsx
index 0a95fb9c..1076616b 100644
--- a/src/components/Marketplace/Catalog/FeaturedToken.tsx
+++ b/src/components/Marketplace/Catalog/FeaturedToken.tsx
@@ -3,7 +3,6 @@ import { Token } from '../../../reducer/slices/collections';
 import { useLocation } from 'wouter';
 import { ipfsUriToGatewayUrl } from '../../../lib/util/ipfs';
 import {
-  AspectRatio,
   Box,
   Container,
   Flex,
@@ -22,16 +21,20 @@ interface FeaturedTokenProps extends Token {
 export default function FeaturedToken(props: FeaturedTokenProps) {
   const [, setLocation] = useLocation();
   return (
-    <Container maxW="65em" py={10}>
-      <Stack direction={{ base: 'column', md: 'row' }} spacing="24px" mb={10}>
-        <AspectRatio maxW="400px" ratio={3 / 2} width="100%">
+    <Container maxW="100%" py={10} px={0}>
+      <Stack width="100%" direction={{ base: 'column', md: 'row' }} spacing="24px" mb={10} display="flex" flexDir="row" flexWrap="wrap" justifyContent="center" alignItems="center">
+        <Flex pr={[0, 10]} borderRight={["unset", "2px solid #666"]}>
           <TokenMedia
             src={ipfsUriToGatewayUrl(props.network, props.artifactUri)}
+            maxW="calc(650px - 2.5rem)"
           />
-        </AspectRatio>
-        <Box>
+        </Flex>
+        <Box pl={[0, 10]} marginLeft="0 !important">
           <Flex flexDir="column" h="100%" w="100%">
-            <Heading size="md" mt={4}>
+            <Heading size="md" mt={4} fontSize="2.5rem">
+              {props.title}
+            </Heading>
+            <Heading size="sm" my={4} color="brand.darkGray">
               {props.title}
             </Heading>
             <Heading size="sm" my={4} color="brand.darkGray">
diff --git a/src/components/common/BuyToken.tsx b/src/components/common/BuyToken.tsx
deleted file mode 100644
index bbd41689..00000000
--- a/src/components/common/BuyToken.tsx
+++ /dev/null
@@ -1,112 +0,0 @@
-import React from 'react';
-import {
-  Box,
-  Button,
-  Flex,
-  Spinner,
-  Heading,
-  Modal,
-  ModalOverlay,
-  ModalContent,
-  ModalHeader,
-  ModalFooter,
-  ModalBody,
-  ModalCloseButton,
-  Text,
-  useDisclosure
-} from '@chakra-ui/react';
-import { CheckCircle } from 'react-feather';
-import { MinterButton } from '../common';
-import { useSelector, useDispatch } from '../../reducer';
-import { buyTokenAction } from '../../reducer/async/actions';
-import { setStatus } from '../../reducer/slices/status';
-import { Nft } from '../../lib/nfts/queries';
-
-interface BuyTokenButtonProps {
-  contract: string;
-  token: Nft;
-}
-
-export function BuyTokenButton(props: BuyTokenButtonProps) {
-  const { status } = useSelector(s => s.status.buyToken);
-  const dispatch = useDispatch();
-
-  const { isOpen, onOpen, onClose } = useDisclosure();
-  const initialRef = React.useRef(null);
-
-  const onSubmit = async () => {
-    dispatch(
-      buyTokenAction({
-        contract: props.contract,
-        tokenId: props.token.id,
-        tokenSeller: props.token.sale?.seller || "",
-        salePrice: props.token.sale?.price || 0
-      })
-    );
-  };
-
-  const close = () => {
-    if (status !== 'in_transit') {
-      dispatch(setStatus({ method: 'buyToken', status: 'ready' }));
-      onClose();
-    }
-  };
-
-  return (
-    <>
-      <MinterButton variant="primaryAction" onClick={onOpen}>Buy now</MinterButton>
-
-      <Modal
-        isOpen={isOpen}
-        onClose={() => close()}
-        initialFocusRef={initialRef}
-        closeOnEsc={false}
-        closeOnOverlayClick={false}
-        onEsc={() => close()}
-        onOverlayClick={() => close()}
-        size="xs"
-      >
-        <ModalOverlay />
-        <ModalContent mt={40}>
-          {status === 'ready' ? (
-            <>
-            <ModalHeader>Checkout</ModalHeader>
-            <ModalCloseButton />
-            <ModalBody>
-              <Text>
-                You are about to purchase<Box as="span" fontWeight="bold"> {props.token.title} (ꜩ {props.token.sale?.price})</Box>
-              </Text>
-            </ModalBody>
-            <ModalFooter>
-              <Button variant="primaryAction" onClick={onSubmit} isFullWidth={true}>
-                Buy now
-              </Button>
-            </ModalFooter>
-            </>
-          ) : null}
-          {status === 'in_transit' ? (
-            <Flex flexDir="column" align="center" px={4} py={10}>
-              <Spinner size="xl" mb={6} color="gray.300" />
-              <Heading size="lg" textAlign="center" color="gray.500">
-                Purchasing token...
-              </Heading>
-            </Flex>
-          ) : null}
-          {status === 'complete' ? (
-            <Flex flexDir="column" align="center" px={4} py={10}>
-              <Box color="brand.blue" mb={6}>
-                <CheckCircle size="70px" />
-              </Box>
-              <Heading size="lg" textAlign="center" color="gray.500" mb={6}>
-                Token purchased
-              </Heading>
-              <MinterButton variant="primaryAction" onClick={() => close()}>
-                Close
-              </MinterButton>
-            </Flex>
-          ) : null}
-        </ModalContent>
-      </Modal>
-    </>
-  );
-}
diff --git a/src/components/common/CreateCollection.tsx b/src/components/common/CreateCollection.tsx
deleted file mode 100644
index d7e4726c..00000000
--- a/src/components/common/CreateCollection.tsx
+++ /dev/null
@@ -1,209 +0,0 @@
-import React, {
-  useState,
-  MutableRefObject,
-  SetStateAction,
-  Dispatch
-} from 'react';
-import {
-  Box,
-  Text,
-  FormControl,
-  FormLabel,
-  Input,
-  Modal,
-  ModalOverlay,
-  ModalContent,
-  ModalHeader,
-  ModalFooter,
-  ModalBody,
-  ModalCloseButton,
-  useDisclosure,
-  Spinner,
-  Flex,
-  Heading
-} from '@chakra-ui/react';
-import { CheckCircle, Plus, AlertCircle, X } from 'react-feather';
-import { MinterButton } from '../common';
-import { useSelector, useDispatch } from '../../reducer';
-import { createAssetContractAction } from '../../reducer/async/actions';
-import { clearError, setStatus, Status } from '../../reducer/slices/status';
-
-interface FormProps {
-  initialRef: MutableRefObject<null>;
-  onSubmit: (form: { contractName: string }) => void;
-  contractName: string;
-  setContractName: Dispatch<SetStateAction<string>>;
-}
-
-function Form({
-  initialRef,
-  onSubmit,
-  contractName,
-  setContractName
-}: FormProps) {
-  return (
-    <>
-      <ModalHeader>New Collection</ModalHeader>
-      <ModalCloseButton />
-      <ModalBody>
-        <FormControl>
-          <FormLabel fontFamily="mono">Collection Name</FormLabel>
-          <Input
-            autoFocus={true}
-            ref={initialRef}
-            placeholder="Input your collection name"
-            value={contractName}
-            onChange={e => setContractName(e.target.value)}
-          />
-        </FormControl>
-      </ModalBody>
-
-      <ModalFooter>
-        <MinterButton
-          variant="primaryAction"
-          onClick={() => onSubmit({ contractName })}
-        >
-          Create Collection
-        </MinterButton>
-      </ModalFooter>
-    </>
-  );
-}
-
-interface ContentProps {
-  isOpen: boolean;
-  onClose: () => void;
-  onRetry: () => void;
-  onCancel: () => void;
-  status: Status;
-}
-
-function Content({ status, onClose, onRetry, onCancel }: ContentProps) {
-  if (status.error) {
-    return (
-      <Flex flexDir="column" align="center" px={4} py={10}>
-        <Box color="brand.blue" mb={6}>
-          <AlertCircle size="70px" />
-        </Box>
-        <Heading size="lg" textAlign="center" color="gray.500" mb={6}>
-          Error Creating Collection
-        </Heading>
-        <Flex flexDir="row" justify="center">
-          <MinterButton variant="primaryAction" onClick={() => onRetry()}>
-            Retry
-          </MinterButton>
-          <MinterButton
-            variant="tertiaryAction"
-            onClick={() => onCancel()}
-            display="flex"
-            alignItems="center"
-            ml={4}
-          >
-            <Box color="currentcolor">
-              <X size={16} strokeWidth="3" />
-            </Box>
-            <Text fontSize={16} ml={1} fontWeight="600">
-              Close
-            </Text>
-          </MinterButton>
-        </Flex>
-      </Flex>
-    );
-  }
-  if (status.status === 'in_transit') {
-    return (
-      <Flex flexDir="column" align="center" px={4} py={10}>
-        <Spinner size="xl" mb={6} color="gray.300" />
-        <Heading size="lg" textAlign="center" color="gray.500">
-          Creating collection...
-        </Heading>
-      </Flex>
-    );
-  }
-  if (status.status === 'complete') {
-    return (
-      <Flex flexDir="column" align="center" px={4} py={10}>
-        <Box color="brand.blue" mb={6}>
-          <CheckCircle size="70px" />
-        </Box>
-        <Heading size="lg" textAlign="center" color="gray.500" mb={6}>
-          Collection created
-        </Heading>
-        <MinterButton variant="primaryAction" onClick={() => onClose()}>
-          Close
-        </MinterButton>
-      </Flex>
-    );
-  }
-  return null;
-}
-
-export function CreateCollectionButton() {
-  const status = useSelector(s => s.status.createAssetContract);
-  const dispatch = useDispatch();
-  const [contractName, setContractName] = useState('');
-
-  const { isOpen, onOpen, onClose } = useDisclosure();
-  const initialRef = React.useRef(null);
-
-  const onSubmit = async () => {
-    dispatch(createAssetContractAction(contractName));
-  };
-
-  const close = () => {
-    if (status.status !== 'in_transit') {
-      dispatch(setStatus({ method: 'createAssetContract', status: 'ready' }));
-      onClose();
-    }
-  };
-
-  return (
-    <>
-      <MinterButton variant="primaryActionInverted" onClick={onOpen}>
-        <Box color="currentcolor">
-          <Plus size={16} strokeWidth="3" />
-        </Box>
-        <Text ml={2}>New Collection</Text>
-      </MinterButton>
-
-      <Modal
-        isOpen={isOpen}
-        onClose={() => close()}
-        initialFocusRef={initialRef}
-        closeOnEsc={false}
-        closeOnOverlayClick={false}
-        onEsc={() => close()}
-        onOverlayClick={() => close()}
-      >
-        <ModalOverlay />
-        <ModalContent mt={40}>
-          {status.status === 'ready' ? (
-            <Form
-              initialRef={initialRef}
-              onSubmit={onSubmit}
-              contractName={contractName}
-              setContractName={setContractName}
-            />
-          ) : (
-            <Content
-              isOpen={isOpen}
-              status={status}
-              onClose={() => close()}
-              onCancel={() => {
-                onClose();
-                dispatch(clearError({ method: 'createAssetContract' }));
-                dispatch(
-                  setStatus({ method: 'createAssetContract', status: 'ready' })
-                );
-              }}
-              onRetry={() => {
-                dispatch(clearError({ method: 'createAssetContract' }));
-                onSubmit();
-              }}
-            />
-          )}
-        </ModalContent>
-      </Modal>
-    </>
-  );
-}
diff --git a/src/components/common/Notifications.tsx b/src/components/common/Notifications.tsx
index 695e625c..55650438 100644
--- a/src/components/common/Notifications.tsx
+++ b/src/components/common/Notifications.tsx
@@ -4,8 +4,22 @@ import { useDispatch, useSelector } from '../../reducer';
 import {
   deliverNotification,
   readNotification
-} from '../../reducer/slices/notifications';
+} from '../../reducer/slices/notificationsActions';
 import _ from 'lodash';
+import { Notification } from '../../reducer/slices/notifications';
+
+function notificationStatus(notification: Notification) {
+  switch (notification.status) {
+    case 'pending':
+      return 'info';
+    case 'success':
+      return 'success';
+    case 'error':
+      return 'error';
+    default:
+      return 'info';
+  }
+}
 
 export default function Notifications() {
   const toast = useToast();
@@ -13,26 +27,23 @@ export default function Notifications() {
   const notifications = useSelector(
     state =>
       state.notifications.filter(({ read, delivered }) => !read && !delivered),
-    (left, right) =>
-      _.isEqual(
-        _.uniq(_.map(left, n => n.requestId)),
-        _.uniq(_.map(right, n => n.requestId))
-      )
+    _.isEqual
   );
 
   useEffect(() => {
     for (let notification of notifications) {
+      dispatch(deliverNotification(notification.requestId));
       toast({
         title: notification.title,
         description: notification.description,
-        status: notification.status,
+        status: notificationStatus(notification),
         duration: 10000,
         isClosable: true,
+        position: 'bottom-right',
         onCloseComplete() {
           dispatch(readNotification(notification.requestId));
         }
       });
-      dispatch(deliverNotification(notification.requestId));
     }
   }, [notifications, dispatch, toast]);
 
diff --git a/src/components/common/SellToken.tsx b/src/components/common/SellToken.tsx
deleted file mode 100644
index 3e8542fe..00000000
--- a/src/components/common/SellToken.tsx
+++ /dev/null
@@ -1,227 +0,0 @@
-import React, { useState, MutableRefObject } from 'react';
-import {
-  Box,
-  Button,
-  Flex,
-  Spinner,
-  Heading,
-  FormControl,
-  Input,
-  InputGroup,
-  InputLeftElement,
-  Modal,
-  ModalOverlay,
-  ModalContent,
-  ModalHeader,
-  ModalFooter,
-  ModalBody,
-  ModalCloseButton,
-  Text,
-  useDisclosure
-} from '@chakra-ui/react';
-import { Check, CheckCircle } from 'react-feather';
-import { MinterButton } from '../common';
-import { useSelector, useDispatch } from '../../reducer';
-import { listTokenAction, cancelTokenSaleAction } from '../../reducer/async/actions';
-import { setStatus } from '../../reducer/slices/status';
-
-interface FormProps {
-  initialRef: MutableRefObject<null>;
-  onSubmit: (form: { salePrice: string }) => void;
-}
-
-interface SellTokenButtonProps {
-  contract: string;
-  tokenId: number;
-}
-
-function FormFixedPrice({ initialRef, onSubmit }: FormProps) {
-  const [salePrice, setSalePrice] = useState('');
-  return (
-    <>
-      <ModalHeader>Set your price</ModalHeader>
-      <ModalCloseButton />
-      <ModalBody>
-        <Flex>
-        <FormControl>
-          <InputGroup>
-            <InputLeftElement
-              pointerEvents="none"
-              color="gray.900"
-              fontSize="1.2em"
-              children="ꜩ"
-            />
-            <Input
-              autoFocus={true}
-              ref={initialRef}
-              placeholder="Enter sale amount"
-              value={salePrice}
-              onChange={e => setSalePrice(e.target.value)}
-            />
-          </InputGroup>
-        </FormControl>
-        <Box ml={2}>
-        <MinterButton
-          variant="primaryAction"
-          onClick={() => onSubmit({ salePrice })}
-        >
-          <Check />
-        </MinterButton>
-        </Box>
-        </Flex>
-      </ModalBody>
-      <ModalFooter />
-    </>
-  );
-}
-
-export function SellTokenButton(props: SellTokenButtonProps) {
-  const { status } = useSelector(s => s.status.listToken);
-  const dispatch = useDispatch();
-
-  const { isOpen, onOpen, onClose } = useDisclosure();
-  const initialRef = React.useRef(null);
-
-  const onSubmit = async (form: { salePrice: string }) => {
-    let salePrice = Math.floor(Number(form.salePrice) * 1000000);
-    if (Number.isNaN(salePrice)) {
-      salePrice = 0;
-    }
-    dispatch(
-      listTokenAction({
-        ...props,
-        salePrice: salePrice
-      })
-    );
-  };
-
-  const close = () => {
-    if (status !== 'in_transit') {
-      dispatch(setStatus({ method: 'listToken', status: 'ready' }));
-      onClose();
-    }
-  };
-
-  return (
-    <>
-      <MinterButton variant="primaryAction" onClick={onOpen}>List for sale</MinterButton>
-
-      <Modal
-        isOpen={isOpen}
-        onClose={() => close()}
-        initialFocusRef={initialRef}
-        closeOnEsc={false}
-        closeOnOverlayClick={false}
-        onEsc={() => close()}
-        onOverlayClick={() => close()}
-      >
-        <ModalOverlay />
-        <ModalContent mt={40}>
-          {status === 'ready' ? (
-            <FormFixedPrice initialRef={initialRef} onSubmit={onSubmit} />
-          ) : null}
-          {status === 'in_transit' ? (
-            <Flex flexDir="column" align="center" px={4} py={10}>
-              <Spinner size="xl" mb={6} color="gray.300" />
-              <Heading size="lg" textAlign="center" color="gray.500">
-                Listing token for sale...
-              </Heading>
-            </Flex>
-          ) : null}
-          {status === 'complete' ? (
-            <Flex flexDir="column" align="center" px={4} py={10}>
-              <Box color="brand.blue" mb={6}>
-                <CheckCircle size="70px" />
-              </Box>
-              <Heading size="lg" textAlign="center" color="gray.500" mb={6}>
-                Listing complete
-              </Heading>
-              <MinterButton variant="primaryAction" onClick={() => close()}>
-                Close
-              </MinterButton>
-            </Flex>
-          ) : null}
-        </ModalContent>
-      </Modal>
-    </>
-  );
-}
-
-export function CancelTokenSaleButton(props: SellTokenButtonProps) {
-  const { status } = useSelector(s => s.status.cancelTokenSale);
-  const dispatch = useDispatch();
-
-  const { isOpen, onOpen, onClose } = useDisclosure();
-  const initialRef = React.useRef(null);
-
-  const onSubmit = async () => {
-    dispatch(
-      cancelTokenSaleAction({
-        ...props
-      })
-    );
-  };
-
-  const close = () => {
-    if (status !== 'in_transit') {
-      dispatch(setStatus({ method: 'cancelTokenSale', status: 'ready' }));
-      onClose();
-    }
-  };
-
-  return (
-    <>
-      <MinterButton variant="cancelAction" onClick={onOpen}>Cancel sale</MinterButton>
-
-      <Modal
-        isOpen={isOpen}
-        onClose={() => close()}
-        initialFocusRef={initialRef}
-        closeOnEsc={false}
-        closeOnOverlayClick={false}
-        onEsc={() => close()}
-        onOverlayClick={() => close()}
-      >
-        <ModalOverlay />
-        <ModalContent mt={40}>
-          {status === 'ready' ? (
-            <>
-            <ModalHeader>Are you sure?</ModalHeader>
-            <ModalCloseButton />
-            <ModalBody>
-              <Text>
-                Are you sure you want to cancel the sale?
-              </Text>
-            </ModalBody>
-            <ModalFooter>
-              <Button variant="primaryAction" mr={3} onClick={onSubmit}>Yes</Button>
-              <Button variant="cancelAction" onClick={onClose}>No</Button>
-            </ModalFooter>
-            </>
-          ) : null}
-          {status === 'in_transit' ? (
-            <Flex flexDir="column" align="center" px={4} py={10}>
-              <Spinner size="xl" mb={6} color="gray.300" />
-              <Heading size="lg" textAlign="center" color="gray.500">
-                Canceling sale...
-              </Heading>
-            </Flex>
-          ) : null}
-          {status === 'complete' ? (
-            <Flex flexDir="column" align="center" px={4} py={10}>
-              <Box color="brand.blue" mb={6}>
-                <CheckCircle size="70px" />
-              </Box>
-              <Heading size="lg" textAlign="center" color="gray.500" mb={6}>
-                Listing canceled
-              </Heading>
-              <MinterButton variant="primaryAction" onClick={() => close()}>
-                Close
-              </MinterButton>
-            </Flex>
-          ) : null}
-        </ModalContent>
-      </Modal>
-    </>
-  );
-}
diff --git a/src/components/common/TokenMedia.tsx b/src/components/common/TokenMedia.tsx
index 68ae2764..38f8dc92 100644
--- a/src/components/common/TokenMedia.tsx
+++ b/src/components/common/TokenMedia.tsx
@@ -18,7 +18,7 @@ function MediaNotFound() {
   );
 }
 
-export function TokenMedia(props: { src: string }) {
+export function TokenMedia(props: { src: string, maxW?: string }) {
   const [errored, setErrored] = useState(false);
   const [obj, setObj] = useState<{ url: string; type: string } | null>(null);
   useEffect(() => {
@@ -43,11 +43,15 @@ export function TokenMedia(props: { src: string }) {
   if (!obj) return null;
 
   if (/^image\/.*/.test(obj.type)) {
+    console.log(props.src)
     return (
       <Image
         src={props.src}
-        objectFit="contain"
+        objectFit="scale-down"
+        height="100%"
         flex="1"
+        maxWidth={props.maxW}
+        style={{objectFit:"scale-down"}}
         onError={() => setErrored(true)}
       />
     );
@@ -60,6 +64,8 @@ export function TokenMedia(props: { src: string }) {
         onClick={e => e.preventDefault()}
         onMouseEnter={e => e.currentTarget.play()}
         onMouseLeave={e => e.currentTarget.pause()}
+        height="100%"
+        style={{maxWidth:props.maxW}}
       >
         <source src={obj.url} type={obj.type} />
       </video>
diff --git a/src/components/common/TransferToken.tsx b/src/components/common/TransferToken.tsx
deleted file mode 100644
index b06a4483..00000000
--- a/src/components/common/TransferToken.tsx
+++ /dev/null
@@ -1,226 +0,0 @@
-import React, {
-  useState,
-  MutableRefObject,
-  SetStateAction,
-  Dispatch
-} from 'react';
-import {
-  Box,
-  Flex,
-  Spinner,
-  Heading,
-  FormControl,
-  FormLabel,
-  Input,
-  Modal,
-  ModalOverlay,
-  ModalContent,
-  ModalHeader,
-  ModalFooter,
-  ModalBody,
-  ModalCloseButton,
-  Text,
-  useDisclosure,
-  UseDisclosureReturn
-} from '@chakra-ui/react';
-import { CheckCircle, AlertCircle, X, Plus } from 'react-feather';
-import { MinterButton } from '../common';
-import { useSelector, useDispatch } from '../../reducer';
-import { transferTokenAction } from '../../reducer/async/actions';
-import { clearError, setStatus, Status } from '../../reducer/slices/status';
-
-interface FormProps {
-  initialRef: MutableRefObject<null>;
-  onSubmit: (form: { toAddress: string }) => void;
-  toAddress: string;
-  setToAddress: Dispatch<SetStateAction<string>>;
-}
-
-function Form({ initialRef, onSubmit, toAddress, setToAddress }: FormProps) {
-  return (
-    <>
-      <ModalHeader>Transfer Token</ModalHeader>
-      <ModalCloseButton />
-      <ModalBody>
-        <FormControl>
-          <FormLabel fontFamily="mono">To Address</FormLabel>
-          <Input
-            autoFocus={true}
-            ref={initialRef}
-            placeholder="Input token recipient"
-            value={toAddress}
-            onChange={e => setToAddress(e.target.value)}
-          />
-        </FormControl>
-      </ModalBody>
-
-      <ModalFooter>
-        <MinterButton
-          variant="primaryAction"
-          onClick={() => onSubmit({ toAddress })}
-        >
-          Transfer
-        </MinterButton>
-      </ModalFooter>
-    </>
-  );
-}
-
-interface ContentProps {
-  isOpen: boolean;
-  onClose: () => void;
-  onRetry: () => void;
-  onCancel: () => void;
-  status: Status;
-}
-
-function Content({ status, onClose, onRetry, onCancel }: ContentProps) {
-  if (status.error) {
-    return (
-      <Flex flexDir="column" align="center" px={4} py={10}>
-        <Box color="brand.blue" mb={6}>
-          <AlertCircle size="70px" />
-        </Box>
-        <Heading size="lg" textAlign="center" color="gray.500" mb={6}>
-          Error Transferring Token
-        </Heading>
-        <Flex flexDir="row" justify="center">
-          <MinterButton variant="primaryAction" onClick={() => onRetry()}>
-            Retry
-          </MinterButton>
-          <MinterButton
-            variant="tertiaryAction"
-            onClick={() => onCancel()}
-            display="flex"
-            alignItems="center"
-            ml={4}
-          >
-            <Box color="currentcolor">
-              <X size={16} strokeWidth="3" />
-            </Box>
-            <Text fontSize={16} ml={1} fontWeight="600">
-              Close
-            </Text>
-          </MinterButton>
-        </Flex>
-      </Flex>
-    );
-  }
-  if (status.status === 'in_transit') {
-    return (
-      <Flex flexDir="column" align="center" px={4} py={10}>
-        <Spinner size="xl" mb={6} color="gray.300" />
-        <Heading size="lg" textAlign="center" color="gray.500">
-          Transferring token...
-        </Heading>
-      </Flex>
-    );
-  }
-  if (status.status === 'complete') {
-    return (
-      <Flex flexDir="column" align="center" px={4} py={10}>
-        <Box color="brand.blue" mb={6}>
-          <CheckCircle size="70px" />
-        </Box>
-        <Heading size="lg" textAlign="center" color="gray.500" mb={6}>
-          Token transfer complete
-        </Heading>
-        <MinterButton variant="primaryAction" onClick={() => onClose()}>
-          Close
-        </MinterButton>
-      </Flex>
-    );
-  }
-  return null;
-}
-
-interface TransferTokenModalProps {
-  contractAddress: string;
-  tokenId: number;
-  disclosure: UseDisclosureReturn;
-}
-
-export function TransferTokenModal(props: TransferTokenModalProps) {
-  const status = useSelector(s => s.status.transferToken);
-  const dispatch = useDispatch();
-  const [toAddress, setToAddress] = useState('');
-  const { isOpen, onClose } = props.disclosure;
-
-  const initialRef = React.useRef(null);
-
-  const onSubmit = async () => {
-    dispatch(
-      transferTokenAction({
-        contract: props.contractAddress,
-        tokenId: props.tokenId,
-        to: toAddress
-      })
-    );
-  };
-
-  const close = () => {
-    if (status.status !== 'in_transit') {
-      dispatch(setStatus({ method: 'transferToken', status: 'ready' }));
-      onClose();
-    }
-  };
-
-  return (
-    <Modal
-      isOpen={isOpen}
-      onClose={() => close()}
-      initialFocusRef={initialRef}
-      closeOnEsc={false}
-      closeOnOverlayClick={false}
-      onEsc={() => close()}
-      onOverlayClick={() => close()}
-    >
-      <ModalOverlay />
-      <ModalContent mt={40}>
-        {status.status === 'ready' ? (
-          <Form
-            initialRef={initialRef}
-            onSubmit={onSubmit}
-            toAddress={toAddress}
-            setToAddress={setToAddress}
-          />
-        ) : (
-          <Content
-            isOpen={isOpen}
-            status={status}
-            onClose={() => close()}
-            onCancel={() => {
-              onClose();
-              dispatch(clearError({ method: 'transferToken' }));
-              dispatch(setStatus({ method: 'transferToken', status: 'ready' }));
-            }}
-            onRetry={() => {
-              dispatch(clearError({ method: 'transferToken' }));
-              onSubmit();
-            }}
-          />
-        )}
-      </ModalContent>
-    </Modal>
-  );
-}
-
-interface TransferTokenButtonProps {
-  contractAddress: string;
-  tokenId: number;
-}
-
-export function TransferTokenButton(props: TransferTokenButtonProps) {
-  const disclosure = useDisclosure();
-  return (
-    <>
-      <MinterButton variant="primaryAction" onClick={disclosure.onOpen}>
-        <Box color="currentcolor">
-          <Plus size={16} strokeWidth="3" />
-        </Box>
-        <Text ml={2}>Transfer Token</Text>
-      </MinterButton>
-      <TransferTokenModal {...props} disclosure={disclosure} />
-    </>
-  );
-}
diff --git a/src/components/common/assets/placeholder_asset.png b/src/components/common/assets/placeholder_asset.png
deleted file mode 100644
index 71cea938..00000000
Binary files a/src/components/common/assets/placeholder_asset.png and /dev/null differ
diff --git a/src/components/common/modals/BuyToken.tsx b/src/components/common/modals/BuyToken.tsx
new file mode 100644
index 00000000..4bd25aaf
--- /dev/null
+++ b/src/components/common/modals/BuyToken.tsx
@@ -0,0 +1,88 @@
+import React from 'react';
+import {
+  Box,
+  Button,
+  ModalHeader,
+  ModalFooter,
+  ModalBody,
+  ModalCloseButton,
+  Text,
+  useDisclosure
+} from '@chakra-ui/react';
+import { MinterButton } from '../../common';
+import { useDispatch } from '../../../reducer';
+import { buyTokenAction } from '../../../reducer/async/actions';
+import { Nft } from '../../../lib/nfts/queries';
+import FormModal, { BaseModalProps, BaseModalButtonProps } from './FormModal';
+
+interface BuyTokenModalProps extends BaseModalProps {
+  contract: string;
+  token: Nft;
+}
+
+export function BuyTokenModal(props: BuyTokenModalProps) {
+  const dispatch = useDispatch();
+  const initialRef = React.useRef(null);
+  return (
+    <FormModal
+      disclosure={props.disclosure}
+      sync={props.sync}
+      method="buyToken"
+      dispatchThunk={() =>
+        dispatch(
+          buyTokenAction({
+            contract: props.contract,
+            tokenId: props.token.id,
+            tokenSeller: props.token.sale?.seller || '',
+            salePrice: props.token.sale?.price || 0
+          })
+        )
+      }
+      initialRef={initialRef}
+      pendingMessage="Purchasing token..."
+      completeMessage="Token purchased"
+      body={onSubmit => (
+        <>
+          <ModalHeader>Checkout</ModalHeader>
+          <ModalCloseButton />
+          <ModalBody>
+            <Text>
+              You are about to purchase
+              <Box as="span" fontWeight="bold">
+                {' '}
+                {props.token.title} (ꜩ {props.token.sale?.price})
+              </Box>
+            </Text>
+          </ModalBody>
+          <ModalFooter>
+            <Button
+              variant="primaryAction"
+              onClick={() => onSubmit()}
+              isFullWidth={true}
+            >
+              Buy now
+            </Button>
+          </ModalFooter>
+        </>
+      )}
+    />
+  );
+}
+
+interface BuyTokenButtonProps extends BaseModalButtonProps {
+  contract: string;
+  token: Nft;
+}
+
+export function BuyTokenButton(props: BuyTokenButtonProps) {
+  const disclosure = useDisclosure();
+  return (
+    <>
+      <MinterButton variant="primaryAction" onClick={disclosure.onOpen}>
+        Buy now
+      </MinterButton>
+
+      <BuyTokenModal {...props} disclosure={disclosure} sync={props.sync} />
+    </>
+  );
+}
diff --git a/src/components/common/modals/CancelTokenSale.tsx b/src/components/common/modals/CancelTokenSale.tsx
new file mode 100644
index 00000000..cfd3433e
--- /dev/null
+++ b/src/components/common/modals/CancelTokenSale.tsx
@@ -0,0 +1,84 @@
+import React from 'react';
+import {
+  Button,
+  ModalHeader,
+  ModalFooter,
+  ModalBody,
+  ModalCloseButton,
+  Text,
+  useDisclosure
+} from '@chakra-ui/react';
+import { MinterButton } from '../../common';
+import { useDispatch } from '../../../reducer';
+import { cancelTokenSaleAction } from '../../../reducer/async/actions';
+import FormModal, { BaseModalProps, BaseModalButtonProps } from './FormModal';
+
+interface CancelTokenSaleModalProps extends BaseModalProps {
+  contract: string;
+  tokenId: number;
+}
+
+export function CancelTokenSaleModal(props: CancelTokenSaleModalProps) {
+  const dispatch = useDispatch();
+  const initialRef = React.useRef(null);
+  return (
+    <FormModal
+      disclosure={props.disclosure}
+      sync={props.sync}
+      method="cancelTokenSale"
+      dispatchThunk={() =>
+        dispatch(
+          cancelTokenSaleAction({
+            contract: props.contract,
+            tokenId: props.tokenId
+          })
+        )
+      }
+      initialRef={initialRef}
+      pendingMessage="Canceling token sale..."
+      completeMessage="Token sale canceled"
+      body={onSubmit => (
+        <>
+          <ModalHeader>Are you sure?</ModalHeader>
+          <ModalCloseButton />
+          <ModalBody>
+            <Text>Are you sure you want to cancel the sale?</Text>
+          </ModalBody>
+          <ModalFooter>
+            <Button variant="primaryAction" mr={3} onClick={() => onSubmit()}>
+              Yes
+            </Button>
+            <Button
+              variant="cancelAction"
+              onClick={() => props.disclosure.onClose()}
+            >
+              No
+            </Button>
+          </ModalFooter>
+        </>
+      )}
+    />
+  );
+}
+
+interface CancelTokenSaleButtonProps extends BaseModalButtonProps {
+  contract: string;
+  tokenId: number;
+}
+
+export function CancelTokenSaleButton(props: CancelTokenSaleButtonProps) {
+  const disclosure = useDisclosure();
+  return (
+    <>
+      <MinterButton variant="cancelAction" onClick={disclosure.onOpen}>
+        Cancel sale
+      </MinterButton>
+
+      <CancelTokenSaleModal
+        {...props}
+        disclosure={disclosure}
+        sync={props.sync}
+      />
+    </>
+  );
+}
diff --git a/src/components/common/modals/CreateCollection.tsx b/src/components/common/modals/CreateCollection.tsx
new file mode 100644
index 00000000..fbd89fc3
--- /dev/null
+++ b/src/components/common/modals/CreateCollection.tsx
@@ -0,0 +1,78 @@
+import React, { useState } from 'react';
+import {
+  Box,
+  Text,
+  FormControl,
+  FormLabel,
+  Input,
+  ModalHeader,
+  ModalFooter,
+  ModalBody,
+  ModalCloseButton,
+  useDisclosure
+} from '@chakra-ui/react';
+import { Plus } from 'react-feather';
+import { MinterButton } from '../../common';
+import { useDispatch } from '../../../reducer';
+import { createAssetContractAction } from '../../../reducer/async/actions';
+import FormModal, { BaseModalProps, BaseModalButtonProps } from './FormModal';
+
+interface CreateCollectionModalProps extends BaseModalProps {}
+
+function CreateCollectionModal(props: CreateCollectionModalProps) {
+  const [contractName, setContractName] = useState('');
+  const dispatch = useDispatch();
+  const initialRef = React.useRef(null);
+  return (
+    <FormModal
+      disclosure={props.disclosure}
+      sync={props.sync}
+      method="createAssetContract"
+      dispatchThunk={() => dispatch(createAssetContractAction(contractName))}
+      onComplete={() => setContractName('')}
+      initialRef={initialRef}
+      pendingMessage="Creating collection..."
+      completeMessage="Collection created"
+      body={onSubmit => (
+        <>
+          <ModalHeader>New Collection</ModalHeader>
+          <ModalCloseButton />
+          <ModalBody>
+            <FormControl>
+              <FormLabel fontFamily="mono">Collection Name</FormLabel>
+              <Input
+                autoFocus={true}
+                ref={initialRef}
+                placeholder="Input your collection name"
+                value={contractName}
+                onChange={e => setContractName(e.target.value)}
+              />
+            </FormControl>
+          </ModalBody>
+          <ModalFooter>
+            <MinterButton variant="primaryAction" onClick={() => onSubmit()}>
+              Create Collection
+            </MinterButton>
+          </ModalFooter>
+        </>
+      )}
+    />
+  );
+}
+
+interface CreateCollectionButtonProps extends BaseModalButtonProps {}
+
+export function CreateCollectionButton(props: CreateCollectionButtonProps) {
+  const disclosure = useDisclosure();
+  return (
+    <>
+      <MinterButton variant="primaryActionInverted" onClick={disclosure.onOpen}>
+        <Box color="currentcolor">
+          <Plus size={16} strokeWidth="3" />
+        </Box>
+        <Text ml={2}>New Collection</Text>
+      </MinterButton>
+      <CreateCollectionModal disclosure={disclosure} sync={props.sync} />
+    </>
+  );
+}
diff --git a/src/components/common/modals/FormModal.tsx b/src/components/common/modals/FormModal.tsx
new file mode 100644
index 00000000..334b6613
--- /dev/null
+++ b/src/components/common/modals/FormModal.tsx
@@ -0,0 +1,219 @@
+import React, { useState, useEffect } from 'react';
+import {
+  Box,
+  Text,
+  Modal,
+  ModalOverlay,
+  ModalContent,
+  Spinner,
+  Flex,
+  Heading,
+  UseDisclosureReturn
+} from '@chakra-ui/react';
+import { CheckCircle, AlertCircle, X } from 'react-feather';
+import { MinterButton } from '../../common';
+import { useSelector, useDispatch } from '../../../reducer';
+import {
+  clearError,
+  setStatus,
+  Status,
+  Method
+} from '../../../reducer/slices/status';
+
+interface ContentProps {
+  isOpen: boolean;
+  onClose: () => void;
+  onRetry: () => void;
+  onCancel: () => void;
+  status: Status;
+  sync: boolean;
+  pendingMessage?: React.ReactNode;
+  pendingAsyncMessage?: React.ReactNode;
+  completeMessage?: React.ReactNode;
+}
+
+function Content(props: ContentProps) {
+  const { status, onClose, onRetry, onCancel } = props;
+  if (status.error) {
+    return (
+      <Flex flexDir="column" align="center" px={4} py={10}>
+        <Box color="brand.blue" mb={6}>
+          <AlertCircle size="70px" />
+        </Box>
+        <Heading size="lg" textAlign="center" color="gray.500" mb={6}>
+          Error Creating Collection
+        </Heading>
+        <Flex flexDir="row" justify="center">
+          <MinterButton variant="primaryAction" onClick={() => onRetry()}>
+            Retry
+          </MinterButton>
+          <MinterButton
+            variant="tertiaryAction"
+            onClick={() => onCancel()}
+            display="flex"
+            alignItems="center"
+            ml={4}
+          >
+            <Box color="currentcolor">
+              <X size={16} strokeWidth="3" />
+            </Box>
+            <Text fontSize={16} ml={1} fontWeight="600">
+              Close
+            </Text>
+          </MinterButton>
+        </Flex>
+      </Flex>
+    );
+  }
+  if (status.status === 'in_transit') {
+    return (
+      <Flex flexDir="column" align="center" px={4} py={10}>
+        <Spinner size="xl" mb={6} color="gray.300" />
+        <Heading size="lg" textAlign="center" color="gray.500">
+          {props.sync
+            ? props.pendingMessage || 'Operation pending...'
+            : props.pendingAsyncMessage || 'Opening wallet...'}
+        </Heading>
+      </Flex>
+    );
+  }
+  if (status.status === 'complete') {
+    return (
+      <Flex flexDir="column" align="center" px={4} py={10}>
+        <Box color="brand.blue" mb={6}>
+          <CheckCircle size="70px" />
+        </Box>
+        <Heading size="lg" textAlign="center" color="gray.500" mb={6}>
+          {props.completeMessage || 'Operation complete'}
+        </Heading>
+        <MinterButton variant="primaryAction" onClick={() => onClose()}>
+          Close
+        </MinterButton>
+      </Flex>
+    );
+  }
+  return null;
+}
+
+export type AsyncThunkActionResult = { requestId: string } & Promise<{
+  meta: { requestStatus: 'fulfilled' | 'rejected' };
+}>;
+
+interface FormModalProps {
+  // Required Props
+  disclosure: UseDisclosureReturn;
+  method: Method;
+  dispatchThunk: () => AsyncThunkActionResult;
+  // Optional Props
+  sync?: boolean;
+  body?: (onSubmit: () => Promise<void>) => React.ReactNode;
+  dispatchOnOpen?: boolean;
+  initialRef?: React.MutableRefObject<null>;
+  onComplete?: () => void;
+  afterClose?: () => void;
+  pendingMessage?: React.ReactNode;
+  pendingAsyncMessage?: React.ReactNode;
+  completeMessage?: React.ReactNode;
+}
+
+export default function FormModal(props: FormModalProps) {
+  const { sync = false, dispatchOnOpen = false, onComplete, method } = props;
+  const { isOpen, onOpen, onClose } = props.disclosure;
+  const [requestId, setRequestId] = useState<string | null>(null);
+  const status = useSelector(s => s.status[props.method]);
+  const dispatch = useDispatch();
+  const notification = useSelector(s =>
+    s.notifications.find(
+      n => n.requestId === requestId && n.status === 'pending' && !n.delivered
+    )
+  );
+
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  const onSubmit = async () => {
+    const result = props.dispatchThunk();
+    setRequestId(result.requestId);
+    dispatch(setStatus({ method, status: 'in_transit' }));
+    const requestStatus = (await result).meta.requestStatus;
+    if (requestStatus === 'fulfilled') {
+      dispatch(setStatus({ method, status: sync ? 'complete' : 'ready' }));
+      onComplete?.call(null);
+    }
+  };
+
+  const hasError = status.error !== null;
+
+  useEffect(() => {
+    if (!requestId && isOpen && dispatchOnOpen && !hasError) {
+      onSubmit();
+    }
+  }, [isOpen, dispatchOnOpen, hasError, onSubmit, requestId]);
+
+  const closeAndReset = (withCallback = true) => {
+    onClose();
+    setRequestId(null);
+    dispatch(clearError({ method: props.method }));
+    dispatch(setStatus({ method: props.method, status: 'ready' }));
+    withCallback && props.afterClose && props.afterClose();
+  };
+
+  const closeIfReadyOrComplete = () => {
+    if (status.status !== 'in_transit' || hasError) {
+      closeAndReset();
+    }
+  };
+
+  useEffect(() => {
+    if (!sync && isOpen && !hasError && notification) {
+      return closeAndReset();
+    } else if (!isOpen && hasError) {
+      return onOpen();
+    }
+  });
+
+  return (
+    <>
+      <Modal
+        isOpen={isOpen}
+        onClose={() => closeIfReadyOrComplete()}
+        initialFocusRef={props.initialRef}
+        closeOnEsc={false}
+        closeOnOverlayClick={false}
+        onEsc={() => closeIfReadyOrComplete()}
+        onOverlayClick={() => closeIfReadyOrComplete()}
+      >
+        <ModalOverlay />
+        <ModalContent mt={40}>
+          {status.status === 'ready' ? (
+            props.body ? (
+              props.body(onSubmit)
+            ) : null
+          ) : (
+            <Content
+              sync={sync}
+              isOpen={isOpen}
+              status={status}
+              onClose={() => closeIfReadyOrComplete()}
+              onCancel={() => closeAndReset(false)}
+              onRetry={() => {
+                dispatch(clearError({ method: props.method }));
+                onSubmit();
+              }}
+              pendingMessage={props.pendingMessage}
+              pendingAsyncMessage={props.pendingAsyncMessage}
+              completeMessage={props.completeMessage}
+            />
+          )}
+        </ModalContent>
+      </Modal>
+    </>
+  );
+}
+
+export interface BaseModalProps {
+  disclosure: UseDisclosureReturn;
+  sync?: boolean;
+}
+
+export interface BaseModalButtonProps {
+  sync?: boolean;
+}
diff --git a/src/components/common/modals/SellToken.tsx b/src/components/common/modals/SellToken.tsx
new file mode 100644
index 00000000..b35f254b
--- /dev/null
+++ b/src/components/common/modals/SellToken.tsx
@@ -0,0 +1,108 @@
+import React, { useState } from 'react';
+import {
+  Box,
+  Flex,
+  FormControl,
+  Input,
+  InputGroup,
+  InputLeftElement,
+  ModalHeader,
+  ModalFooter,
+  ModalBody,
+  ModalCloseButton,
+  useDisclosure
+} from '@chakra-ui/react';
+import { Check } from 'react-feather';
+import { MinterButton } from '../../common';
+import { useDispatch } from '../../../reducer';
+import { listTokenAction } from '../../../reducer/async/actions';
+import FormModal, { BaseModalProps, BaseModalButtonProps } from './FormModal';
+
+interface SellTokenModalProps extends BaseModalProps {
+  contract: string;
+  tokenId: number;
+}
+
+export function SellTokenModal(props: SellTokenModalProps) {
+  const [price, setPrice] = useState('');
+  const dispatch = useDispatch();
+  const initialRef = React.useRef(null);
+
+  const salePrice = Math.floor(Number(price) * 1000000);
+  const validPrice = !Number.isNaN(price) && salePrice > 0;
+  return (
+    <FormModal
+      disclosure={props.disclosure}
+      sync={props.sync}
+      method="listToken"
+      dispatchThunk={() =>
+        dispatch(
+          listTokenAction({
+            contract: props.contract,
+            tokenId: props.tokenId,
+            salePrice: salePrice
+          })
+        )
+      }
+      onComplete={() => setPrice('')}
+      initialRef={initialRef}
+      pendingMessage="Listing token for sale..."
+      completeMessage="Token listed for sale"
+      body={onSubmit => (
+        <>
+          <ModalHeader>Set your price</ModalHeader>
+          <ModalCloseButton />
+          <ModalBody>
+            <Flex>
+              <FormControl>
+                <InputGroup>
+                  <InputLeftElement
+                    pointerEvents="none"
+                    color="gray.900"
+                    fontSize="1.2em"
+                    children="ꜩ"
+                  />
+                  <Input
+                    autoFocus={true}
+                    ref={initialRef}
+                    placeholder="Enter sale amount"
+                    value={price}
+                    onChange={e => setPrice(e.target.value)}
+                  />
+                </InputGroup>
+              </FormControl>
+              <Box ml={2}>
+                <MinterButton
+                  variant={
+                    validPrice ? 'primaryAction' : 'primaryActionInactive'
+                  }
+                  onClick={() => validPrice && onSubmit()}
+                >
+                  <Check />
+                </MinterButton>
+              </Box>
+            </Flex>
+          </ModalBody>
+          <ModalFooter />
+        </>
+      )}
+    />
+  );
+}
+
+interface SellTokenButtonProps extends BaseModalButtonProps {
+  contract: string;
+  tokenId: number;
+}
+
+export function SellTokenButton(props: SellTokenButtonProps) {
+  const disclosure = useDisclosure();
+  return (
+    <>
+      <MinterButton variant="primaryAction" onClick={disclosure.onOpen}>
+        Sell
+      </MinterButton>
+      <SellTokenModal {...props} disclosure={disclosure} sync={props.sync} />
+    </>
+  );
+}
diff --git a/src/components/common/modals/TransferToken.tsx b/src/components/common/modals/TransferToken.tsx
new file mode 100644
index 00000000..e4988cb4
--- /dev/null
+++ b/src/components/common/modals/TransferToken.tsx
@@ -0,0 +1,97 @@
+import React, { useState } from 'react';
+import {
+  Box,
+  FormControl,
+  FormLabel,
+  Input,
+  ModalHeader,
+  ModalFooter,
+  ModalBody,
+  ModalCloseButton,
+  Text,
+  useDisclosure
+} from '@chakra-ui/react';
+import { Plus } from 'react-feather';
+import { MinterButton } from '../../common/index';
+import { useDispatch } from '../../../reducer';
+import { transferTokenAction } from '../../../reducer/async/actions';
+import FormModal, { BaseModalProps, BaseModalButtonProps } from './FormModal';
+
+interface TransferTokenModalProps extends BaseModalProps {
+  contractAddress: string;
+  tokenId: number;
+}
+
+export function TransferTokenModal(props: TransferTokenModalProps) {
+  const [toAddress, setToAddress] = useState('');
+  const dispatch = useDispatch();
+  const initialRef = React.useRef(null);
+  return (
+    <FormModal
+      disclosure={props.disclosure}
+      sync={props.sync}
+      method="transferToken"
+      dispatchThunk={() =>
+        dispatch(
+          transferTokenAction({
+            contract: props.contractAddress,
+            tokenId: props.tokenId,
+            to: toAddress
+          })
+        )
+      }
+      onComplete={() => setToAddress('')}
+      initialRef={initialRef}
+      pendingMessage="Transferring token..."
+      completeMessage="Transfer complete"
+      body={onSubmit => (
+        <>
+          <ModalHeader>Transfer Token</ModalHeader>
+          <ModalCloseButton />
+          <ModalBody>
+            <FormControl>
+              <FormLabel fontFamily="mono">To Address</FormLabel>
+              <Input
+                autoFocus={true}
+                ref={initialRef}
+                placeholder="Input token recipient"
+                value={toAddress}
+                onChange={e => setToAddress(e.target.value)}
+              />
+            </FormControl>
+          </ModalBody>
+
+          <ModalFooter>
+            <MinterButton variant="primaryAction" onClick={() => onSubmit()}>
+              Transfer
+            </MinterButton>
+          </ModalFooter>
+        </>
+      )}
+    />
+  );
+}
+
+interface TransferTokenButtonProps extends BaseModalButtonProps {
+  contractAddress: string;
+  tokenId: number;
+}
+
+export function TransferTokenButton(props: TransferTokenButtonProps) {
+  const disclosure = useDisclosure();
+  return (
+    <>
+      <MinterButton variant="primaryAction" onClick={disclosure.onOpen}>
+        <Box color="currentcolor">
+          <Plus size={16} strokeWidth="3" />
+        </Box>
+        <Text ml={2}>Transfer Token</Text>
+      </MinterButton>
+      <TransferTokenModal
+        {...props}
+        disclosure={disclosure}
+        sync={props.sync}
+      />
+    </>
+  );
+}
diff --git a/src/lib/nfts/actions.ts b/src/lib/nfts/actions.ts
index 86019d7f..be4860a5 100644
--- a/src/lib/nfts/actions.ts
+++ b/src/lib/nfts/actions.ts
@@ -1,8 +1,10 @@
 import { MichelsonMap } from '@taquito/taquito';
+import {
+  Fa2MultiNftAssetCode,
+  Fa2MultiNftFaucetCode
+} from '@tqtezos/minter-contracts';
 import { Buffer } from 'buffer';
 import { SystemWithWallet } from '../system';
-import faucetCode from './code/fa2_tzip16_compat_multi_nft_faucet';
-import assetCode from './code/fa2_tzip16_compat_multi_nft_asset';
 import { uploadIPFSJSON } from '../util/ipfs';
 import { NftMetadata } from './queries';
 
@@ -24,7 +26,7 @@ export async function createFaucetContract(
   metadataMap.set('', toHexString(resp.data.ipfsUri));
   return await system.toolkit.wallet
     .originate({
-      code: faucetCode,
+      code: Fa2MultiNftFaucetCode.code,
       storage: {
         assets: {
           ledger: new MichelsonMap(),
@@ -52,7 +54,7 @@ export async function createAssetContract(
   metadataMap.set('', toHexString(resp.data.ipfsUri));
   return await system.toolkit.wallet
     .originate({
-      code: assetCode,
+      code: Fa2MultiNftAssetCode.code,
       storage: {
         assets: {
           ledger: new MichelsonMap(),
diff --git a/src/lib/nfts/code/fa2_tzip16_compat_multi_nft_asset.ts b/src/lib/nfts/code/fa2_tzip16_compat_multi_nft_asset.ts
deleted file mode 100644
index f2445293..00000000
--- a/src/lib/nfts/code/fa2_tzip16_compat_multi_nft_asset.ts
+++ /dev/null
@@ -1,526 +0,0 @@
-const code = `
-{ parameter
-    (or (or (or %admin (or (unit %confirm_admin) (bool %pause)) (address %set_admin))
-            (or %assets
-               (or (pair %balance_of
-                      (list %requests (pair (address %owner) (nat %token_id)))
-                      (contract %callback
-                         (list (pair (pair %request (address %owner) (nat %token_id)) (nat %balance)))))
-                   (list %transfer
-                      (pair (address %from_)
-                            (list %txs (pair (address %to_) (pair (nat %token_id) (nat %amount)))))))
-               (list %update_operators
-                  (or (pair %add_operator (address %owner) (pair (address %operator) (nat %token_id)))
-                      (pair %remove_operator (address %owner) (pair (address %operator) (nat %token_id)))))))
-        (list %mint
-           (pair (pair %token_metadata (nat %token_id) (map %token_info string bytes))
-                 (address %owner)))) ;
-  storage
-    (pair (pair (option %admin
-                   (pair (pair (address %admin) (bool %paused)) (option %pending_admin address)))
-                (pair %assets
-                   (pair (big_map %ledger nat address) (nat %next_token_id))
-                   (pair (big_map %operators (pair address (pair address nat)) unit)
-                         (big_map %token_metadata nat (pair (nat %token_id) (map %token_info string bytes))))))
-          (big_map %metadata string bytes)) ;
-  code { PUSH string "FA2_TOKEN_UNDEFINED" ;
-         PUSH string "FA2_INSUFFICIENT_BALANCE" ;
-         SWAP ;
-         DUP ;
-         DUG 2 ;
-         SWAP ;
-         PAIR ;
-         LAMBDA
-           (pair (pair string string)
-                 (pair (pair (list (pair (option address) (list (pair (option address) (pair nat nat)))))
-                             (lambda
-                                (pair (pair address address) (pair nat (big_map (pair address (pair address nat)) unit)))
-                                unit))
-                       (pair (pair (big_map nat address) nat)
-                             (pair (big_map (pair address (pair address nat)) unit)
-                                   (big_map nat (pair nat (map string bytes)))))))
-           (pair (list operation)
-                 (pair (pair (big_map nat address) nat)
-                       (pair (big_map (pair address (pair address nat)) unit)
-                             (big_map nat (pair nat (map string bytes))))))
-           { UNPAIR ;
-             UNPAIR ;
-             DIG 2 ;
-             UNPAIR ;
-             UNPAIR ;
-             DUP 3 ;
-             CAR ;
-             CAR ;
-             DUP 4 ;
-             CDR ;
-             CAR ;
-             PAIR ;
-             DUG 2 ;
-             DUP ;
-             DUG 3 ;
-             DIG 2 ;
-             UNPAIR ;
-             SWAP ;
-             DIG 2 ;
-             ITER { DUP ;
-                    DUG 2 ;
-                    CDR ;
-                    ITER { SWAP ;
-                           DUP 3 ;
-                           CAR ;
-                           IF_NONE
-                             { UNIT }
-                             { DUP 5 ;
-                               DUP 4 ;
-                               CDR ;
-                               CAR ;
-                               PAIR ;
-                               SENDER ;
-                               DIG 2 ;
-                               PAIR ;
-                               PAIR ;
-                               DUP 6 ;
-                               SWAP ;
-                               EXEC } ;
-                           DROP ;
-                           PUSH nat 1 ;
-                           DUP 3 ;
-                           CDR ;
-                           CDR ;
-                           COMPARE ;
-                           GT ;
-                           IF { DROP 2 ; DUP 6 ; FAILWITH }
-                              { PUSH nat 0 ;
-                                DUP 3 ;
-                                CDR ;
-                                CDR ;
-                                COMPARE ;
-                                EQ ;
-                                IF { DUP ;
-                                     DIG 2 ;
-                                     CDR ;
-                                     CAR ;
-                                     GET ;
-                                     IF_NONE { DROP ; DUP 7 ; FAILWITH } { DROP } }
-                                   { SWAP ;
-                                     DUP ;
-                                     DUG 2 ;
-                                     CDR ;
-                                     CAR ;
-                                     DUP 4 ;
-                                     CAR ;
-                                     IF_NONE
-                                       { DROP }
-                                       { DUP 3 ;
-                                         DUP 3 ;
-                                         GET ;
-                                         IF_NONE
-                                           { DROP 3 ; DUP 8 ; FAILWITH }
-                                           { COMPARE ;
-                                             EQ ;
-                                             IF { NONE address ; SWAP ; UPDATE } { DROP 2 ; DUP 7 ; FAILWITH } } } ;
-                                     SWAP ;
-                                     DUP ;
-                                     DUG 2 ;
-                                     CDR ;
-                                     CAR ;
-                                     DIG 2 ;
-                                     CAR ;
-                                     IF_NONE { DROP } { DIG 2 ; SWAP ; DIG 2 ; SWAP ; SOME ; SWAP ; UPDATE } } } } ;
-                    SWAP ;
-                    DROP } ;
-             SWAP ;
-             DROP ;
-             SWAP ;
-             DROP ;
-             DIG 3 ;
-             DROP ;
-             DIG 3 ;
-             DROP ;
-             DUP 3 ;
-             CDR ;
-             DUP 4 ;
-             CAR ;
-             CDR ;
-             DIG 2 ;
-             PAIR ;
-             PAIR ;
-             DUG 2 ;
-             DROP 2 ;
-             NIL operation ;
-             PAIR } ;
-         SWAP ;
-         APPLY ;
-         LAMBDA
-           (option (pair (pair address bool) (option address)))
-           unit
-           { IF_NONE
-               { UNIT }
-               { CAR ;
-                 CAR ;
-                 SENDER ;
-                 COMPARE ;
-                 NEQ ;
-                 IF { PUSH string "NOT_AN_ADMIN" ; FAILWITH } { UNIT } } } ;
-         DIG 3 ;
-         UNPAIR ;
-         IF_LEFT
-           { IF_LEFT
-               { DIG 3 ;
-                 DROP ;
-                 DIG 3 ;
-                 DROP ;
-                 SWAP ;
-                 DUP ;
-                 DUG 2 ;
-                 CAR ;
-                 CAR ;
-                 SWAP ;
-                 IF_LEFT
-                   { IF_LEFT
-                       { DROP ;
-                         DIG 2 ;
-                         DROP ;
-                         IF_NONE
-                           { PUSH string "NO_ADMIN_CAPABILITIES_CONFIGURED" ; FAILWITH }
-                           { DUP ;
-                             CDR ;
-                             IF_NONE
-                               { DROP ; PUSH string "NO_PENDING_ADMIN" ; FAILWITH }
-                               { SENDER ;
-                                 COMPARE ;
-                                 EQ ;
-                                 IF { NONE address ; SWAP ; CAR ; CDR ; SENDER ; PAIR ; PAIR ; SOME }
-                                    { DROP ; PUSH string "NOT_A_PENDING_ADMIN" ; FAILWITH } } } ;
-                         NIL operation ;
-                         PAIR }
-                       { SWAP ;
-                         DUP ;
-                         DUG 2 ;
-                         DIG 4 ;
-                         SWAP ;
-                         EXEC ;
-                         DROP ;
-                         SWAP ;
-                         IF_NONE
-                           { DROP ; PUSH string "NO_ADMIN_CAPABILITIES_CONFIGURED" ; FAILWITH }
-                           { DUP ; CDR ; DUG 2 ; CAR ; CAR ; PAIR ; PAIR ; SOME } ;
-                         NIL operation ;
-                         PAIR } }
-                   { SWAP ;
-                     DUP ;
-                     DUG 2 ;
-                     DIG 4 ;
-                     SWAP ;
-                     EXEC ;
-                     DROP ;
-                     SWAP ;
-                     IF_NONE
-                       { DROP ; PUSH string "NO_ADMIN_CAPABILITIES_CONFIGURED" ; FAILWITH }
-                       { SWAP ; SOME ; SWAP ; CAR ; PAIR ; SOME } ;
-                     NIL operation ;
-                     PAIR } ;
-                 UNPAIR ;
-                 DUP 3 ;
-                 CDR ;
-                 DIG 3 ;
-                 CAR ;
-                 CDR ;
-                 DIG 3 ;
-                 PAIR ;
-                 PAIR ;
-                 SWAP ;
-                 PAIR }
-               { DIG 2 ;
-                 DROP ;
-                 SWAP ;
-                 DUP ;
-                 DUG 2 ;
-                 CAR ;
-                 CAR ;
-                 IF_NONE
-                   { UNIT }
-                   { CAR ; CDR ; IF { PUSH string "PAUSED" ; FAILWITH } { UNIT } } ;
-                 DROP ;
-                 SWAP ;
-                 DUP ;
-                 DUG 2 ;
-                 CAR ;
-                 CDR ;
-                 SWAP ;
-                 IF_LEFT
-                   { IF_LEFT
-                       { DIG 3 ;
-                         DROP ;
-                         SWAP ;
-                         DUP ;
-                         DUG 2 ;
-                         CAR ;
-                         CAR ;
-                         SWAP ;
-                         DUP ;
-                         CAR ;
-                         MAP { DUP 3 ;
-                               SWAP ;
-                               DUP ;
-                               DUG 2 ;
-                               CDR ;
-                               GET ;
-                               IF_NONE
-                                 { DROP ; DUP 5 ; FAILWITH }
-                                 { SWAP ;
-                                   DUP ;
-                                   DUG 2 ;
-                                   CAR ;
-                                   SWAP ;
-                                   COMPARE ;
-                                   EQ ;
-                                   IF { PUSH nat 1 } { PUSH nat 0 } ;
-                                   SWAP ;
-                                   PAIR } } ;
-                         DIG 2 ;
-                         DROP ;
-                         DIG 4 ;
-                         DROP ;
-                         SWAP ;
-                         CDR ;
-                         PUSH mutez 0 ;
-                         DIG 2 ;
-                         TRANSFER_TOKENS ;
-                         SWAP ;
-                         NIL operation ;
-                         DIG 2 ;
-                         CONS ;
-                         PAIR }
-                       { DIG 4 ;
-                         DROP ;
-                         MAP { DUP ;
-                               CDR ;
-                               MAP { DUP ;
-                                     CDR ;
-                                     CDR ;
-                                     SWAP ;
-                                     DUP ;
-                                     DUG 2 ;
-                                     CDR ;
-                                     CAR ;
-                                     PAIR ;
-                                     SWAP ;
-                                     CAR ;
-                                     SOME ;
-                                     PAIR } ;
-                               SWAP ;
-                               CAR ;
-                               SOME ;
-                               PAIR } ;
-                         SWAP ;
-                         LAMBDA
-                           (pair (pair address address) (pair nat (big_map (pair address (pair address nat)) unit)))
-                           unit
-                           { UNPAIR ;
-                             UNPAIR ;
-                             DIG 2 ;
-                             UNPAIR ;
-                             DUP 4 ;
-                             DUP 4 ;
-                             COMPARE ;
-                             EQ ;
-                             IF { DROP 4 ; UNIT }
-                                { DIG 3 ;
-                                  PAIR ;
-                                  DIG 2 ;
-                                  PAIR ;
-                                  MEM ;
-                                  IF { UNIT } { PUSH string "FA2_NOT_OPERATOR" ; FAILWITH } } } ;
-                         DIG 2 ;
-                         PAIR ;
-                         PAIR ;
-                         DIG 2 ;
-                         SWAP ;
-                         EXEC } }
-                   { DIG 3 ;
-                     DROP ;
-                     DIG 3 ;
-                     DROP ;
-                     SWAP ;
-                     DUP ;
-                     DUG 2 ;
-                     CDR ;
-                     CAR ;
-                     SWAP ;
-                     SENDER ;
-                     DUG 2 ;
-                     ITER { SWAP ;
-                            DUP 3 ;
-                            DUP 3 ;
-                            IF_LEFT {} {} ;
-                            CAR ;
-                            COMPARE ;
-                            EQ ;
-                            IF {} { PUSH string "FA2_NOT_OWNER" ; FAILWITH } ;
-                            SWAP ;
-                            IF_LEFT
-                              { SWAP ;
-                                UNIT ;
-                                SOME ;
-                                DUP 3 ;
-                                CDR ;
-                                CDR ;
-                                DUP 4 ;
-                                CDR ;
-                                CAR ;
-                                PAIR ;
-                                DIG 3 ;
-                                CAR ;
-                                PAIR ;
-                                UPDATE }
-                              { DUP ;
-                                DUG 2 ;
-                                CDR ;
-                                CDR ;
-                                DUP 3 ;
-                                CDR ;
-                                CAR ;
-                                PAIR ;
-                                DIG 2 ;
-                                CAR ;
-                                PAIR ;
-                                NONE unit ;
-                                SWAP ;
-                                UPDATE } } ;
-                     SWAP ;
-                     DROP ;
-                     SWAP ;
-                     DUP ;
-                     DUG 2 ;
-                     CDR ;
-                     CDR ;
-                     SWAP ;
-                     PAIR ;
-                     SWAP ;
-                     CAR ;
-                     PAIR ;
-                     NIL operation ;
-                     PAIR } ;
-                 UNPAIR ;
-                 DUP 3 ;
-                 CDR ;
-                 DIG 2 ;
-                 DIG 3 ;
-                 CAR ;
-                 CAR ;
-                 PAIR ;
-                 PAIR ;
-                 SWAP ;
-                 PAIR } }
-           { DIG 4 ;
-             DROP ;
-             SWAP ;
-             DUP ;
-             DUG 2 ;
-             CAR ;
-             CAR ;
-             DIG 3 ;
-             SWAP ;
-             EXEC ;
-             DROP ;
-             SWAP ;
-             DUP ;
-             DUG 2 ;
-             CAR ;
-             CDR ;
-             NIL (pair (option address) (pair nat nat)) ;
-             PAIR ;
-             SWAP ;
-             ITER { DUP ;
-                    DUG 2 ;
-                    CAR ;
-                    CAR ;
-                    SWAP ;
-                    DUP ;
-                    DUG 2 ;
-                    CDR ;
-                    CAR ;
-                    CDR ;
-                    SWAP ;
-                    DUP ;
-                    DUG 2 ;
-                    COMPARE ;
-                    LT ;
-                    IF { DROP 3 ; PUSH string "FA2_INVALID_TOKEN_ID" ; FAILWITH }
-                       { SWAP ;
-                         DUP ;
-                         DUG 2 ;
-                         CDR ;
-                         DUP 3 ;
-                         CDR ;
-                         CDR ;
-                         CDR ;
-                         DUP 5 ;
-                         CAR ;
-                         DUP 4 ;
-                         SWAP ;
-                         SOME ;
-                         SWAP ;
-                         UPDATE ;
-                         SWAP ;
-                         DUP ;
-                         DUG 2 ;
-                         CDR ;
-                         CAR ;
-                         PAIR ;
-                         SWAP ;
-                         CAR ;
-                         PAIR ;
-                         DUP ;
-                         CDR ;
-                         PUSH nat 1 ;
-                         DUP 4 ;
-                         ADD ;
-                         DIG 2 ;
-                         CAR ;
-                         CAR ;
-                         PAIR ;
-                         PAIR ;
-                         DIG 2 ;
-                         CAR ;
-                         PUSH nat 1 ;
-                         DIG 3 ;
-                         PAIR ;
-                         DIG 3 ;
-                         CDR ;
-                         SOME ;
-                         PAIR ;
-                         CONS ;
-                         PAIR } } ;
-             DUP ;
-             CDR ;
-             LAMBDA
-               (pair (pair address address) (pair nat (big_map (pair address (pair address nat)) unit)))
-               unit
-               { DROP ; UNIT } ;
-             NIL (pair (option address) (list (pair (option address) (pair nat nat)))) ;
-             DIG 3 ;
-             CAR ;
-             NONE address ;
-             PAIR ;
-             CONS ;
-             PAIR ;
-             PAIR ;
-             DIG 2 ;
-             SWAP ;
-             EXEC ;
-             UNPAIR ;
-             DUP 3 ;
-             CDR ;
-             DIG 2 ;
-             DIG 3 ;
-             CAR ;
-             CAR ;
-             PAIR ;
-             PAIR ;
-             SWAP ;
-             PAIR } } }
-`;
-
-export default code;
diff --git a/src/lib/nfts/code/fa2_tzip16_compat_multi_nft_faucet.ts b/src/lib/nfts/code/fa2_tzip16_compat_multi_nft_faucet.ts
deleted file mode 100644
index 0dac0181..00000000
--- a/src/lib/nfts/code/fa2_tzip16_compat_multi_nft_faucet.ts
+++ /dev/null
@@ -1,516 +0,0 @@
-const code = `
-{ parameter
-    (or (or %assets
-           (or (pair %balance_of
-                  (list %requests (pair (address %owner) (nat %token_id)))
-                  (contract %callback
-                     (list (pair (pair %request (address %owner) (nat %token_id)) (nat %balance)))))
-               (list %transfer
-                  (pair (address %from_)
-                        (list %txs (pair (address %to_) (pair (nat %token_id) (nat %amount)))))))
-           (list %update_operators
-              (or (pair %add_operator (address %owner) (pair (address %operator) (nat %token_id)))
-                  (pair %remove_operator (address %owner) (pair (address %operator) (nat %token_id))))))
-        (list %mint
-           (pair (pair %token_metadata (nat %token_id) (map %token_info string bytes))
-                 (address %owner)))) ;
-  storage
-    (pair (pair %assets
-             (pair (big_map %ledger nat address) (nat %next_token_id))
-             (pair (big_map %operators (pair address (pair address nat)) unit)
-                   (big_map %token_metadata nat (pair (nat %token_id) (map %token_info string bytes)))))
-          (big_map %metadata string bytes)) ;
-  code { PUSH string "FA2_INSUFFICIENT_BALANCE" ;
-         LAMBDA
-           (pair string
-                 (pair (pair (list (pair (option address) (list (pair (option address) (pair nat nat)))))
-                             (lambda
-                                (pair (pair address address) (pair nat (big_map (pair address (pair address nat)) unit)))
-                                unit))
-                       (pair (pair (big_map nat address) nat)
-                             (pair (big_map (pair address (pair address nat)) unit)
-                                   (big_map nat (pair nat (map string bytes)))))))
-           (pair (list operation)
-                 (pair (pair (big_map nat address) nat)
-                       (pair (big_map (pair address (pair address nat)) unit)
-                             (big_map nat (pair nat (map string bytes))))))
-           { DUP ;
-             CDR ;
-             SWAP ;
-             CAR ;
-             SWAP ;
-             DUP ;
-             CDR ;
-             DUP ;
-             CAR ;
-             CAR ;
-             SWAP ;
-             DUP ;
-             DUG 2 ;
-             CDR ;
-             CAR ;
-             PAIR ;
-             DIG 2 ;
-             DUP ;
-             DUG 3 ;
-             CAR ;
-             CDR ;
-             DIG 3 ;
-             CAR ;
-             CAR ;
-             PAIR ;
-             PAIR ;
-             DUP ;
-             CDR ;
-             CDR ;
-             SWAP ;
-             DUP ;
-             DUG 2 ;
-             CAR ;
-             CAR ;
-             ITER { DUP ;
-                    DUG 2 ;
-                    CDR ;
-                    ITER { DIG 2 ;
-                           DUP ;
-                           DUG 3 ;
-                           CAR ;
-                           IF_NONE
-                             { UNIT }
-                             { DIG 4 ;
-                               DUP ;
-                               DUG 5 ;
-                               CDR ;
-                               CAR ;
-                               DIG 2 ;
-                               DUP ;
-                               DUG 3 ;
-                               CDR ;
-                               CAR ;
-                               PAIR ;
-                               SENDER ;
-                               DIG 2 ;
-                               PAIR ;
-                               PAIR ;
-                               DIG 4 ;
-                               DUP ;
-                               DUG 5 ;
-                               CAR ;
-                               CDR ;
-                               SWAP ;
-                               EXEC } ;
-                           DROP ;
-                           PUSH nat 1 ;
-                           SWAP ;
-                           DUP ;
-                           DUG 2 ;
-                           CDR ;
-                           CDR ;
-                           COMPARE ;
-                           GT ;
-                           IF { DROP 2 ; DIG 3 ; DUP ; DUG 4 ; FAILWITH }
-                              { PUSH nat 0 ;
-                                SWAP ;
-                                DUP ;
-                                DUG 2 ;
-                                CDR ;
-                                CDR ;
-                                COMPARE ;
-                                EQ ;
-                                IF { DROP }
-                                   { DUP ;
-                                     DUG 2 ;
-                                     CDR ;
-                                     CAR ;
-                                     DIG 3 ;
-                                     DUP ;
-                                     DUG 4 ;
-                                     CAR ;
-                                     PAIR ;
-                                     PAIR ;
-                                     DUP ;
-                                     CDR ;
-                                     SWAP ;
-                                     DUP ;
-                                     DUG 2 ;
-                                     CAR ;
-                                     CDR ;
-                                     DIG 2 ;
-                                     CAR ;
-                                     CAR ;
-                                     IF_NONE
-                                       { DROP }
-                                       { DIG 2 ;
-                                         DUP ;
-                                         DUG 3 ;
-                                         DIG 2 ;
-                                         DUP ;
-                                         DUG 3 ;
-                                         GET ;
-                                         IF_NONE
-                                           { DROP 3 ; DIG 4 ; DUP ; DUG 5 ; FAILWITH }
-                                           { COMPARE ;
-                                             EQ ;
-                                             IF { NONE address ; SWAP ; UPDATE }
-                                                { DROP 2 ; DIG 4 ; DUP ; DUG 5 ; FAILWITH } } } ;
-                                     SWAP ;
-                                     DUP ;
-                                     DUG 2 ;
-                                     CDR ;
-                                     CAR ;
-                                     DIG 2 ;
-                                     CAR ;
-                                     PAIR ;
-                                     PAIR ;
-                                     DUP ;
-                                     CDR ;
-                                     SWAP ;
-                                     DUP ;
-                                     DUG 2 ;
-                                     CAR ;
-                                     CAR ;
-                                     IF_NONE
-                                       { SWAP ; DROP }
-                                       { DIG 2 ; CAR ; CDR ; SWAP ; SOME ; SWAP ; UPDATE } } } } ;
-                    SWAP ;
-                    DROP } ;
-             SWAP ;
-             DROP ;
-             DIG 2 ;
-             DROP ;
-             SWAP ;
-             DUP ;
-             DUG 2 ;
-             CDR ;
-             DIG 2 ;
-             CAR ;
-             CDR ;
-             DIG 2 ;
-             PAIR ;
-             PAIR ;
-             NIL operation ;
-             PAIR } ;
-         SWAP ;
-         APPLY ;
-         SWAP ;
-         DUP ;
-         DUG 2 ;
-         CDR ;
-         DIG 2 ;
-         CAR ;
-         IF_LEFT
-           { SWAP ;
-             DUP ;
-             DUG 2 ;
-             CAR ;
-             SWAP ;
-             IF_LEFT
-               { IF_LEFT
-                   { DIG 3 ;
-                     DROP ;
-                     SWAP ;
-                     DUP ;
-                     DUG 2 ;
-                     CAR ;
-                     CAR ;
-                     SWAP ;
-                     PAIR ;
-                     DUP ;
-                     CAR ;
-                     DUP ;
-                     CAR ;
-                     MAP { DIG 2 ;
-                           DUP ;
-                           DUG 3 ;
-                           CDR ;
-                           SWAP ;
-                           DUP ;
-                           DUG 2 ;
-                           CDR ;
-                           GET ;
-                           IF_NONE
-                             { DROP ; PUSH string "FA2_TOKEN_UNDEFINED" ; FAILWITH }
-                             { SWAP ;
-                               DUP ;
-                               DUG 2 ;
-                               CAR ;
-                               SWAP ;
-                               COMPARE ;
-                               EQ ;
-                               IF { PUSH nat 1 } { PUSH nat 0 } ;
-                               SWAP ;
-                               PAIR } } ;
-                     DIG 2 ;
-                     DROP ;
-                     SWAP ;
-                     CDR ;
-                     PUSH mutez 0 ;
-                     DIG 2 ;
-                     TRANSFER_TOKENS ;
-                     SWAP ;
-                     NIL operation ;
-                     DIG 2 ;
-                     CONS ;
-                     PAIR }
-                   { MAP { DUP ;
-                           CDR ;
-                           MAP { DUP ;
-                                 CDR ;
-                                 CDR ;
-                                 SWAP ;
-                                 DUP ;
-                                 DUG 2 ;
-                                 CDR ;
-                                 CAR ;
-                                 PAIR ;
-                                 SWAP ;
-                                 CAR ;
-                                 SOME ;
-                                 PAIR } ;
-                           SWAP ;
-                           CAR ;
-                           SOME ;
-                           PAIR } ;
-                     SWAP ;
-                     LAMBDA
-                       (pair (pair address address) (pair nat (big_map (pair address (pair address nat)) unit)))
-                       unit
-                       { DUP ;
-                         CAR ;
-                         CAR ;
-                         SWAP ;
-                         DUP ;
-                         DUG 2 ;
-                         CAR ;
-                         CDR ;
-                         DUP ;
-                         DIG 2 ;
-                         DUP ;
-                         DUG 3 ;
-                         COMPARE ;
-                         EQ ;
-                         IF { DROP 3 ; UNIT }
-                            { DIG 2 ;
-                              DUP ;
-                              DUG 3 ;
-                              CDR ;
-                              CDR ;
-                              DIG 3 ;
-                              CDR ;
-                              CAR ;
-                              DIG 2 ;
-                              PAIR ;
-                              DIG 2 ;
-                              PAIR ;
-                              MEM ;
-                              IF { UNIT } { PUSH string "FA2_NOT_OPERATOR" ; FAILWITH } } } ;
-                     DIG 2 ;
-                     PAIR ;
-                     PAIR ;
-                     DIG 2 ;
-                     SWAP ;
-                     EXEC } }
-               { DIG 3 ;
-                 DROP ;
-                 SWAP ;
-                 DUP ;
-                 DUG 2 ;
-                 CDR ;
-                 CAR ;
-                 SWAP ;
-                 PAIR ;
-                 SENDER ;
-                 SWAP ;
-                 DUP ;
-                 DUG 2 ;
-                 CDR ;
-                 DIG 2 ;
-                 CAR ;
-                 ITER { SWAP ;
-                        PAIR ;
-                        DUP ;
-                        CDR ;
-                        DIG 2 ;
-                        DUP ;
-                        DUG 3 ;
-                        SWAP ;
-                        DUP ;
-                        DUG 2 ;
-                        IF_LEFT {} {} ;
-                        CAR ;
-                        COMPARE ;
-                        EQ ;
-                        IF {} { PUSH string "FA2_NOT_OWNER" ; FAILWITH } ;
-                        SWAP ;
-                        CAR ;
-                        SWAP ;
-                        IF_LEFT
-                          { SWAP ;
-                            UNIT ;
-                            SOME ;
-                            DIG 2 ;
-                            DUP ;
-                            DUG 3 ;
-                            CDR ;
-                            CDR ;
-                            DIG 3 ;
-                            DUP ;
-                            DUG 4 ;
-                            CDR ;
-                            CAR ;
-                            PAIR ;
-                            DIG 3 ;
-                            CAR ;
-                            PAIR ;
-                            UPDATE }
-                          { DUP ;
-                            DUG 2 ;
-                            CDR ;
-                            CDR ;
-                            DIG 2 ;
-                            DUP ;
-                            DUG 3 ;
-                            CDR ;
-                            CAR ;
-                            PAIR ;
-                            DIG 2 ;
-                            CAR ;
-                            PAIR ;
-                            NONE unit ;
-                            SWAP ;
-                            UPDATE } } ;
-                 SWAP ;
-                 DROP ;
-                 SWAP ;
-                 DUP ;
-                 DUG 2 ;
-                 CDR ;
-                 CDR ;
-                 SWAP ;
-                 PAIR ;
-                 SWAP ;
-                 CAR ;
-                 PAIR ;
-                 NIL operation ;
-                 PAIR } ;
-             SWAP ;
-             CDR ;
-             SWAP ;
-             DUP ;
-             DUG 2 ;
-             CDR ;
-             PAIR ;
-             SWAP ;
-             CAR ;
-             PAIR }
-           { SWAP ;
-             DUP ;
-             DUG 2 ;
-             CAR ;
-             SWAP ;
-             PAIR ;
-             DUP ;
-             CDR ;
-             NIL (pair (option address) (pair nat nat)) ;
-             PAIR ;
-             SWAP ;
-             CAR ;
-             ITER { DUP ;
-                    CAR ;
-                    CAR ;
-                    DIG 2 ;
-                    DUP ;
-                    DUG 3 ;
-                    CDR ;
-                    CAR ;
-                    CDR ;
-                    SWAP ;
-                    DUP ;
-                    DUG 2 ;
-                    COMPARE ;
-                    LT ;
-                    IF { DROP 3 ; PUSH string "FA2_INVALID_TOKEN_ID" ; FAILWITH }
-                       { DIG 2 ;
-                         DUP ;
-                         DUG 3 ;
-                         CDR ;
-                         DIG 3 ;
-                         DUP ;
-                         DUG 4 ;
-                         CDR ;
-                         CDR ;
-                         CDR ;
-                         DIG 3 ;
-                         DUP ;
-                         DUG 4 ;
-                         CAR ;
-                         DIG 3 ;
-                         DUP ;
-                         DUG 4 ;
-                         SWAP ;
-                         SOME ;
-                         SWAP ;
-                         UPDATE ;
-                         SWAP ;
-                         DUP ;
-                         DUG 2 ;
-                         CDR ;
-                         CAR ;
-                         PAIR ;
-                         SWAP ;
-                         CAR ;
-                         PAIR ;
-                         DUP ;
-                         CDR ;
-                         PUSH nat 1 ;
-                         DIG 3 ;
-                         DUP ;
-                         DUG 4 ;
-                         ADD ;
-                         DIG 2 ;
-                         CAR ;
-                         CAR ;
-                         PAIR ;
-                         PAIR ;
-                         DIG 3 ;
-                         CAR ;
-                         PUSH nat 1 ;
-                         DIG 3 ;
-                         PAIR ;
-                         DIG 3 ;
-                         CDR ;
-                         SOME ;
-                         PAIR ;
-                         CONS ;
-                         PAIR } } ;
-             DUP ;
-             CDR ;
-             LAMBDA
-               (pair (pair address address) (pair nat (big_map (pair address (pair address nat)) unit)))
-               unit
-               { DROP ; UNIT } ;
-             NIL (pair (option address) (list (pair (option address) (pair nat nat)))) ;
-             DIG 3 ;
-             CAR ;
-             NONE address ;
-             PAIR ;
-             CONS ;
-             PAIR ;
-             PAIR ;
-             DIG 2 ;
-             SWAP ;
-             EXEC ;
-             SWAP ;
-             CDR ;
-             SWAP ;
-             DUP ;
-             DUG 2 ;
-             CDR ;
-             PAIR ;
-             SWAP ;
-             CAR ;
-             PAIR } } }
-
-`;
-
-export default code;
diff --git a/src/lib/nfts/queries.ts b/src/lib/nfts/queries.ts
index b6981fb8..ca0cc035 100644
--- a/src/lib/nfts/queries.ts
+++ b/src/lib/nfts/queries.ts
@@ -174,14 +174,14 @@ export class NftMetadata {
 }
 
 export interface NftMetadataFormat {
-  uri: string;
-  hash: string;
+  uri?: string;
+  hash?: string;
   mimeType: string;
-  fileSize: number;
-  fileName: string;
-  duration: string;
-  dimensions: NtfMetadataFormatDimensions;
-  dataRate: NtfMetadataFormatDataRate;
+  fileSize?: number;
+  fileName?: string;
+  duration?: string;
+  dimensions?: NtfMetadataFormatDimensions;
+  dataRate?: NtfMetadataFormatDataRate;
 }
 
 export interface NtfMetadataFormatDataRate {
diff --git a/src/lib/system.ts b/src/lib/system.ts
index 9c48f2f3..1f4c91e2 100644
--- a/src/lib/system.ts
+++ b/src/lib/system.ts
@@ -1,4 +1,4 @@
-import { TezosToolkit, Context } from '@taquito/taquito';
+import { TezosToolkit, MichelCodecPacker, Context } from '@taquito/taquito';
 import { BeaconWallet } from '@taquito/beacon-wallet';
 import { MetadataProvider, DEFAULT_HANDLERS } from '@taquito/tzip16';
 import { Tzip12Module } from '@taquito/tzip12';
@@ -97,7 +97,7 @@ function createMetadataResolver(
   const ipfsGateway =
     system.config.network === 'sandboxnet'
       ? 'localhost:8080'
-      : 'gateway.ipfs.io';
+      : 'gateway.pinata.cloud';
   const gatewayProtocol =
     system.config.network === 'sandboxnet' ? 'http' : 'https';
   const ipfsHandler = new CustomIpfsHttpHandler(ipfsGateway, gatewayProtocol);
@@ -122,6 +122,7 @@ function createMetadataResolver(
 export function connectToolkit(system: SystemConfigured): SystemWithToolkit {
   const toolkit = new TezosToolkit(system.config.rpc);
   toolkit.addExtension(new Tzip12Module());
+  toolkit.setPackerProvider(new MichelCodecPacker());
   const faucetAddress = system.config.contracts.nftFaucet;
   return {
     ...system,
@@ -245,6 +246,7 @@ export async function disconnectWallet(
 ): Promise<SystemWithToolkit> {
   await system.wallet.disconnect();
   const toolkit = new TezosToolkit(system.config.rpc);
+  toolkit.setPackerProvider(new MichelCodecPacker());
   toolkit.addExtension(new Tzip12Module());
   wallet = null;
   return {
diff --git a/src/lib/util/ipfs.ts b/src/lib/util/ipfs.ts
index 38392b65..c065b476 100644
--- a/src/lib/util/ipfs.ts
+++ b/src/lib/util/ipfs.ts
@@ -46,7 +46,7 @@ export function ipfsUriToGatewayUrl(network: string, uri: string) {
   const ipfsHost =
     network === 'sandboxnet'
       ? 'http://localhost:8080'
-      : 'https://gateway.ipfs.io';
+      : 'https://gateway.pinata.cloud';
   const cid = ipfsUriToCid(uri);
   return cid ? `${ipfsHost}/ipfs/${cid}` : uri;
 }
diff --git a/src/reducer/async/actions.ts b/src/reducer/async/actions.ts
index feb0b250..db381f30 100644
--- a/src/reducer/async/actions.ts
+++ b/src/reducer/async/actions.ts
@@ -20,6 +20,7 @@ import { SelectedFile } from '../slices/createNft';
 import { connectWallet } from './wallet';
 import { NftMetadata } from '../../lib/nfts/queries';
 import { SystemWithToolkit, SystemWithWallet } from '../../lib/system';
+import { notifyPending, notifyFulfilled } from '../slices/notificationsActions';
 
 type Options = {
   state: State;
@@ -63,7 +64,7 @@ export const createAssetContractAction = createAsyncThunk<
   Options
 >(
   'action/createAssetContract',
-  async (name, { getState, rejectWithValue, dispatch }) => {
+  async (name, { getState, rejectWithValue, dispatch, requestId }) => {
     const { system } = getState();
     if (system.status !== 'WalletConnected') {
       return rejectWithValue({
@@ -73,8 +74,13 @@ export const createAssetContractAction = createAsyncThunk<
     }
     try {
       const op = await createAssetContract(system, { name });
+      const pendingMessage = `Creating new collection ${name}`;
+      dispatch(notifyPending(requestId, pendingMessage));
       await op.confirmation();
+
       const { address } = await op.contract();
+      const fulfilledMessage = `Created new collection ${name} (${address})`;
+      dispatch(notifyFulfilled(requestId, fulfilledMessage));
       // TODO: Poll for contract availability on indexer
       dispatch(getWalletAssetContractsQuery());
       return { name, address };
@@ -117,113 +123,137 @@ function appendStateMetadata(
 }
 
 export const mintTokenAction = createAsyncThunk<
-  { contract: string },
+  { contract: string; metadata: ReturnType<typeof appendStateMetadata> },
   undefined,
   Options
->('actions/mintToken', async (_, { getState, rejectWithValue, dispatch }) => {
-  const { system, createNft: state } = getState();
-  if (state.selectedFile === null) {
-    return rejectWithValue({
-      kind: ErrorKind.UknownError,
-      message: 'Could not mint token: no file selected'
-    });
-  } else if (system.status !== 'WalletConnected') {
-    return rejectWithValue({
-      kind: ErrorKind.WalletNotConnected,
-      message: 'Could not mint token: no wallet connected'
-    });
-  } else if (!validateCreateNftForm(state)) {
-    return rejectWithValue({
-      kind: ErrorKind.CreateNftFormInvalid,
-      message: 'Could not mint token: form validation failed'
-    });
-  }
+>(
+  'action/mintToken',
+  async (_, { getState, rejectWithValue, dispatch, requestId }) => {
+    const { system, createNft: state } = getState();
+    if (state.selectedFile === null) {
+      return rejectWithValue({
+        kind: ErrorKind.UknownError,
+        message: 'Could not mint token: no file selected'
+      });
+    } else if (system.status !== 'WalletConnected') {
+      return rejectWithValue({
+        kind: ErrorKind.WalletNotConnected,
+        message: 'Could not mint token: no wallet connected'
+      });
+    } else if (!validateCreateNftForm(state)) {
+      return rejectWithValue({
+        kind: ErrorKind.CreateNftFormInvalid,
+        message: 'Could not mint token: form validation failed'
+      });
+    }
 
-  let file: File;
-  try {
-    const { objectUrl, name, type } = state.selectedFile;
-    const fetched = await fetch(objectUrl);
-    const blob = await fetched.blob();
-    file = new File([blob], name, { type });
-  } catch (e) {
-    return rejectWithValue({
-      kind: ErrorKind.UknownError,
-      message: 'Could not mint token: selected file not found'
-    });
-  }
+    let file: File;
+    try {
+      const { objectUrl, name, type } = state.selectedFile;
+      const fetched = await fetch(objectUrl);
+      const blob = await fetched.blob();
+      file = new File([blob], name, { type });
+    } catch (e) {
+      return rejectWithValue({
+        kind: ErrorKind.UknownError,
+        message: 'Could not mint token: selected file not found'
+      });
+    }
 
-  let ipfsMetadata: NftMetadata = {};
-  try {
-    if (/^image\/.*/.test(file.type)) {
-      const imageResponse = await uploadIPFSImageWithThumbnail(
-        system.config.ipfsApi,
-        file
-      );
-      ipfsMetadata.artifactUri = imageResponse.data.ipfsUri;
-      ipfsMetadata.displayUri = imageResponse.data.ipfsUri;
-      ipfsMetadata.thumbnailUri = imageResponse.data.thumbnail.ipfsUri;
-    } else if (/^video\/.*/.test(file.type)) {
-      if (state.displayImageFile === null) {
-        return rejectWithValue({
-          kind: ErrorKind.IPFSUploadFailed,
-          message: 'Ipfs upload failed: Video display file not found'
-        });
-      }
-      let displayFile: File;
-      try {
-        const { objectUrl, name, type } = state.displayImageFile;
-        const fetched = await fetch(objectUrl);
-        const blob = await fetched.blob();
-        displayFile = new File([blob], name, { type });
-      } catch (e) {
-        return rejectWithValue({
-          kind: ErrorKind.UknownError,
-          message: 'Could not mint token: video display file not found'
-        });
+    let ipfsMetadata: NftMetadata = {};
+    try {
+      if (/^image\/.*/.test(file.type)) {
+        const imageResponse = await uploadIPFSImageWithThumbnail(
+          system.config.ipfsApi,
+          file
+        );
+        ipfsMetadata.artifactUri = imageResponse.data.ipfsUri;
+        ipfsMetadata.displayUri = imageResponse.data.ipfsUri;
+        ipfsMetadata.thumbnailUri = imageResponse.data.thumbnail.ipfsUri;
+        ipfsMetadata.formats = [
+          {
+            fileSize: imageResponse.headers['content-length'],
+            mimeType: imageResponse.headers['content-type']
+          }
+        ];
+      } else if (/^video\/.*/.test(file.type)) {
+        if (state.displayImageFile === null) {
+          return rejectWithValue({
+            kind: ErrorKind.IPFSUploadFailed,
+            message: 'Ipfs upload failed: Video display file not found'
+          });
+        }
+        let displayFile: File;
+        try {
+          const { objectUrl, name, type } = state.displayImageFile;
+          const fetched = await fetch(objectUrl);
+          const blob = await fetched.blob();
+          displayFile = new File([blob], name, { type });
+        } catch (e) {
+          return rejectWithValue({
+            kind: ErrorKind.UknownError,
+            message: 'Could not mint token: video display file not found'
+          });
+        }
+        const fileResponse = await uploadIPFSFile(system.config.ipfsApi, file);
+        const imageResponse = await uploadIPFSImageWithThumbnail(
+          system.config.ipfsApi,
+          displayFile
+        );
+        ipfsMetadata.artifactUri = fileResponse.data.ipfsUri;
+        ipfsMetadata.displayUri = imageResponse.data.ipfsUri;
+        ipfsMetadata.thumbnailUri = imageResponse.data.thumbnail.ipfsUri;
+        ipfsMetadata.formats = [
+          {
+            fileSize: imageResponse.headers['content-length'],
+            mimeType: imageResponse.headers['content-type']
+          }
+        ];
+      } else {
+        const fileResponse = await uploadIPFSFile(system.config.ipfsApi, file);
+        ipfsMetadata.artifactUri = fileResponse.data.ipfsUri;
+        ipfsMetadata.formats = [
+          {
+            fileSize: fileResponse.headers['content-length'],
+            mimeType: fileResponse.headers['content-type']
+          }
+        ];
       }
-      const fileResponse = await uploadIPFSFile(system.config.ipfsApi, file);
-      const imageResponse = await uploadIPFSImageWithThumbnail(
-        system.config.ipfsApi,
-        displayFile
-      );
-      ipfsMetadata.artifactUri = fileResponse.data.ipfsUri;
-      ipfsMetadata.displayUri = imageResponse.data.ipfsUri;
-      ipfsMetadata.thumbnailUri = imageResponse.data.thumbnail.ipfsUri;
-    } else {
+    } catch (e) {
       return rejectWithValue({
         kind: ErrorKind.IPFSUploadFailed,
-        message: 'IPFS upload failed: unknown file type'
+        message: 'IPFS upload failed'
       });
     }
-  } catch (e) {
-    return rejectWithValue({
-      kind: ErrorKind.IPFSUploadFailed,
-      message: 'IPFS upload failed'
-    });
-  }
 
-  const address = state.collectionAddress as string;
-  const metadata = appendStateMetadata(state, ipfsMetadata, system);
+    const address = state.collectionAddress as string;
+    const metadata = appendStateMetadata(state, ipfsMetadata, system);
 
-  try {
-    const op = await mintToken(system, address, metadata);
-    await op.confirmation(2);
-    dispatch(getContractNftsQuery(address));
-    return { contract: address };
-  } catch (e) {
-    return rejectWithValue({
-      kind: ErrorKind.MintTokenFailed,
-      message: 'Mint token failed'
-    });
+    try {
+      const op = await mintToken(system, address, metadata);
+      const pendingMessage = `Minting new token: ${metadata.name}`;
+      dispatch(notifyPending(requestId, pendingMessage));
+      await op.confirmation(2);
+
+      const fulfilledMessage = `Created new token: ${metadata.name} in ${address}`;
+      dispatch(notifyFulfilled(requestId, fulfilledMessage));
+      dispatch(getContractNftsQuery(address));
+      return { contract: address, metadata };
+    } catch (e) {
+      return rejectWithValue({
+        kind: ErrorKind.MintTokenFailed,
+        message: 'Mint token failed'
+      });
+    }
   }
-});
+);
 
 export const transferTokenAction = createAsyncThunk<
-  { contract: string; tokenId: number },
+  { contract: string; tokenId: number; to: string },
   { contract: string; tokenId: number; to: string },
   Options
->('actions/transferToken', async (args, api) => {
-  const { getState, rejectWithValue, dispatch } = api;
+>('action/transferToken', async (args, api) => {
+  const { getState, rejectWithValue, dispatch, requestId } = api;
   const { contract, tokenId, to } = args;
   const { system } = getState();
   if (system.status !== 'WalletConnected') {
@@ -234,9 +264,12 @@ export const transferTokenAction = createAsyncThunk<
   }
   try {
     const op = await transferToken(system, contract, tokenId, to);
+    dispatch(notifyPending(requestId, `Transferring token to ${to}`));
     await op.confirmation(2);
+
+    dispatch(notifyFulfilled(requestId, `Transferred token to ${to}`));
     dispatch(getContractNftsQuery(contract));
-    return { contract: '', tokenId: 0 };
+    return args;
   } catch (e) {
     return rejectWithValue({
       kind: ErrorKind.TransferTokenFailed,
@@ -249,8 +282,8 @@ export const listTokenAction = createAsyncThunk<
   { contract: string; tokenId: number; salePrice: number },
   { contract: string; tokenId: number; salePrice: number },
   Options
->('actions/listToken', async (args, api) => {
-  const { getState, rejectWithValue, dispatch } = api;
+>('action/listToken', async (args, api) => {
+  const { getState, rejectWithValue, dispatch, requestId } = api;
   const { contract, tokenId, salePrice } = args;
   const { system } = getState();
   const marketplaceContract =
@@ -269,9 +302,16 @@ export const listTokenAction = createAsyncThunk<
       tokenId,
       salePrice
     );
+    const pendingMessage = `Listing token for sale for ${salePrice / 1000000}ꜩ`;
+    dispatch(notifyPending(requestId, pendingMessage));
     await op.confirmation(2);
+
+    const fulfilledMessage = `Token listed for sale for ${
+      salePrice / 1000000
+    }ꜩ`;
+    dispatch(notifyFulfilled(requestId, fulfilledMessage));
     dispatch(getContractNftsQuery(contract));
-    return { contract: contract, tokenId: tokenId, salePrice: salePrice };
+    return args;
   } catch (e) {
     return rejectWithValue({
       kind: ErrorKind.ListTokenFailed,
@@ -284,8 +324,8 @@ export const cancelTokenSaleAction = createAsyncThunk<
   { contract: string; tokenId: number },
   { contract: string; tokenId: number },
   Options
->('actions/cancelTokenSale', async (args, api) => {
-  const { getState, rejectWithValue, dispatch } = api;
+>('action/cancelTokenSale', async (args, api) => {
+  const { getState, rejectWithValue, dispatch, requestId } = api;
   const { contract, tokenId } = args;
   const { system } = getState();
   const marketplaceContract =
@@ -303,7 +343,10 @@ export const cancelTokenSaleAction = createAsyncThunk<
       contract,
       tokenId
     );
+    dispatch(notifyPending(requestId, `Canceling token sale`));
     await op.confirmation(2);
+
+    dispatch(notifyFulfilled(requestId, `Token sale canceled`));
     dispatch(getContractNftsQuery(contract));
     return { contract: contract, tokenId: tokenId };
   } catch (e) {
@@ -318,8 +361,8 @@ export const buyTokenAction = createAsyncThunk<
   { contract: string; tokenId: number },
   { contract: string; tokenId: number; tokenSeller: string; salePrice: number },
   Options
->('actions/buyToken', async (args, api) => {
-  const { getState, rejectWithValue, dispatch } = api;
+>('action/buyToken', async (args, api) => {
+  const { getState, rejectWithValue, dispatch, requestId } = api;
   const { contract, tokenId, tokenSeller, salePrice } = args;
   let { system } = getState();
   const marketplaceContract =
@@ -343,7 +386,12 @@ export const buyTokenAction = createAsyncThunk<
       tokenSeller,
       salePrice
     );
+    const pendingMessage = `Buying token from ${tokenSeller} for ${salePrice}`;
+    dispatch(notifyPending(requestId, pendingMessage));
     await op.confirmation(2);
+
+    const fulfilledMessage = `Bought token from ${tokenSeller} for ${salePrice}`;
+    dispatch(notifyFulfilled(requestId, fulfilledMessage));
     dispatch(getContractNftsQuery(contract));
     return { contract: contract, tokenId: tokenId };
   } catch (e) {
diff --git a/src/reducer/slices/createNft.ts b/src/reducer/slices/createNft.ts
index 3206adba..da318edf 100644
--- a/src/reducer/slices/createNft.ts
+++ b/src/reducer/slices/createNft.ts
@@ -4,13 +4,9 @@ import { readFileAsDataUrlAction } from '../async/actions';
 
 // State
 
-type Step = 'file_upload' | 'asset_details' | 'collection_select';
+type Step = 'file_upload' | 'asset_details' | 'collection_select' | 'confirm';
 
-export const steps: Step[] = [
-  'file_upload',
-  'asset_details',
-  'collection_select'
-];
+export const steps: Step[] = ['file_upload', 'asset_details', 'confirm'];
 
 interface Fields {
   name: string | null;
diff --git a/src/reducer/slices/notifications.ts b/src/reducer/slices/notifications.ts
index 998b314c..36406f8b 100644
--- a/src/reducer/slices/notifications.ts
+++ b/src/reducer/slices/notifications.ts
@@ -1,4 +1,9 @@
-import { createSlice, PayloadAction } from '@reduxjs/toolkit';
+import { createSlice } from '@reduxjs/toolkit';
+import {
+  pushNotification,
+  readNotification,
+  deliverNotification
+} from './notificationsActions';
 import {
   createAssetContractAction,
   mintTokenAction,
@@ -15,14 +20,14 @@ import {
 } from '../async/queries';
 import { ErrorKind } from '../async/errors';
 
-interface Notification {
+export interface Notification {
   requestId: string;
   read: boolean;
   delivered: boolean;
-  status: 'success' | 'warning' | 'error';
+  status: 'success' | 'pending' | 'error';
   title: string;
   description: string;
-  kind: ErrorKind;
+  kind: ErrorKind | null;
 }
 
 export type NotificationState = Notification[];
@@ -32,25 +37,27 @@ const initialState: NotificationState = [];
 const slice = createSlice({
   name: 'notifications',
   initialState,
-  reducers: {
-    readNotification(state, { payload: requestId }: PayloadAction<string>) {
-      for (let notification of state) {
-        if (notification.requestId === requestId) {
-          notification.read = true;
-          break;
-        }
-      }
-    },
-    deliverNotification(state, { payload: requestId }: PayloadAction<string>) {
-      for (let notification of state) {
-        if (notification.requestId === requestId) {
-          notification.delivered = true;
-          break;
-        }
-      }
-    }
-  },
+  reducers: {},
   extraReducers: ({ addCase }) => {
+    addCase(pushNotification, (state, { payload }) => {
+      state.push(payload);
+    });
+
+    addCase(readNotification, (state, { payload: requestId }) => {
+      return state.map(n => {
+        return n.requestId === requestId ? { ...n, read: true } : n;
+      });
+    });
+
+    addCase(deliverNotification, (state, { payload: requestId }) => {
+      return state.map(n => {
+        return n.requestId === requestId ? { ...n, delivered: true } : n;
+      });
+    });
+
+    // Action errors are abstracted by their payloads. This allows us to iterate
+    // through a list of actions and assign a notification without individually
+    // matching against each one through `addCase`
     [
       createAssetContractAction,
       mintTokenAction,
@@ -82,6 +89,4 @@ const slice = createSlice({
   }
 });
 
-export const { readNotification, deliverNotification } = slice.actions;
-
 export default slice;
diff --git a/src/reducer/slices/notificationsActions.ts b/src/reducer/slices/notificationsActions.ts
new file mode 100644
index 00000000..191c4b15
--- /dev/null
+++ b/src/reducer/slices/notificationsActions.ts
@@ -0,0 +1,52 @@
+import { createAction } from '@reduxjs/toolkit';
+import { Notification } from './notifications';
+
+export const pushNotification = createAction<Notification>(
+  'sharedAction/pushNotification'
+);
+
+export const readNotification = createAction<string>(
+  'sharedAction/readNotification'
+);
+
+export const deliverNotification = createAction<string>(
+  'sharedAction/deliverNotification'
+);
+
+export function pendingNotification(
+  requestId: string,
+  description: string
+): Notification {
+  return {
+    requestId,
+    read: false,
+    delivered: false,
+    status: 'pending',
+    title: 'Pending',
+    description,
+    kind: null
+  };
+}
+
+export function fulfilledNotification(
+  requestId: string,
+  description: string
+): Notification {
+  return {
+    requestId,
+    read: false,
+    delivered: false,
+    status: 'success',
+    title: 'Complete',
+    description,
+    kind: null
+  };
+}
+
+export function notifyPending(requestId: string, message: string) {
+  return pushNotification(pendingNotification(requestId, message));
+}
+
+export function notifyFulfilled(requestId: string, message: string) {
+  return pushNotification(fulfilledNotification(requestId, message));
+}
diff --git a/src/reducer/slices/status.ts b/src/reducer/slices/status.ts
index 6741ac41..5cdc5459 100644
--- a/src/reducer/slices/status.ts
+++ b/src/reducer/slices/status.ts
@@ -36,7 +36,7 @@ export interface StatusState {
   getWalletAssetContracts: Status;
 }
 
-type Method = keyof StatusState;
+export type Method = keyof StatusState;
 
 const defaultStatus: Status = { status: 'ready', error: null };
 
diff --git a/src/reducer/validators/createNft.ts b/src/reducer/validators/createNft.ts
index 3af1c3b8..6b28550c 100644
--- a/src/reducer/validators/createNft.ts
+++ b/src/reducer/validators/createNft.ts
@@ -31,9 +31,11 @@ export function validateCreateNftStep(state: State['createNft']) {
     case 'file_upload':
       return isValid(fileUploadSchema, state);
     case 'asset_details':
-      return isValid(assetDetailsSchema, state);
+      return isValid(collectionSelectSchema, state);
     case 'collection_select':
       return isValid(collectionSelectSchema, state);
+    case 'confirm':
+      return isValid(collectionSelectSchema, state);
     default:
       return false;
   }
diff --git a/yarn.lock b/yarn.lock
index b9a511fd..db1e2579 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@airgap/beacon-sdk@^2.2.2":
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/@airgap/beacon-sdk/-/beacon-sdk-2.2.2.tgz#36324b626a62756dbf619e31e27ed268ae5655b9"
-  integrity sha512-B0tJ0WzttIgLLfo+WD1dbpEfzEkvCULsJi/He/UylGn805/HPoTc42TWnfbCCQ7sn0FtwlkttYy/RJRSCQw9BQ==
+"@airgap/beacon-sdk@^2.2.3":
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/@airgap/beacon-sdk/-/beacon-sdk-2.2.3.tgz#82b0b3060dd6f9d20a78cd81ef366c45f58ed358"
+  integrity sha512-G1VRfHvPNJHq2I5NBVANdgavz8E9AcbhxrcCbmBXXHXgh1eHQb7X2+ntIFgCJ686aOPbbk8JOi6L98VDg57HYg==
   dependencies:
     "@types/chrome" "0.0.115"
     "@types/libsodium-wrappers" "0.7.7"
@@ -2248,101 +2248,101 @@
     "@svgr/plugin-svgo" "^4.3.1"
     loader-utils "^1.2.3"
 
-"@taquito/beacon-wallet@8.0.6-beta.0":
-  version "8.0.6-beta.0"
-  resolved "https://registry.yarnpkg.com/@taquito/beacon-wallet/-/beacon-wallet-8.0.6-beta.0.tgz#50c2e02c24d29aeb9ad56e4b31bd0cbcd8da9e40"
-  integrity sha512-XCwzQa2JySlo/u775R1clSo5ddXQIIOipGsY0VDhPoe7NqSN+/pvDiJNzemfH14a4iXM1KXGF2Hk9Z0y30pTRg==
+"@taquito/beacon-wallet@8.1.0":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@taquito/beacon-wallet/-/beacon-wallet-8.1.0.tgz#e51bf9914ef49d8166a673b0b53d2343ecec6fd4"
+  integrity sha512-OFtf890RN0M55eNAZREKSsa6ug0n9SmRg2MKhVb6CT3MzYe4Ez+NWiLaLBrTLrv3frfpkGot13sflmGyMNSpsw==
   dependencies:
-    "@airgap/beacon-sdk" "^2.2.2"
-    "@taquito/taquito" "^8.0.6-beta.0"
-    "@taquito/utils" "^8.0.6-beta.0"
+    "@airgap/beacon-sdk" "^2.2.3"
+    "@taquito/taquito" "^8.1.0"
+    "@taquito/utils" "^8.1.0"
 
-"@taquito/http-utils@^8.0.6-beta.0":
-  version "8.0.6-beta.0"
-  resolved "https://registry.yarnpkg.com/@taquito/http-utils/-/http-utils-8.0.6-beta.0.tgz#a05b68cc95adae7047f0d1022331e966ee06c9e9"
-  integrity sha512-+ZHkt7MqVemEzvjeD+DVr6f3em16NMILICuiVhWAkqmRuBrRAkUPUalqRnuXq3okkUPwdlZFEFP94blZ3ZKkLQ==
+"@taquito/http-utils@^8.1.0":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@taquito/http-utils/-/http-utils-8.1.0.tgz#75e198397e76cebd843d154b3114f6cfb411e1a7"
+  integrity sha512-Bkj5awWn+ftmjBb+8VBjVXRJSMP2rayOnZUbJjkvitbMize8/gzGY86xrLw4j462FIuVlrqos9VHbLw5vVzMvw==
   dependencies:
     xhr2-cookies "^1.1.0"
 
-"@taquito/michel-codec@^8.0.6-beta.0":
-  version "8.0.6-beta.0"
-  resolved "https://registry.yarnpkg.com/@taquito/michel-codec/-/michel-codec-8.0.6-beta.0.tgz#974a84b71e146df50f958a35e57212ce6791880f"
-  integrity sha512-mXEqTM1zrdB6dIjnykj3C/dgFldvWJDPfPNqw1xk56nC8i1UOMs6+Snii97KsJAfm0vfa+01VxOpIxCDMWcErQ==
+"@taquito/michel-codec@^8.1.0":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@taquito/michel-codec/-/michel-codec-8.1.0.tgz#2893271d1499b7a7f4abcb2e38bc7a059a60ea19"
+  integrity sha512-FUye4GQxpkqsuK2Dyjs3yHa1AJdveXuUlM0DtbdBOodcf/b4bpNTD2fsuPzBm0u95Vd4KcPoAKb0GrOVro8V1w==
 
-"@taquito/michelson-encoder@^8.0.6-beta.0":
-  version "8.0.6-beta.0"
-  resolved "https://registry.yarnpkg.com/@taquito/michelson-encoder/-/michelson-encoder-8.0.6-beta.0.tgz#ffde6442e6a6b8e182cd3b27e99a4fa7a446d0fa"
-  integrity sha512-D7t+YvKrCEAAg0JHfzp+v7VQm/CMCOlW5EEZjD1bEWAbMoeaCHlpfWrhAfvrXGsOjbH42CTcC62UaGvniyL6kA==
+"@taquito/michelson-encoder@^8.1.0":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@taquito/michelson-encoder/-/michelson-encoder-8.1.0.tgz#3948c0bff160c8748330f8b7fe89144b5435d8b9"
+  integrity sha512-vaZjtDwOmVcFPJXHW3u6Y1O96voJJp3b95eluhxULk+wCN+NS1Yb4TPS0UhDHzBqS9WYQEXI2d62z4QFKDmulw==
   dependencies:
-    "@taquito/rpc" "^8.0.6-beta.0"
-    "@taquito/utils" "^8.0.6-beta.0"
+    "@taquito/rpc" "^8.1.0"
+    "@taquito/utils" "^8.1.0"
     bignumber.js "^9.0.1"
     fast-json-stable-stringify "^2.1.0"
 
-"@taquito/rpc@^8.0.6-beta.0":
-  version "8.0.6-beta.0"
-  resolved "https://registry.yarnpkg.com/@taquito/rpc/-/rpc-8.0.6-beta.0.tgz#685a0f2a82d1d443fdc6144ca2a4b3588e5231ad"
-  integrity sha512-FV9jHJOVNn49chSbRZXaHNAj1l6GMf4cZzyKM6XfPf/GVMcmMaYQDlAYa008ziltwlFvvnHHkq0QzzTxwGpC4A==
+"@taquito/rpc@^8.1.0":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@taquito/rpc/-/rpc-8.1.0.tgz#9f04021a30ec6241d37143a11b29c87e98883a94"
+  integrity sha512-CTQ0fBMDS+ozra/jfGA1istENXpkgGpD1miPQqBEikPzafHR09sU94dAncO3oEAWMjdAnQFHqO1dBkalX4/ZQw==
   dependencies:
-    "@taquito/http-utils" "^8.0.6-beta.0"
+    "@taquito/http-utils" "^8.1.0"
     bignumber.js "^9.0.1"
     lodash "^4.17.20"
 
-"@taquito/signer@8.0.6-beta.0":
-  version "8.0.6-beta.0"
-  resolved "https://registry.yarnpkg.com/@taquito/signer/-/signer-8.0.6-beta.0.tgz#d6954f3c316e0c45f2788e44f7d518f5c2c84d65"
-  integrity sha512-YZXWoYLaVGOW8uMuOeSYwXLMET5JZN9rEXbB9p8ZVVDBdJFhjrAlEr/t6rYrDcaUlbxR0s7SZ+Rj/NyubgyAiA==
+"@taquito/signer@8.1.0":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@taquito/signer/-/signer-8.1.0.tgz#882574a67b389e944f0c3e3f8a24b2c9d7004b06"
+  integrity sha512-VzQtHX1s8z0TOBD29gVlDUuQY4nCrWcFaMot8GOkkIRgbwYug9B2ghJJbkniF/LqobI9P08ldcaubqmx9acJSw==
   dependencies:
-    "@taquito/taquito" "^8.0.6-beta.0"
-    "@taquito/utils" "^8.0.6-beta.0"
+    "@taquito/taquito" "^8.1.0"
+    "@taquito/utils" "^8.1.0"
     bignumber.js "^9.0.1"
     bip39 "^3.0.2"
-    elliptic "^6.5.3"
+    elliptic "^6.5.4"
     libsodium-wrappers "^0.7.8"
     pbkdf2 "^3.1.1"
     typedarray-to-buffer "^3.1.5"
 
-"@taquito/taquito@8.0.6-beta.0", "@taquito/taquito@^8.0.6-beta.0":
-  version "8.0.6-beta.0"
-  resolved "https://registry.yarnpkg.com/@taquito/taquito/-/taquito-8.0.6-beta.0.tgz#b3f4a49d647f783379fb384168f1e3255945ef4a"
-  integrity sha512-Pr9k3y3l25zB9NyynreX67M/gvkn5szz4jXjiBGp5s9N9W9yWUJGoKzqT2o6RbZwwrv6wdy7nNTskXpBlwNawQ==
-  dependencies:
-    "@taquito/http-utils" "^8.0.6-beta.0"
-    "@taquito/michel-codec" "^8.0.6-beta.0"
-    "@taquito/michelson-encoder" "^8.0.6-beta.0"
-    "@taquito/rpc" "^8.0.6-beta.0"
-    "@taquito/utils" "^8.0.6-beta.0"
+"@taquito/taquito@8.1.0", "@taquito/taquito@^8.1.0":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@taquito/taquito/-/taquito-8.1.0.tgz#f398e2675440f053bf3e78c55b1f70e5a103e1ea"
+  integrity sha512-a5YSS4eeN9Rh/EzH0yH3pEK/QxjXyAHptpBn6bYrg1R4BPGgoEAZWY7XjQmf4C4qxNoyIhmCs35svsnTy2xDKA==
+  dependencies:
+    "@taquito/http-utils" "^8.1.0"
+    "@taquito/michel-codec" "^8.1.0"
+    "@taquito/michelson-encoder" "^8.1.0"
+    "@taquito/rpc" "^8.1.0"
+    "@taquito/utils" "^8.1.0"
     bignumber.js "^9.0.1"
     rx-sandbox "^1.0.3"
     rxjs "^6.6.3"
 
-"@taquito/tzip12@8.0.6-beta.0":
-  version "8.0.6-beta.0"
-  resolved "https://registry.yarnpkg.com/@taquito/tzip12/-/tzip12-8.0.6-beta.0.tgz#4b8892c0b629710c7503c550bcc85fe672b9c6f2"
-  integrity sha512-HpHHQOabFvguHf3tufEZcxp525Ux4pWBBrl9G0gIJbnqRDRlNxgY0cxos9KgZPx8WDqEsikuBtMFMXtTdAWcRw==
+"@taquito/tzip12@8.1.0":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@taquito/tzip12/-/tzip12-8.1.0.tgz#9d892bbbcb2b6f90d795c4fba0419dacdfffede3"
+  integrity sha512-yXoJZdfLYns+J6pab7n2UPew6oEYfD4AXIAJGg9JS197fnFYyO9yNHjxy0xTCis9bqdAuiwr0GS81a70ok/FPg==
   dependencies:
-    "@taquito/michelson-encoder" "^8.0.6-beta.0"
-    "@taquito/taquito" "^8.0.6-beta.0"
-    "@taquito/tzip16" "^8.0.6-beta.0"
+    "@taquito/michelson-encoder" "^8.1.0"
+    "@taquito/taquito" "^8.1.0"
+    "@taquito/tzip16" "^8.1.0"
     bignumber.js "^9.0.1"
 
-"@taquito/tzip16@8.0.6-beta.0", "@taquito/tzip16@^8.0.6-beta.0":
-  version "8.0.6-beta.0"
-  resolved "https://registry.yarnpkg.com/@taquito/tzip16/-/tzip16-8.0.6-beta.0.tgz#22bb326a38c4ef50f0a8edf61dd48ab20a7b1f6c"
-  integrity sha512-X2sno857Yv0TEkC+sllQAVMcyKWRJ5hLNw8gQ8eSkgpLfSQa4szKwHfLFEPzW3mWdQvBKAVLaYLqhtq24OQBMw==
-  dependencies:
-    "@taquito/http-utils" "^8.0.6-beta.0"
-    "@taquito/michelson-encoder" "^8.0.6-beta.0"
-    "@taquito/rpc" "^8.0.6-beta.0"
-    "@taquito/taquito" "^8.0.6-beta.0"
-    "@taquito/utils" "^8.0.6-beta.0"
+"@taquito/tzip16@8.1.0", "@taquito/tzip16@^8.1.0":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@taquito/tzip16/-/tzip16-8.1.0.tgz#e7ea9198677b133d80daaa6759c19ead1527a2e1"
+  integrity sha512-8BBL2r8MTmuvfHG8MCO5CUNWpfYXz8JIDk0wAuGj1cGpM7PBYF8GU9MwnNMb4fpWCb3Wt59+zOSAF5/j9xfkUg==
+  dependencies:
+    "@taquito/http-utils" "^8.1.0"
+    "@taquito/michelson-encoder" "^8.1.0"
+    "@taquito/rpc" "^8.1.0"
+    "@taquito/taquito" "^8.1.0"
+    "@taquito/utils" "^8.1.0"
     bignumber.js "^9.0.1"
     crypto-js "^4.0.0"
 
-"@taquito/utils@^8.0.6-beta.0":
-  version "8.0.6-beta.0"
-  resolved "https://registry.yarnpkg.com/@taquito/utils/-/utils-8.0.6-beta.0.tgz#cd94e85ac6c101382c193bba3079889296a53212"
-  integrity sha512-fokMi4b1/fg4DvULqVZrDkpHzeETGT9nihcoKuLyq8xgZ0YHAzGFcANS2u2WS0I+a24oAx9pvgpasfYqTJHuww==
+"@taquito/utils@^8.1.0":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@taquito/utils/-/utils-8.1.0.tgz#658f07171a611ee8b5b976959ae04c5acff0760c"
+  integrity sha512-1Md7K0r/Y2JTAOHIv9Z3lVuWHBRV+c3ZUCAePIYuPtljEAOuhLgcxMa7ZtoRXfSPutoIOum9yRSSJrKhFhcOhw==
   dependencies:
     blakejs "^1.1.0"
     bs58check "^2.1.2"
@@ -2404,6 +2404,11 @@
   resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-7.1.2.tgz#3a71bb8a45a1e08b71a54c9efcee9927f3895e80"
   integrity sha512-lDyCVxxgX5lrgCa75ELCfWcdEDyfisjqoDIM3YsghQ+lyViIac/qT67qabQ/HmoVxyikFKovjKwWdn3b/oKhZA==
 
+"@tqtezos/minter-contracts@1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@tqtezos/minter-contracts/-/minter-contracts-1.0.3.tgz#e46e6706f72d5a200c2be96585d67aa211ee048d"
+  integrity sha512-FmOlwRSCR38o41Kcnlxs0D27K2/D/yHt9iUJ+mfPOVAvAut/Lq4IWfRpZIbdQ4oWTY/Wb2//XjsZ9ptzOB+4Aw==
+
 "@tsed/logger@5.5.2":
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/@tsed/logger/-/logger-5.5.2.tgz#6a9d3f2de2cf9d53be6a4dccfeedd905d05a3ad2"
@@ -3643,6 +3648,11 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.4.0:
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828"
   integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==
 
+bn.js@^4.11.9:
+  version "4.12.0"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
+  integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
+
 bn.js@^5.0.0, bn.js@^5.1.1:
   version "5.1.3"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.3.tgz#beca005408f642ebebea80b042b4d18d2ac0ee6b"
@@ -3712,7 +3722,7 @@ braces@^3.0.1, braces@~3.0.2:
   dependencies:
     fill-range "^7.0.1"
 
-brorand@^1.0.1:
+brorand@^1.0.1, brorand@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
   integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
@@ -5259,6 +5269,19 @@ elliptic@^6.5.3:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.0"
 
+elliptic@^6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
+  integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==
+  dependencies:
+    bn.js "^4.11.9"
+    brorand "^1.1.0"
+    hash.js "^1.0.0"
+    hmac-drbg "^1.0.1"
+    inherits "^2.0.4"
+    minimalistic-assert "^1.0.1"
+    minimalistic-crypto-utils "^1.0.1"
+
 emoji-regex@^7.0.1, emoji-regex@^7.0.2:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
@@ -6527,7 +6550,7 @@ hey-listen@^1.0.8:
   resolved "https://registry.yarnpkg.com/hey-listen/-/hey-listen-1.0.8.tgz#8e59561ff724908de1aa924ed6ecc84a56a9aa68"
   integrity sha512-COpmrF2NOg4TBWUJ5UVyaCU2A88wEMkUPK4hNqyCkqHbxT92BbvfjoSozkAIIm6XhicGlJHhFdullInrdhwU8Q==
 
-hmac-drbg@^1.0.0:
+hmac-drbg@^1.0.0, hmac-drbg@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
   integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=