diff --git a/src/components/Home/utils.js b/src/components/Home/utils.js
index f64360fc1..4bcaeddb3 100644
--- a/src/components/Home/utils.js
+++ b/src/components/Home/utils.js
@@ -9,6 +9,9 @@ export const reloadStorage = async props => {
   let { generalStore, contractStore } = props
 
   try {
+    if (!contractStore || !generalStore) {
+      throw new Error('There is no stores to set')
+    }
     contractStore.setProperty('downloadStatus', DOWNLOAD_STATUS.PENDING)
 
     // General store, check network
@@ -18,9 +21,12 @@ export const reloadStorage = async props => {
     // Contract store, get contract and abi
     await getCrowdsaleAssets(networkID)
     contractStore.setProperty('downloadStatus', DOWNLOAD_STATUS.SUCCESS)
+    return true
   } catch (e) {
     logger.error('Error downloading contracts', e)
-    contractStore.setProperty('downloadStatus', DOWNLOAD_STATUS.FAILURE)
+    if (contractStore) {
+      contractStore.setProperty('downloadStatus', DOWNLOAD_STATUS.FAILURE)
+    }
     throw e
   }
 }
diff --git a/src/components/StepOne/index.js b/src/components/StepOne/index.js
index 73303b72d..720efa7f6 100644
--- a/src/components/StepOne/index.js
+++ b/src/components/StepOne/index.js
@@ -104,15 +104,11 @@ export class StepOne extends Component {
   }
 
   goNextStep = () => {
-    try {
-      navigateTo({
-        history: this.props.history,
-        location: 'stepTwo',
-        fromLocation: 'stepOne'
-      })
-    } catch (err) {
-      logger.log('Error to navigate', err)
-    }
+    navigateTo({
+      history: this.props.history,
+      location: 'stepTwo',
+      fromLocation: 'stepOne'
+    })
   }
 
   handleChange = e => {
diff --git a/src/components/StepThree/index.js b/src/components/StepThree/index.js
index 594145b31..b634f5a9d 100644
--- a/src/components/StepThree/index.js
+++ b/src/components/StepThree/index.js
@@ -32,7 +32,10 @@ export class StepThree extends Component {
     reload: false,
     initialTiers: [],
     burnExcess: 'no',
-    gasTypeSelected: {}
+    gasTypeSelected: {},
+    backButtonTriggered: false, //Testing purposes
+    nextButtonTriggered: false, //Testing purposes
+    goBackEnabledTriggered: false //Testing purposes
   }
 
   componentDidMount() {
@@ -99,6 +102,9 @@ export class StepThree extends Component {
 
   goNextStep = () => {
     try {
+      this.setState({
+        nextButtonTriggered: true
+      })
       navigateTo({
         history: this.props.history,
         location: 'stepFour',
@@ -111,6 +117,9 @@ export class StepThree extends Component {
 
   goBack = () => {
     try {
+      this.setState({
+        backButtonTriggered: true
+      })
       goBack({
         history: this.props.history,
         location: '/stepTwo'
@@ -123,6 +132,9 @@ export class StepThree extends Component {
   goBackEnabled = () => {
     let goBackEnabled = false
     try {
+      this.setState({
+        goBackEnabledTriggered: true
+      })
       goBackEnabled = goBackMustBeEnabled({ history: this.props.history })
       logger.log(`Go back is enabled ${goBackEnabled}`)
     } catch (err) {
diff --git a/src/components/StepTwo/index.js b/src/components/StepTwo/index.js
index 51a251a96..48517c060 100644
--- a/src/components/StepTwo/index.js
+++ b/src/components/StepTwo/index.js
@@ -18,7 +18,10 @@ const logger = logdown('TW:stepTwo:index')
 export class StepTwo extends Component {
   state = {
     tokenValues: {},
-    reload: false
+    reload: false,
+    backButtonTriggered: false, //Testing purposes
+    nextButtonTriggered: false, //Testing purposes
+    goBackEnabledTriggered: false //Testing purposes
   }
 
   async componentDidMount() {
@@ -51,6 +54,9 @@ export class StepTwo extends Component {
 
   goNextStep = () => {
     try {
+      this.setState({
+        nextButtonTriggered: true
+      })
       navigateTo({
         history: this.props.history,
         location: 'stepThree',
@@ -63,6 +69,9 @@ export class StepTwo extends Component {
 
   goBack = () => {
     try {
+      this.setState({
+        backButtonTriggered: true
+      })
       goBack({
         history: this.props.history,
         location: '/stepOne'
@@ -75,6 +84,9 @@ export class StepTwo extends Component {
   goBackEnabled = () => {
     let goBackEnabled = false
     try {
+      this.setState({
+        goBackEnabledTriggered: true
+      })
       goBackEnabled = goBackMustBeEnabled({ history: this.props.history })
       logger.log(`Go back is enabled ${goBackEnabled}`)
     } catch (err) {
diff --git a/src/stores/StatsStore.js b/src/stores/StatsStore.js
index 9ec99a848..0aedb5a96 100644
--- a/src/stores/StatsStore.js
+++ b/src/stores/StatsStore.js
@@ -10,6 +10,25 @@ class StatsStore {
   @observable totalInvolvedContributorsAmount
   @observable maxTiersAmount
   @observable maxEthRaised
+  @observable totalContributorsAmount
+  @observable mintedCappedEthRaised
+  @observable dutchAuctionEthRaised
+  @observable mintedCappedCrowdsales
+  @observable dutchAuctionCrowdsales
+  @observable mintedCappedContributorsAmount
+  @observable dutchAuctionContributorsAmount
+  @observable mintedCappedPercentageOfFinalized
+  @observable dutchAuctionPercentageOfFinalized
+  @observable mintedCappedPercentageOfMultiTiers
+  @observable mintedCappedMaxTiersAmount
+  @observable mintedCappedMaxEthRaised
+  @observable dutchAuctionMaxEthRaised
+  @observable mintedCappedOngoingCrowdsales
+  @observable mintedCappedFutureCrowdsales
+  @observable mintedCappedPastCrowdsales
+  @observable dutchAuctionOngoingCrowdsales
+  @observable dutchAuctionFutureCrowdsales
+  @observable dutchAuctionPastCrowdsales
 
   constructor() {
     this.totalEthRaised = 0
@@ -21,6 +40,25 @@ class StatsStore {
     this.totalInvolvedContributorsAmount = 0
     this.maxTiersAmount = 0
     this.maxEthRaised = 0
+    this.totalContributorsAmount = 0
+    this.mintedCappedEthRaised = 0
+    this.dutchAuctionEthRaised = 0
+    this.mintedCappedCrowdsales = 0
+    this.dutchAuctionCrowdsales = 0
+    this.mintedCappedContributorsAmount = 0
+    this.dutchAuctionContributorsAmount = 0
+    this.mintedCappedPercentageOfFinalized = 0
+    this.dutchAuctionPercentageOfFinalized = 0
+    this.mintedCappedPercentageOfMultiTiers = 0
+    this.mintedCappedMaxTiersAmount = 0
+    this.mintedCappedMaxEthRaised = 0
+    this.dutchAuctionMaxEthRaised = 0
+    this.mintedCappedOngoingCrowdsales = 0
+    this.mintedCappedFutureCrowdsales = 0
+    this.mintedCappedPastCrowdsales = 0
+    this.dutchAuctionOngoingCrowdsales = 0
+    this.dutchAuctionFutureCrowdsales = 0
+    this.dutchAuctionPastCrowdsales = 0
   }
 
   @action
diff --git a/src/stores/utils.js b/src/stores/utils.js
index 71f851388..36cf70ce0 100644
--- a/src/stores/utils.js
+++ b/src/stores/utils.js
@@ -49,15 +49,15 @@ export const getCrowdsaleAssets = async networkID => {
   return Promise.all(whenPromises)
 }
 
-async function getCrowdsaleAsset(contractName, stateProp, networkID) {
+const getCrowdsaleAsset = async (contractName, stateProp, networkID) => {
   logger.log(contractName, stateProp, networkID)
   const whenSrc =
     stateProp === 'MintedCappedProxy' || stateProp === 'DutchProxy'
-      ? setFlatFileContentToState(`./contracts/${stateProp}.sol`)
+      ? await setFlatFileContentToState(`./contracts/${stateProp}.sol`)
       : Promise.resolve()
   const whenBin =
     stateProp === 'MintedCappedProxy' || stateProp === 'DutchProxy'
-      ? setFlatFileContentToState(`./contracts/${stateProp}.bin`)
+      ? await setFlatFileContentToState(`./contracts/${stateProp}.bin`)
       : Promise.resolve()
   let abi
   //todo: get ABI or from file or from here
@@ -2553,7 +2553,7 @@ async function getCrowdsaleAsset(contractName, stateProp, networkID) {
   Promise.resolve()
 }
 
-function addContractsToState(src, bin, abi, addr, contract) {
+const addContractsToState = (src, bin, abi, addr, contract) => {
   contractStore.setContract(contract, {
     src,
     bin,
diff --git a/src/utils/__mocks__/alerts.js b/src/utils/__mocks__/alerts.js
new file mode 100644
index 000000000..1667037ac
--- /dev/null
+++ b/src/utils/__mocks__/alerts.js
@@ -0,0 +1,7 @@
+export const cancellingIncompleteDeploy = () => {
+  return new Promise((resolve, reject) => {
+    return resolve({
+      value: true
+    })
+  })
+}
diff --git a/src/utils/alerts.js b/src/utils/alerts.js
index db912bd24..c2f3c8e4f 100644
--- a/src/utils/alerts.js
+++ b/src/utils/alerts.js
@@ -1,7 +1,7 @@
 import sweetAlert2 from 'sweetalert2'
 import { DEPLOYMENT_VALUES, LIMIT_RESERVED_ADDRESSES, LIMIT_WHITELISTED_ADDRESSES } from './constants'
 
-export function noMetaMaskAlert(cb) {
+export const noMetaMaskAlert = cb => {
   sweetAlert2({
     title: 'Warning',
     html:
@@ -11,7 +11,7 @@ export function noMetaMaskAlert(cb) {
   }).then(cb)
 }
 
-export function MetaMaskIsLockedAlert(cb) {
+export const MetaMaskIsLockedAlert = cb => {
   sweetAlert2({
     title: 'Warning',
     html: 'You signed out from your Wallet. Open your Wallet extension and sign in.',
@@ -19,7 +19,7 @@ export function MetaMaskIsLockedAlert(cb) {
   }).then(cb)
 }
 
-export function noContractDataAlert() {
+export const noContractDataAlert = () => {
   sweetAlert2({
     title: 'Warning',
     html: 'The crowdsale data is empty. There is nothing to deploy. Please, start Token Wizard from the beginning.',
@@ -27,7 +27,7 @@ export function noContractDataAlert() {
   })
 }
 
-export function noContractAlert() {
+export const noContractAlert = () => {
   sweetAlert2({
     title: 'Warning',
     html: 'There is no contract at this address',
@@ -35,7 +35,7 @@ export function noContractAlert() {
   })
 }
 
-export function invalidCrowdsaleExecIDAlert() {
+export const invalidCrowdsaleExecIDAlert = () => {
   sweetAlert2({
     title: 'Warning',
     html: 'Invalid crowdsale exec-id is indicated in config and/or in query string.',
@@ -43,7 +43,7 @@ export function invalidCrowdsaleExecIDAlert() {
   })
 }
 
-export function invalidCrowdsaleExecIDProxyAlert() {
+export const invalidCrowdsaleExecIDProxyAlert = () => {
   sweetAlert2({
     title: 'Warning',
     html: 'Invalid crowdsale exec-id or proxy address indicated in config and/or in query string.',
@@ -51,7 +51,7 @@ export function invalidCrowdsaleExecIDProxyAlert() {
   })
 }
 
-export function invalidCrowdsaleProxyAlert() {
+export const invalidCrowdsaleProxyAlert = () => {
   sweetAlert2({
     title: 'Warning',
     html: 'Invalid crowdsale proxy address is indicated in config and/or in query string.',
@@ -59,7 +59,7 @@ export function invalidCrowdsaleProxyAlert() {
   })
 }
 
-export function invalidCrowdsaleAddrAlert() {
+export const invalidCrowdsaleAddrAlert = () => {
   sweetAlert2({
     title: 'Warning',
     html: 'Invalid crowdsale address is indicated in config and/or in query string.',
@@ -67,7 +67,7 @@ export function invalidCrowdsaleAddrAlert() {
   })
 }
 
-export function invalidNetworkIDAlert() {
+export const invalidNetworkIDAlert = () => {
   sweetAlert2({
     title: 'Warning',
     html: 'Invalid network ID is indicated in config and/or in query string.',
@@ -75,7 +75,7 @@ export function invalidNetworkIDAlert() {
   })
 }
 
-export function successfulContributionAlert(tokensToContribute, cb) {
+export const successfulContributionAlert = (tokensToContribute, cb) => {
   sweetAlert2({
     title: 'Success',
     html: "Congrats! You've successfully bought " + tokensToContribute + ' tokens!',
@@ -83,7 +83,7 @@ export function successfulContributionAlert(tokensToContribute, cb) {
   }).then(cb)
 }
 
-export function contributionDisabledAlertInTime(startTime) {
+export const contributionDisabledAlertInTime = startTime => {
   sweetAlert2({
     title: 'Warning',
     html: "Wait, please. Crowdsale company hasn't started yet. It'll start from <b>" + new Date(startTime) + '</b>.',
@@ -91,7 +91,7 @@ export function contributionDisabledAlertInTime(startTime) {
   })
 }
 
-export function incorrectNetworkAlert(correctNetworkName, incorrectNetworkName) {
+export const incorrectNetworkAlert = (correctNetworkName, incorrectNetworkName) => {
   sweetAlert2({
     title: 'Warning',
     html:
@@ -104,7 +104,7 @@ export function incorrectNetworkAlert(correctNetworkName, incorrectNetworkName)
   })
 }
 
-export function warningOnMainnetAlert(tiersCount, priceSelected, reservedCount, whitelistCount, cb) {
+export const warningOnMainnetAlert = (tiersCount, priceSelected, reservedCount, whitelistCount, cb) => {
   const { GAS_REQUIRED, TX_REQUIRED } = DEPLOYMENT_VALUES
 
   let gasRequired =
@@ -137,7 +137,7 @@ export function warningOnMainnetAlert(tiersCount, priceSelected, reservedCount,
   })
 }
 
-export function warningOnFinalizeCrowdsale() {
+export const warningOnFinalizeCrowdsale = () => {
   return sweetAlert2({
     title: 'Finalize Crowdsale',
     html:
@@ -150,7 +150,7 @@ export function warningOnFinalizeCrowdsale() {
   })
 }
 
-export function successfulFinalizeAlert() {
+export const successfulFinalizeAlert = () => {
   return sweetAlert2({
     title: 'Success',
     html: "Congrats! You've successfully finalized the Crowdsale!",
@@ -158,7 +158,7 @@ export function successfulFinalizeAlert() {
   })
 }
 
-export function successfulDistributeAlert() {
+export const successfulDistributeAlert = () => {
   sweetAlert2({
     title: 'Success',
     html: "Congrats! You've successfully distributed reserved tokens!",
@@ -166,7 +166,7 @@ export function successfulDistributeAlert() {
   })
 }
 
-export function noGasPriceAvailable() {
+export const noGasPriceAvailable = () => {
   sweetAlert2({
     title: 'No Gas Price Available',
     html: "Token Wizard wasn't able to request current Gas Prices from the blockchain, custom values will be used",
@@ -174,7 +174,7 @@ export function noGasPriceAvailable() {
   })
 }
 
-export function successfulUpdateCrowdsaleAlert() {
+export const successfulUpdateCrowdsaleAlert = () => {
   sweetAlert2({
     title: 'Success',
     html: "Congrats! You've successfully updated the Crowdsale!",
@@ -186,7 +186,7 @@ export function successfulUpdateCrowdsaleAlert() {
   })
 }
 
-export function successfulDeployment() {
+export const successfulDeployment = () => {
   sweetAlert2({
     title: 'Success',
     html: 'Transactions signed successfully!',
@@ -194,7 +194,7 @@ export function successfulDeployment() {
   })
 }
 
-export function mainnetIsOnMaintenance() {
+export const mainnetIsOnMaintenance = () => {
   sweetAlert2({
     title: 'Warning',
     html:
@@ -203,7 +203,7 @@ export function mainnetIsOnMaintenance() {
   })
 }
 
-export function notTheOwner() {
+export const notTheOwner = () => {
   sweetAlert2({
     title: 'Not The Owner',
     html: "Current user is not the owner of the Crowdsale, thus you won't be able to modify it",
@@ -211,7 +211,7 @@ export function notTheOwner() {
   })
 }
 
-export function cancellingIncompleteDeploy() {
+export const cancellingIncompleteDeploy = () => {
   return sweetAlert2({
     title: 'Cancel crowdsale deploy',
     html: 'Are you sure you want to cancel the deployment of the crowdsale? This action cannot be undone.',
@@ -223,7 +223,7 @@ export function cancellingIncompleteDeploy() {
   })
 }
 
-export function skippingTransaction() {
+export const skippingTransaction = () => {
   return sweetAlert2({
     title: 'Skip transaction',
     html:
@@ -236,7 +236,7 @@ export function skippingTransaction() {
   })
 }
 
-export function clearingReservedTokens() {
+export const clearingReservedTokens = () => {
   return sweetAlert2({
     title: 'Clear all reserved tokens',
     html: 'Are you sure you want to remove all reserved tokens?',
@@ -248,7 +248,7 @@ export function clearingReservedTokens() {
   })
 }
 
-export function clearingWhitelist() {
+export const clearingWhitelist = () => {
   return sweetAlert2({
     title: 'Clear all whitelist addresses',
     html: 'Are you sure you want to remove all the whitelist addresses for this tier?',
@@ -260,7 +260,7 @@ export function clearingWhitelist() {
   })
 }
 
-export function whitelistImported(count) {
+export const whitelistImported = count => {
   return sweetAlert2({
     title: 'Addresses imported',
     html: `${count} addresses were added to the whitelist`,
@@ -268,7 +268,7 @@ export function whitelistImported(count) {
   })
 }
 
-export function errorDimCSVAlert(dimensions) {
+export const errorDimCSVAlert = dimensions => {
   let message = 'There was an error importing the file.'
 
   if (dimensions && dimensions.length > 0) {
@@ -291,7 +291,7 @@ export function errorDimCSVAlert(dimensions) {
   })
 }
 
-export function errorDimValueCSVAlert(dimensionsValues) {
+export const errorDimValueCSVAlert = dimensionsValues => {
   let message = 'There was an error importing the file.'
 
   if (dimensionsValues && dimensionsValues.length > 0) {
@@ -314,7 +314,7 @@ export function errorDimValueCSVAlert(dimensionsValues) {
   })
 }
 
-export function errorEmptyCSVAlert() {
+export const errorEmptyCSVAlert = () => {
   return sweetAlert2({
     title: 'Error importing the file',
     html: 'Empty CSV file. Nothing was imported',
@@ -322,7 +322,7 @@ export function errorEmptyCSVAlert() {
   })
 }
 
-export function errorWhitelistedCSVAlert(errors) {
+export const errorWhitelistedCSVAlert = errors => {
   let message = 'There was an error importing the file. The file have an erroneous amount of columns'
 
   if (errors && errors.length > 0) {
@@ -341,7 +341,7 @@ export function errorWhitelistedCSVAlert(errors) {
   })
 }
 
-export function errorRowLengthCSVAlert(errors) {
+export const errorRowLengthCSVAlert = errors => {
   let message = 'There was an error importing the file. The file have an erroneous amount of columns'
 
   if (errors && errors.length > 0) {
@@ -365,7 +365,7 @@ export function errorRowLengthCSVAlert(errors) {
   })
 }
 
-export function errorAddressCSVAlert(address) {
+export const errorAddressCSVAlert = address => {
   let message = 'There was an error importing the file.'
 
   if (address && address.length > 0) {
@@ -388,7 +388,7 @@ export function errorAddressCSVAlert(address) {
   })
 }
 
-export function reservedTokensImported(count) {
+export const reservedTokensImported = count => {
   return sweetAlert2({
     title: 'Reserved tokens imported',
     html: `Tokens will be reserved for ${count} addresses`,
@@ -396,7 +396,7 @@ export function reservedTokensImported(count) {
   })
 }
 
-export function noMoreTokensAvailable() {
+export const noMoreTokensAvailable = () => {
   return sweetAlert2({
     title: 'No more tokens available',
     html: `You're not able to buy more tokens. You have bought your maximum allowed or tier has reached its hard cap`,
@@ -404,7 +404,7 @@ export function noMoreTokensAvailable() {
   })
 }
 
-export function notAllowedContributor() {
+export const notAllowedContributor = () => {
   return sweetAlert2({
     title: 'Not allowed',
     html: `You're not allowed to buy tokens during this tier.`,
@@ -412,7 +412,7 @@ export function notAllowedContributor() {
   })
 }
 
-export function noMoreReservedSlotAvailable() {
+export const noMoreReservedSlotAvailable = () => {
   return sweetAlert2({
     title: 'No more reserved tokens available',
     html: `You're not able to reserve more tokens. The maximum allowed is ${LIMIT_RESERVED_ADDRESSES}`,
@@ -420,7 +420,7 @@ export function noMoreReservedSlotAvailable() {
   })
 }
 
-export function noMoreReservedSlotAvailableCSV(count) {
+export const noMoreReservedSlotAvailableCSV = count => {
   return sweetAlert2({
     title: 'You reach the limit of reserved tokens',
     html: `You're not able to reserve more tokens. Reserved tokens imported Tokens will be reserved for ${count} addresses. The maximum allowed is ${LIMIT_RESERVED_ADDRESSES}`,
@@ -428,7 +428,7 @@ export function noMoreReservedSlotAvailableCSV(count) {
   })
 }
 
-export function noMoreWhitelistedSlotAvailable() {
+export const noMoreWhitelistedSlotAvailable = () => {
   return sweetAlert2({
     title: 'Maximum limit of addresses reached',
     html: `You're not able to add more addresses to the whitelist. The maximum allowed is ${LIMIT_WHITELISTED_ADDRESSES}`,
@@ -436,7 +436,7 @@ export function noMoreWhitelistedSlotAvailable() {
   })
 }
 
-export function noMoreWhitelistedSlotAvailableCSV(count) {
+export const noMoreWhitelistedSlotAvailableCSV = count => {
   return sweetAlert2({
     title: 'Maximum limit of addresses reached',
     html: `You're not able to add more addresses to the whitelist. Only ${count} addresses of the file could be added. The maximum allowed is ${LIMIT_WHITELISTED_ADDRESSES}`,
@@ -444,7 +444,7 @@ export function noMoreWhitelistedSlotAvailableCSV(count) {
   })
 }
 
-export function maxCapExceedsSupply(count) {
+export const maxCapExceedsSupply = count => {
   return sweetAlert2({
     title: `Max Cap exceeded tier's supply`,
     html: `<strong>${count}</strong> addresses where added. Addresses with <code>maxCap</code> greater than tier's supply where discarded.`,
@@ -452,7 +452,7 @@ export function maxCapExceedsSupply(count) {
   })
 }
 
-export function networkChanged() {
+export const networkChanged = () => {
   return sweetAlert2({
     title: 'Network changed',
     html: 'The network id was modified, please set up nifty wallet with the network id which you started',
@@ -460,7 +460,7 @@ export function networkChanged() {
   })
 }
 
-export function deployHasEnded() {
+export const deployHasEnded = () => {
   return sweetAlert2({
     title: 'Deploy ended',
     html: 'The deploy is finished',
@@ -468,7 +468,7 @@ export function deployHasEnded() {
   })
 }
 
-export function transactionLost() {
+export const transactionLost = () => {
   return sweetAlert2({
     title: 'Tx Lost',
     html: "Please cancel pending transaction, if there's any, in your wallet (Nifty Wallet or Metamask) and Continue",
diff --git a/src/utils/blockchainHelpers.js b/src/utils/blockchainHelpers.js
index 5bddd009e..ae8368d41 100644
--- a/src/utils/blockchainHelpers.js
+++ b/src/utils/blockchainHelpers.js
@@ -228,7 +228,7 @@ const deployContractInner = (account, abi, deployOpts, executionOrder) => {
     })
 }
 
-export function sendTXToContract(method, executionOrder) {
+export const sendTXToContract = (method, executionOrder) => {
   return sendTX(method, CALL_METHOD, executionOrder)
 }
 
@@ -362,7 +362,7 @@ const getTypeOfTxDisplayName = type => {
   }
 }
 
-export function attachToContract(abi, addr) {
+export const attachToContract = (abi, addr) => {
   const { web3 } = web3Store
 
   return web3.eth.getAccounts().then(accounts => {
@@ -386,7 +386,7 @@ const getApplicationInstance = async (app_instances, appName, appNameHash, i) =>
   }
 }
 
-async function getAllApplicationsInstances() {
+const getAllApplicationsInstances = async () => {
   const whenRegistryExecContract = attachToSpecificCrowdsaleContract('registryExec')
   const {
     REACT_APP_MINTED_CAPPED_APP_NAME: MINTED_CAPPED_APP_NAME,
@@ -414,7 +414,7 @@ async function getAllApplicationsInstances() {
   return Promise.all(whenCrowdsales).then(crowdsales => crowdsales.filter(crowdsale => crowdsale !== null))
 }
 
-async function getOwnerApplicationsInstancesForProxy() {
+const getOwnerApplicationsInstancesForProxy = async () => {
   const { web3 } = web3Store
   const proxiesRegistryContract = await attachToSpecificCrowdsaleContract('ProxiesRegistry')
   const accounts = await web3.eth.getAccounts()
@@ -447,7 +447,7 @@ async function getOwnerApplicationsInstancesForProxy() {
 }
 
 // eslint-disable-next-line no-unused-vars
-async function getOwnerApplicationsInstances() {
+const getOwnerApplicationsInstances = async () => {
   const { web3 } = web3Store
   const registryExecContract = await attachToSpecificCrowdsaleContract('registryExec')
   const accounts = await web3.eth.getAccounts()
@@ -545,13 +545,13 @@ export const getCrowdsaleStrategyByName = async appName => {
   }
 }
 
-export async function loadRegistryAddresses() {
+export const loadRegistryAddresses = async () => {
   const crowdsales = await getOwnerApplicationsInstancesForProxy()
   logger.log('Crowdsales', crowdsales)
   crowdsaleStore.setCrowdsales(crowdsales)
 }
 
-export let getCurrentAccount = () => {
+export const getCurrentAccount = () => {
   const { web3 } = web3Store
   return new Promise((resolve, reject) => {
     if (!web3) {
@@ -704,27 +704,27 @@ export let methodToCreateAppInstance = (contractName, methodName, getEncodedPara
   return method
 }
 
-function getCrowdsaleInfo(initCrowdsaleContract, addr, execID) {
+const getCrowdsaleInfo = (initCrowdsaleContract, addr, execID) => {
   const whenCrowdsaleInfo = initCrowdsaleContract.methods.getCrowdsaleInfo(addr, execID).call()
   return whenCrowdsaleInfo
 }
 
-function getCrowdsaleContributors(initCrowdsaleContract, addr, execID) {
+const getCrowdsaleContributors = (initCrowdsaleContract, addr, execID) => {
   const whenCrowdsaleUniqueBuyers = initCrowdsaleContract.methods.getCrowdsaleUniqueBuyers(addr, execID).call()
   return whenCrowdsaleUniqueBuyers
 }
 
-function getCrowdsaleStartAndEndTimes(initCrowdsaleContract, addr, execID) {
+const getCrowdsaleStartAndEndTimes = (initCrowdsaleContract, addr, execID) => {
   const whenCrowdsaleStartAndEndTimes = initCrowdsaleContract.methods.getCrowdsaleStartAndEndTimes(addr, execID).call()
   return whenCrowdsaleStartAndEndTimes
 }
 
-function getCrowdsaleTierList(initCrowdsaleContract, addr, execID) {
+const getCrowdsaleTierList = (initCrowdsaleContract, addr, execID) => {
   const whenCrowdsaleTierList = initCrowdsaleContract.methods.getCrowdsaleTierList(addr, execID).call()
   return whenCrowdsaleTierList
 }
 
-export async function getAllCrowdsaleAddresses() {
+export const getAllCrowdsaleAddresses = async () => {
   const instances = await getAllApplicationsInstances()
   const targetPrefix = 'idx'
 
@@ -786,7 +786,7 @@ export const isAddressValid = addr => {
   return web3Store && web3Store.web3 && web3Store.web3.utils.isAddress(addr)
 }
 
-export function getProxyParams({ abstractStorageAddr, networkID, appNameHash }) {
+export const getProxyParams = ({ abstractStorageAddr, networkID, appNameHash }) => {
   return [
     abstractStorageAddr,
     JSON.parse(process.env['REACT_APP_REGISTRY_EXEC_ID'] || '{}')[networkID],
diff --git a/src/utils/fetchFile.js b/src/utils/fetchFile.js
index 5ca5b6500..cbe421968 100644
--- a/src/utils/fetchFile.js
+++ b/src/utils/fetchFile.js
@@ -1,15 +1,5 @@
-export function fetchFile(path) {
-  return new Promise((resolve, reject) => {
-    const rawFile = new XMLHttpRequest()
-
-    rawFile.addEventListener('error', reject)
-    rawFile.open('GET', path, true)
-    rawFile.onreadystatechange = function() {
-      if (rawFile.readyState === 4 && (rawFile.status === 200 || rawFile.status === 0)) {
-        let allText = rawFile.responseText
-        resolve(allText)
-      }
-    }
-    rawFile.send(null)
-  })
+export async function fetchFile(path) {
+  let response = await fetch(path)
+  let data = await response.text()
+  return data
 }
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 923d49501..b2003cc22 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -9,7 +9,7 @@ import { isObservableArray } from 'mobx'
 
 const logger = logdown('TW:utils:utils')
 
-export function getQueryVariable(variable) {
+export const getQueryVariable = variable => {
   return queryString.parse(window.location.search)[variable]
 }
 
@@ -44,8 +44,8 @@ export const getNetworkID = () => {
   return isNetworkIDValid(networkID) ? networkID : null
 }
 
-export function setFlatFileContentToState(file) {
-  return fetchFile(file)
+export const setFlatFileContentToState = async file => {
+  return await fetchFile(file)
 }
 
 export const dateToTimestamp = date => new Date(date).getTime()
@@ -61,7 +61,7 @@ export const validateLaterTime = (laterTime, previousTime) => dateToTimestamp(la
 export const validateLaterOrEqualTime = (laterTime, previousTime) =>
   dateToTimestamp(laterTime) >= dateToTimestamp(previousTime)
 
-export function toFixed(x) {
+export const toFixed = x => {
   if (Math.abs(x) < 1.0) {
     let e = parseInt(x.toString().split('e-')[1], 10)
     if (e) {
@@ -86,7 +86,11 @@ export const toast = {
       return
     }
 
-    this.msg[type](message, options)
+    if (typeof this.msg[type] === 'function') {
+      this.msg[type](message, options)
+    } else {
+      return
+    }
   }
 }
 
@@ -273,12 +277,12 @@ export const convertDateToUTCTimezoneToDisplay = dateToConvert => {
     .format('YYYY-MM-DD HH:mm (z ZZ)')
 }
 
-export function getContractBySourceType(sourceType, isMintedCappedCrowdsale, { DutchProxy, MintedCappedProxy }) {
+export const getContractBySourceType = (sourceType, isMintedCappedCrowdsale, { DutchProxy, MintedCappedProxy }) => {
   const parseContent = content => (isObservableArray(content) ? JSON.stringify(content.slice()) : content)
   return isMintedCappedCrowdsale ? parseContent(MintedCappedProxy[sourceType]) : parseContent(DutchProxy[sourceType])
 }
 
-export function getSourceTypeTitle(sourceType) {
+export const getSourceTypeTitle = sourceType => {
   const sourceTypeName = {
     abi: 'ABI',
     bin: 'Creation Code',
@@ -288,7 +292,7 @@ export function getSourceTypeTitle(sourceType) {
   return `Crowdsale Proxy Contract ${sourceTypeName[sourceType]}`
 }
 
-export function updateProxyContractInfo({ contractAddress }, { web3Store, contractStore, crowdsaleStore }, params) {
+export const updateProxyContractInfo = ({ contractAddress }, { web3Store, contractStore, crowdsaleStore }, params) => {
   const { web3 } = web3Store
   const encoded = web3.eth.abi.encodeParameters(['address', 'bytes32', 'address', 'bytes32'], params)
 
diff --git a/test/components/Common/DisplayField.spec.js b/test/components/Common/DisplayField.spec.js
index 8ecb730c9..a459f4102 100644
--- a/test/components/Common/DisplayField.spec.js
+++ b/test/components/Common/DisplayField.spec.js
@@ -2,7 +2,7 @@ import React from 'react'
 import { DisplayField } from '../../../src/components/Common/DisplayField'
 import { Form } from 'react-final-form'
 import Adapter from 'enzyme-adapter-react-15'
-import { configure, mount } from 'enzyme'
+import { configure, shallow } from 'enzyme'
 
 configure({ adapter: new Adapter() })
 
@@ -19,7 +19,7 @@ describe('DisplayField ', () => {
       large: 'Large',
       extralarge: 'ExtraLarge'
     }
-    const wrapper = mount(
+    const wrapper = shallow(
       <Form
         onSubmit={jest.fn()}
         component={DisplayField}
@@ -30,16 +30,7 @@ describe('DisplayField ', () => {
         mobileTextSize={mobileTextSize}
       />
     )
-    expect(wrapper.find('.pb-DisplayField').props().title).toBe(description)
-    expect(wrapper.find(`.${extraClass}`)).toHaveLength(1)
-    expect(wrapper.find('.pb-DisplayField_Title').text()).toBe(title)
-    expect(
-      wrapper
-        .find('.pb-DisplayField_Value')
-        .text()
-        .trim()
-    ).toBe(value)
-    expect(wrapper.find(`.pb-DisplayField_Value-MobileTextSize${valueSize[mobileTextSize]}`)).toHaveLength(1)
-    expect(wrapper.find(`[data-clipboard-text="${value}"]`).text()).toBeDefined()
+
+    expect(wrapper).toMatchSnapshot()
   })
 })
diff --git a/test/components/Common/ProtectedRoute.spec.js b/test/components/Common/ProtectedRoute.spec.js
new file mode 100644
index 000000000..9db853924
--- /dev/null
+++ b/test/components/Common/ProtectedRoute.spec.js
@@ -0,0 +1,27 @@
+import React from 'react'
+import render from 'react-test-renderer'
+import Adapter from 'enzyme-adapter-react-15'
+import { configure, mount, shallow } from 'enzyme'
+import { ProtectedRoute } from '../../../src/components/Common/ProtectedRoute'
+import { BrowserRouter as Router, Route, Switch } from 'react-router-dom'
+import { deploymentStore } from '../../../src/stores'
+import { Home } from '../../../src/components/Home'
+import { Provider } from 'mobx-react'
+
+configure({ adapter: new Adapter() })
+
+describe(`ProtectedRoute`, () => {
+  it(`should render ProtectedRoute component`, () => {
+    const stores = { deploymentStore }
+
+    const wrapper = mount(
+      <Provider {...stores}>
+        <Router>
+          <ProtectedRoute {...stores} component={Home} />
+        </Router>
+      </Provider>
+    )
+
+    expect(wrapper).toMatchSnapshot()
+  })
+})
diff --git a/test/components/Common/TierBlock.spec.js b/test/components/Common/TierBlock.spec.js
index c9916ee6f..de16d394c 100644
--- a/test/components/Common/TierBlock.spec.js
+++ b/test/components/Common/TierBlock.spec.js
@@ -1,21 +1,21 @@
 import React from 'react'
-import {TierBlock} from '../../../src/components/Common/TierBlock'
-import {Form} from 'react-final-form'
-import {FieldArray} from 'react-final-form-arrays'
+import { TierBlock } from '../../../src/components/Common/TierBlock'
+import { Form } from 'react-final-form'
+import { FieldArray } from 'react-final-form-arrays'
 import Adapter from 'enzyme-adapter-react-15'
-import {configure, mount, shallow} from 'enzyme'
+import { configure, mount, shallow } from 'enzyme'
 import renderer from 'react-test-renderer'
 import TierStore from '../../../src/stores/TierStore'
 import { defaultTier, defaultTierValidations } from '../../../src/utils/constants'
 import { VALIDATION_TYPES, VALIDATION_MESSAGES } from '../../../src/utils/constants'
 
-configure({adapter: new Adapter()})
+configure({ adapter: new Adapter() })
 
 describe('TierBlock ', () => {
-    let tierStore = new TierStore()
-    const fields = [['tierblock', 0]]
+  let tierStore = new TierStore()
+  const fields = [['tierblock', 0]]
 
-    const addCrowdsale = num => {
+  const addCrowdsale = num => {
     const newTier = Object.assign({}, defaultTier)
     const newTierValidations = Object.assign({}, defaultTierValidations)
     newTier.tier = `Tier ${num + 1}`
@@ -28,7 +28,7 @@ describe('TierBlock ', () => {
     tierStore.addTier(newTier, newTierValidations)
   }
 
- // tiers[index].endTime
+  // tiers[index].endTime
 
   it(`should render TierBlock component`, () => {
     addCrowdsale(0)
diff --git a/test/components/Common/__snapshots__/ButtonCopyToClipboard.spec.js.snap b/test/components/Common/__snapshots__/ButtonCopyToClipboard.spec.js.snap
index ec3bf809c..88a37f38a 100644
--- a/test/components/Common/__snapshots__/ButtonCopyToClipboard.spec.js.snap
+++ b/test/components/Common/__snapshots__/ButtonCopyToClipboard.spec.js.snap
@@ -6,5 +6,24 @@ exports[`ButtonCopyToClipboard should render ButtonCopyToClipboard component 1`]
   data-clipboard-action="copy"
   onClick={[Function]}
   type="button"
-/>
+>
+  <svg
+    height="20"
+    viewBox="0 0 16 20"
+    width="16"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <g
+      fill="#8CE1D7"
+      fillRule="nonzero"
+    >
+      <path
+        d="M10.867 3.493H1.602c-.87 0-1.575.707-1.575 1.579v13.32c0 .872.706 1.58 1.575 1.58h9.265c.87 0 1.576-.708 1.576-1.58V5.073a1.583 1.583 0 0 0-1.576-1.58zm.47 14.896a.474.474 0 0 1-.474.474H1.598a.474.474 0 0 1-.474-.474V5.072c0-.262.213-.475.474-.475h9.265c.261 0 .474.213.474.475v13.317z"
+      />
+      <path
+        d="M14.41 0H5.145c-.87 0-1.576.708-1.576 1.579a.55.55 0 0 0 .551.552.55.55 0 0 0 .551-.552c0-.262.213-.475.474-.475h9.265c.261 0 .474.213.474.475v13.32a.474.474 0 0 1-.474.475.55.55 0 0 0-.55.552.55.55 0 0 0 .55.553c.87 0 1.576-.708 1.576-1.58V1.58C15.986.708 15.28 0 14.41 0z"
+      />
+    </g>
+  </svg>
+</button>
 `;
diff --git a/test/components/Common/__snapshots__/CrowdsaleEndTime.spec.js.snap b/test/components/Common/__snapshots__/CrowdsaleEndTime.spec.js.snap
index cd1a3cae8..04992f36c 100644
--- a/test/components/Common/__snapshots__/CrowdsaleEndTime.spec.js.snap
+++ b/test/components/Common/__snapshots__/CrowdsaleEndTime.spec.js.snap
@@ -24,6 +24,7 @@ exports[`CrowdsaleEndTime Rendering should render CrowdsaleEndTime component 1`]
     </div>
   </div>
   <input
+    autoComplete="off"
     className="sw-TextField"
     disabled={false}
     id="tiers[0].endTime"
@@ -61,6 +62,7 @@ exports[`CrowdsaleEndTime Rendering should render CrowdsaleEndTime component if
     </div>
   </div>
   <input
+    autoComplete="off"
     className="sw-TextField"
     disabled={true}
     id="tiers[0].endTime"
diff --git a/test/components/Common/__snapshots__/CrowdsaleRate.spec.js.snap b/test/components/Common/__snapshots__/CrowdsaleRate.spec.js.snap
index 316cc1d87..85e272108 100644
--- a/test/components/Common/__snapshots__/CrowdsaleRate.spec.js.snap
+++ b/test/components/Common/__snapshots__/CrowdsaleRate.spec.js.snap
@@ -24,6 +24,7 @@ exports[`CrowdsaleRate should render CrowdsaleRate component 1`] = `
     </div>
   </div>
   <input
+    autoComplete="off"
     className="sw-TextField"
     disabled={false}
     id="CrowdsaleRate"
diff --git a/test/components/Common/__snapshots__/CrowdsaleStartTime.spec.js.snap b/test/components/Common/__snapshots__/CrowdsaleStartTime.spec.js.snap
index d1eba4d27..0436fafc4 100644
--- a/test/components/Common/__snapshots__/CrowdsaleStartTime.spec.js.snap
+++ b/test/components/Common/__snapshots__/CrowdsaleStartTime.spec.js.snap
@@ -24,6 +24,7 @@ exports[`CrowdsaleStartTime Rendering should render CrowdsaleStartTime component
     </div>
   </div>
   <input
+    autoComplete="off"
     className="sw-TextField"
     disabled={false}
     id="tiers[0].startTime"
@@ -61,6 +62,7 @@ exports[`CrowdsaleStartTime Rendering should render CrowdsaleStartTime component
     </div>
   </div>
   <input
+    autoComplete="off"
     className="sw-TextField"
     disabled={true}
     id="tiers[0].startTime"
diff --git a/test/components/Common/__snapshots__/DisplayField.spec.js.snap b/test/components/Common/__snapshots__/DisplayField.spec.js.snap
new file mode 100644
index 000000000..144bc13ed
--- /dev/null
+++ b/test/components/Common/__snapshots__/DisplayField.spec.js.snap
@@ -0,0 +1,61 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`DisplayField  should render DisplayField component with specified parameters 1`] = `
+<DisplayField
+  __versions={
+    Object {
+      "final-form": "4.6.1",
+      "react-final-form": "3.4.0",
+    }
+  }
+  batch={[Function]}
+  blur={[Function]}
+  change={[Function]}
+  description="DisplayField description"
+  dirty={false}
+  dirtySinceLastSubmit={false}
+  errors={Object {}}
+  extraClass="anExtraClass"
+  focus={[Function]}
+  form={
+    Object {
+      "batch": [Function],
+      "blur": [Function],
+      "change": [Function],
+      "focus": [Function],
+      "getFieldState": [Function],
+      "getRegisteredFields": [Function],
+      "getState": [Function],
+      "initialize": [Function],
+      "isValidationPaused": [Function],
+      "mutators": Object {},
+      "pauseValidation": [Function],
+      "registerField": [Function],
+      "reset": [Function],
+      "resumeValidation": [Function],
+      "setConfig": [Function],
+      "submit": [Function],
+      "subscribe": [Function],
+    }
+  }
+  handleSubmit={[Function]}
+  hasSubmitErrors={false}
+  hasValidationErrors={false}
+  initialize={[Function]}
+  invalid={false}
+  mobileTextSize="large"
+  mutators={Object {}}
+  pristine={true}
+  reset={[Function]}
+  submitFailed={false}
+  submitSucceeded={false}
+  submitting={false}
+  title="DisplayField title"
+  touched={Object {}}
+  valid={true}
+  validating={false}
+  value="DisplayField value"
+  values={Object {}}
+  visited={Object {}}
+/>
+`;
diff --git a/test/components/Common/__snapshots__/MinCap.spec.js.snap b/test/components/Common/__snapshots__/MinCap.spec.js.snap
index 91f25f316..456e35adc 100644
--- a/test/components/Common/__snapshots__/MinCap.spec.js.snap
+++ b/test/components/Common/__snapshots__/MinCap.spec.js.snap
@@ -25,6 +25,7 @@ exports[`MinCap  should render MinCap component 1`] = `
     </div>
   </div>
   <input
+    autoComplete="off"
     className="sw-TextField"
     disabled={false}
     id="mincap"
@@ -63,6 +64,7 @@ exports[`MinCap  should render MinCap component if field is disabled 1`] = `
     </div>
   </div>
   <input
+    autoComplete="off"
     className="sw-TextField"
     disabled={true}
     id="mincap"
diff --git a/test/components/Common/__snapshots__/NumericInput.spec.js.snap b/test/components/Common/__snapshots__/NumericInput.spec.js.snap
index 402cf5dda..05816962f 100644
--- a/test/components/Common/__snapshots__/NumericInput.spec.js.snap
+++ b/test/components/Common/__snapshots__/NumericInput.spec.js.snap
@@ -24,6 +24,7 @@ exports[`NumericInput Should render the component 1`] = `
     </div>
   </div>
   <input
+    autoComplete="off"
     className="sw-TextField"
     onChange={[Function]}
     onKeyPress={[Function]}
diff --git a/test/components/Common/__snapshots__/ProtectedRoute.spec.js.snap b/test/components/Common/__snapshots__/ProtectedRoute.spec.js.snap
new file mode 100644
index 000000000..1039588d5
--- /dev/null
+++ b/test/components/Common/__snapshots__/ProtectedRoute.spec.js.snap
@@ -0,0 +1,284 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ProtectedRoute should render ProtectedRoute component 1`] = `
+<Provider
+  deploymentStore={
+    DeploymentStore {
+      "deployerAccount": null,
+      "deploymentStep": null,
+      "hasEnded": false,
+      "invalidAccount": false,
+      "logTxMap": [Function],
+      "txMap": Object {},
+    }
+  }
+>
+  <BrowserRouter>
+    <Router
+      history={
+        Object {
+          "action": "POP",
+          "block": [Function],
+          "createHref": [Function],
+          "go": [Function],
+          "goBack": [Function],
+          "goForward": [Function],
+          "length": 1,
+          "listen": [Function],
+          "location": Object {
+            "hash": "",
+            "pathname": "/",
+            "search": "",
+            "state": undefined,
+          },
+          "push": [Function],
+          "replace": [Function],
+        }
+      }
+    >
+      <inject-ProtectedRoute-with-deploymentStore
+        component={[Function]}
+        deploymentStore={
+          DeploymentStore {
+            "deployerAccount": null,
+            "deploymentStep": null,
+            "hasEnded": false,
+            "invalidAccount": false,
+            "logTxMap": [Function],
+            "txMap": Object {},
+          }
+        }
+      >
+        <ProtectedRoute
+          component={[Function]}
+          deploymentStore={
+            DeploymentStore {
+              "deployerAccount": null,
+              "deploymentStep": null,
+              "hasEnded": false,
+              "invalidAccount": false,
+              "logTxMap": [Function],
+              "txMap": Object {},
+            }
+          }
+        >
+          <Route
+            render={[Function]}
+          >
+            <inject-Home-with-deploymentStore
+              history={
+                Object {
+                  "action": "POP",
+                  "block": [Function],
+                  "createHref": [Function],
+                  "go": [Function],
+                  "goBack": [Function],
+                  "goForward": [Function],
+                  "length": 1,
+                  "listen": [Function],
+                  "location": Object {
+                    "hash": "",
+                    "pathname": "/",
+                    "search": "",
+                    "state": undefined,
+                  },
+                  "push": [Function],
+                  "replace": [Function],
+                }
+              }
+              location={
+                Object {
+                  "hash": "",
+                  "pathname": "/",
+                  "search": "",
+                  "state": undefined,
+                }
+              }
+              match={
+                Object {
+                  "isExact": true,
+                  "params": Object {},
+                  "path": "/",
+                  "url": "/",
+                }
+              }
+            >
+              <Home
+                deploymentStore={
+                  DeploymentStore {
+                    "deployerAccount": null,
+                    "deploymentStep": null,
+                    "hasEnded": false,
+                    "invalidAccount": false,
+                    "logTxMap": [Function],
+                    "txMap": Object {},
+                  }
+                }
+                history={
+                  Object {
+                    "action": "POP",
+                    "block": [Function],
+                    "createHref": [Function],
+                    "go": [Function],
+                    "goBack": [Function],
+                    "goForward": [Function],
+                    "length": 1,
+                    "listen": [Function],
+                    "location": Object {
+                      "hash": "",
+                      "pathname": "/",
+                      "search": "",
+                      "state": undefined,
+                    },
+                    "push": [Function],
+                    "replace": [Function],
+                  }
+                }
+                location={
+                  Object {
+                    "hash": "",
+                    "pathname": "/",
+                    "search": "",
+                    "state": undefined,
+                  }
+                }
+                match={
+                  Object {
+                    "isExact": true,
+                    "params": Object {},
+                    "path": "/",
+                    "url": "/",
+                  }
+                }
+              >
+                <div>
+                  <section
+                    className="hm-Home"
+                  >
+                    <div
+                      className="hm-Home_Scroll"
+                    >
+                      <div
+                        className="hm-Home_Top"
+                      >
+                        <LogoPrimary>
+                          <Link
+                            className="sw-LogoPrimary"
+                            replace={false}
+                            to="/"
+                          >
+                            <a
+                              className="sw-LogoPrimary"
+                              href="/"
+                              onClick={[Function]}
+                            />
+                          </Link>
+                        </LogoPrimary>
+                      </div>
+                      <div
+                        className="hm-Home_MainInfoContainer"
+                      >
+                        <div
+                          className="hm-Home_MainInfo"
+                        >
+                          <div
+                            className="hm-Home_MainInfoTextContainer"
+                          >
+                            <h1
+                              className="hm-Home_MainInfoTitle"
+                            >
+                              Welcome to Token Wizard
+                            </h1>
+                            <p
+                              className="hm-Home_MainInfoDescription"
+                            >
+                              Token Wizard is a client side tool to create ERC20 token and crowdsale in five steps. It helps you to publish contracts on the Ethereum network, create a crowdsale page with stats. For participants, the wizard creates a page to contribute into the campaign.
+                            </p>
+                            <p
+                              className="hm-Home_MainInfoPoweredBy"
+                            >
+                              Token Wizard is powered by 
+                              <a
+                                href="https://github.com/auth-os/beta"
+                              >
+                                Auth-os
+                              </a>
+                              .
+                            </p>
+                          </div>
+                          <div
+                            className="hm-Home_MainInfoButtonContainer"
+                          >
+                            <ButtonCreateCrowdsale
+                              history={
+                                Object {
+                                  "action": "POP",
+                                  "block": [Function],
+                                  "createHref": [Function],
+                                  "go": [Function],
+                                  "goBack": [Function],
+                                  "goForward": [Function],
+                                  "length": 1,
+                                  "listen": [Function],
+                                  "location": Object {
+                                    "hash": "",
+                                    "pathname": "/",
+                                    "search": "",
+                                    "state": undefined,
+                                  },
+                                  "push": [Function],
+                                  "replace": [Function],
+                                }
+                              }
+                            >
+                              <button
+                                className="hm-ButtonCreateCrowdsale"
+                                onClick={[Function]}
+                              >
+                                New crowdsale
+                              </button>
+                            </ButtonCreateCrowdsale>
+                            <ButtonChooseCrowdsale
+                              history={
+                                Object {
+                                  "action": "POP",
+                                  "block": [Function],
+                                  "createHref": [Function],
+                                  "go": [Function],
+                                  "goBack": [Function],
+                                  "goForward": [Function],
+                                  "length": 1,
+                                  "listen": [Function],
+                                  "location": Object {
+                                    "hash": "",
+                                    "pathname": "/",
+                                    "search": "",
+                                    "state": undefined,
+                                  },
+                                  "push": [Function],
+                                  "replace": [Function],
+                                }
+                              }
+                            >
+                              <div
+                                className="hm-ButtonChooseCrowdsale"
+                                onClick={[Function]}
+                              >
+                                Choose Crowdsale
+                              </div>
+                            </ButtonChooseCrowdsale>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </section>
+                </div>
+              </Home>
+            </inject-Home-with-deploymentStore>
+          </Route>
+        </ProtectedRoute>
+      </inject-ProtectedRoute-with-deploymentStore>
+    </Router>
+  </BrowserRouter>
+</Provider>
+`;
diff --git a/test/components/Common/__snapshots__/ReservedTokensInputBlock.spec.js.snap b/test/components/Common/__snapshots__/ReservedTokensInputBlock.spec.js.snap
index 9424a9b6a..d73627955 100644
--- a/test/components/Common/__snapshots__/ReservedTokensInputBlock.spec.js.snap
+++ b/test/components/Common/__snapshots__/ReservedTokensInputBlock.spec.js.snap
@@ -100,6 +100,7 @@ exports[`ReservedTokensInputBlock render should render the component for percent
               value=""
             >
               <input
+                autoComplete="off"
                 className="sw-TextField"
                 onChange={[Function]}
                 placeholder="Enter here"
@@ -253,6 +254,7 @@ exports[`ReservedTokensInputBlock render should render the component for percent
                 value=""
               >
                 <input
+                  autoComplete="off"
                   className="sw-TextField"
                   min="0"
                   onChange={[Function]}
@@ -408,6 +410,7 @@ exports[`ReservedTokensInputBlock render should render the component for tokens:
               value=""
             >
               <input
+                autoComplete="off"
                 className="sw-TextField"
                 onChange={[Function]}
                 placeholder="Enter here"
@@ -562,6 +565,7 @@ exports[`ReservedTokensInputBlock render should render the component for tokens:
                 value=""
               >
                 <input
+                  autoComplete="off"
                   className="sw-TextField"
                   min="1"
                   onChange={[Function]}
diff --git a/test/components/Common/__snapshots__/Supply.spec.js.snap b/test/components/Common/__snapshots__/Supply.spec.js.snap
index 8ea06d022..18e4216d3 100644
--- a/test/components/Common/__snapshots__/Supply.spec.js.snap
+++ b/test/components/Common/__snapshots__/Supply.spec.js.snap
@@ -24,6 +24,7 @@ exports[`Supply  should render Supply component 1`] = `
     </div>
   </div>
   <input
+    autoComplete="off"
     className="sw-TextField"
     disabled={false}
     id="Supply"
diff --git a/test/components/Common/__snapshots__/TextField.spec.js.snap b/test/components/Common/__snapshots__/TextField.spec.js.snap
index 471cfc6c6..8ff018e4a 100644
--- a/test/components/Common/__snapshots__/TextField.spec.js.snap
+++ b/test/components/Common/__snapshots__/TextField.spec.js.snap
@@ -2,6 +2,7 @@
 
 exports[`TextField should render TextField component 1`] = `
 <input
+  autoComplete="off"
   className="sw-TextField"
 />
 `;
diff --git a/test/components/Common/__snapshots__/TierBlock.spec.js.snap b/test/components/Common/__snapshots__/TierBlock.spec.js.snap
index 2767c9de9..1b5f71aef 100644
--- a/test/components/Common/__snapshots__/TierBlock.spec.js.snap
+++ b/test/components/Common/__snapshots__/TierBlock.spec.js.snap
@@ -30,6 +30,7 @@ exports[`TierBlock  should render TierBlock component 1`] = `
         </div>
       </div>
       <input
+        autoComplete="off"
         className="sw-TextField"
         id="tierblock,0.tier"
         name="tierblock,0.tier"
@@ -64,6 +65,7 @@ exports[`TierBlock  should render TierBlock component 1`] = `
         </div>
       </div>
       <input
+        autoComplete="off"
         className="sw-TextField"
         disabled={false}
         id="tierblock,0.startTime"
@@ -98,6 +100,7 @@ exports[`TierBlock  should render TierBlock component 1`] = `
         </div>
       </div>
       <input
+        autoComplete="off"
         className="sw-TextField"
         id="tierblock,0.endTime"
         name="tierblock,0.endTime"
@@ -131,6 +134,7 @@ exports[`TierBlock  should render TierBlock component 1`] = `
         </div>
       </div>
       <input
+        autoComplete="off"
         className="sw-TextField"
         id="tierblock,0.rate"
         max="1000000000000000000"
@@ -167,6 +171,7 @@ exports[`TierBlock  should render TierBlock component 1`] = `
         </div>
       </div>
       <input
+        autoComplete="off"
         className="sw-TextField"
         disabled={false}
         id="tierblock,0.supply"
@@ -204,6 +209,7 @@ exports[`TierBlock  should render TierBlock component 1`] = `
         </div>
       </div>
       <input
+        autoComplete="off"
         className="sw-TextField"
         disabled={false}
         id="tierblock,0.minCap"
diff --git a/test/components/Common/__snapshots__/TokenDecimals.spec.js.snap b/test/components/Common/__snapshots__/TokenDecimals.spec.js.snap
index cc39e8db1..0ad283120 100644
--- a/test/components/Common/__snapshots__/TokenDecimals.spec.js.snap
+++ b/test/components/Common/__snapshots__/TokenDecimals.spec.js.snap
@@ -24,6 +24,7 @@ exports[`TokenDecimals should render TokenDecimals component 1`] = `
     </div>
   </div>
   <input
+    autoComplete="off"
     className="sw-TextField"
     id="decimals"
     max="18"
@@ -63,6 +64,7 @@ exports[`TokenDecimals should render TokenDecimals component and its children 1`
     </div>
   </div>
   <input
+    autoComplete="off"
     className="sw-TextField"
     id="decimals"
     max="18"
@@ -239,7 +241,6 @@ exports[`TokenDecimals should render TokenDecimals component and its children, w
             </div>
           </FormControlTitle>
           <TextField
-            autoComplete="off"
             disabled={true}
             id="decimals"
             max="18"
@@ -253,6 +254,7 @@ exports[`TokenDecimals should render TokenDecimals component and its children, w
             value=""
           >
             <input
+              autoComplete="off"
               className="sw-TextField"
               disabled={true}
               id="decimals"
diff --git a/test/components/Common/__snapshots__/TokenName.spec.js.snap b/test/components/Common/__snapshots__/TokenName.spec.js.snap
index 8447503cc..4e5d4d953 100644
--- a/test/components/Common/__snapshots__/TokenName.spec.js.snap
+++ b/test/components/Common/__snapshots__/TokenName.spec.js.snap
@@ -24,6 +24,7 @@ exports[`TokenName should render TokenName component 1`] = `
     </div>
   </div>
   <input
+    autoComplete="off"
     className="sw-TextField"
     id="name"
     name="name"
@@ -61,6 +62,7 @@ exports[`TokenName should render TokenName component and its children 1`] = `
     </div>
   </div>
   <input
+    autoComplete="off"
     className="sw-TextField"
     id="name"
     name="name"
diff --git a/test/components/Common/__snapshots__/TokenSupply.spec.js.snap b/test/components/Common/__snapshots__/TokenSupply.spec.js.snap
index 3b639ed01..e3fb90c8d 100644
--- a/test/components/Common/__snapshots__/TokenSupply.spec.js.snap
+++ b/test/components/Common/__snapshots__/TokenSupply.spec.js.snap
@@ -24,6 +24,7 @@ exports[`TokenSupply should render TokenDecimals component 1`] = `
     </div>
   </div>
   <input
+    autoComplete="off"
     className="sw-TextField"
     id="supply"
     min="0"
@@ -62,6 +63,7 @@ exports[`TokenSupply should render TokenSupply component and its children 1`] =
     </div>
   </div>
   <input
+    autoComplete="off"
     className="sw-TextField"
     id="supply"
     min="0"
@@ -233,7 +235,6 @@ exports[`TokenSupply should render TokenSupply component and its children, with
             </div>
           </FormControlTitle>
           <TextField
-            autoComplete="off"
             id="supply"
             min="0"
             name="supply"
@@ -245,6 +246,7 @@ exports[`TokenSupply should render TokenSupply component and its children, with
             value=""
           >
             <input
+              autoComplete="off"
               className="sw-TextField"
               id="supply"
               min="0"
diff --git a/test/components/Common/__snapshots__/TokenTicker.spec.js.snap b/test/components/Common/__snapshots__/TokenTicker.spec.js.snap
index dea8936f1..9947226c4 100644
--- a/test/components/Common/__snapshots__/TokenTicker.spec.js.snap
+++ b/test/components/Common/__snapshots__/TokenTicker.spec.js.snap
@@ -24,6 +24,7 @@ exports[`TokenTicker should render TokenTicker component 1`] = `
     </div>
   </div>
   <input
+    autoComplete="off"
     className="sw-TextField"
     id="ticker"
     name="ticker"
@@ -61,6 +62,7 @@ exports[`TokenTicker should render TokenTicker component and its children 1`] =
     </div>
   </div>
   <input
+    autoComplete="off"
     className="sw-TextField"
     id="ticker"
     name="ticker"
diff --git a/test/components/Common/__snapshots__/WhitelistTable.spec.js.snap b/test/components/Common/__snapshots__/WhitelistTable.spec.js.snap
index 1e36fbc81..6dd66262d 100644
--- a/test/components/Common/__snapshots__/WhitelistTable.spec.js.snap
+++ b/test/components/Common/__snapshots__/WhitelistTable.spec.js.snap
@@ -22,12 +22,12 @@ exports[`WhitelistTable should render WhitelistTable component 1`] = `
             0x2bD96eA633e8BcB468732c68B2CD632BfF4D79Db
           </td>
           <td
-            className="sw-WhiteListTable_Column sw-WhiteListTable_value"
+            className="sw-WhiteListTable_Column sw-WhiteListTable_Column-value-min "
           >
             1
           </td>
           <td
-            className="sw-WhiteListTable_Column sw-WhiteListTable_value"
+            className="sw-WhiteListTable_Column sw-WhiteListTable_Column-value-max "
           >
             5
           </td>
@@ -50,15 +50,18 @@ exports[`WhitelistTable should render WhitelistTable component 1`] = `
             0x665772109Eb2dc9F5B7c28F987Ec58949d4Eeb87
           </td>
           <td
-            className="sw-WhiteListTable_Column sw-WhiteListTable_value"
+            className="sw-WhiteListTable_Column sw-WhiteListTable_Column-value-min "
           >
             1
           </td>
           <td
-            className="sw-WhiteListTable_Column sw-WhiteListTable_value"
+            className="sw-WhiteListTable_Column sw-WhiteListTable_Column-value-max "
           >
             5
           </td>
+          <td>
+             
+          </td>
         </tr>
         <tr
           className="sw-WhiteListTable_Row"
@@ -69,15 +72,18 @@ exports[`WhitelistTable should render WhitelistTable component 1`] = `
             0x66f537cCD03f21c58172602B919884A442A3c313
           </td>
           <td
-            className="sw-WhiteListTable_Column sw-WhiteListTable_value"
+            className="sw-WhiteListTable_Column sw-WhiteListTable_Column-value-min "
           >
             1
           </td>
           <td
-            className="sw-WhiteListTable_Column sw-WhiteListTable_value"
+            className="sw-WhiteListTable_Column sw-WhiteListTable_Column-value-max "
           >
             5
           </td>
+          <td>
+             
+          </td>
         </tr>
         <tr
           className="sw-WhiteListTable_Row"
@@ -88,15 +94,18 @@ exports[`WhitelistTable should render WhitelistTable component 1`] = `
             0x693d436da2c3C11341149522E5F6d0390B363197
           </td>
           <td
-            className="sw-WhiteListTable_Column sw-WhiteListTable_value"
+            className="sw-WhiteListTable_Column sw-WhiteListTable_Column-value-min "
           >
             1
           </td>
           <td
-            className="sw-WhiteListTable_Column sw-WhiteListTable_value"
+            className="sw-WhiteListTable_Column sw-WhiteListTable_Column-value-max "
           >
             5
           </td>
+          <td>
+             
+          </td>
         </tr>
       </tbody>
     </table>
diff --git a/test/components/Contribute/ContributeDataList.spec.js b/test/components/Contribute/ContributeDataList.spec.js
index f8993c030..eaa2805f1 100644
--- a/test/components/Contribute/ContributeDataList.spec.js
+++ b/test/components/Contribute/ContributeDataList.spec.js
@@ -13,10 +13,8 @@ describe(`ContributeDataList`, () => {
   it(`should contain the current account address, crowdsale address and a copy button`, () => {
     const wrapper = mount(<ContributeDataList currentAccount={currentAccount} crowdsaleAddress={crowdsaleAddress} />)
     const dataItems = wrapper.find('.cnt-ContributeDataList_Item')
-    const copyButton = wrapper.find('.sw-ButtonCopyToClipboard')
 
     expect(dataItems.length).toBe(2)
-    expect(copyButton.length).toBe(1)
   })
 
   it(`should contain only one children`, () => {
diff --git a/test/components/Contribute/CountdownTimer.spec.js b/test/components/Contribute/CountdownTimer.spec.js
index 5e6a6f13f..1c491a181 100644
--- a/test/components/Contribute/CountdownTimer.spec.js
+++ b/test/components/Contribute/CountdownTimer.spec.js
@@ -101,46 +101,4 @@ describe('CountdownTimer', () => {
     expect(wrapper).toMatchSnapshot()
   })
 
-  it(`Should render the component with alternative message`, () => {
-    const altMessage = 'Alternative Message'
-
-    const wrapper = shallow(
-      <CountdownTimer
-        displaySeconds={false}
-        nextTick={{ type: 'start', order: 1 }}
-        tiersLength={2}
-        days={1}
-        hours={4}
-        minutes={45}
-        seconds={30}
-        msToNextTick={30445}
-        onComplete={jest.fn()}
-        isFinalized={false}
-        altMessage={altMessage}
-      />
-    )
-    expect(wrapper).toMatchSnapshot()
-
-    const altMessageText = wrapper.find('.timer__altMessage').text()
-    expect(altMessageText).toBe(altMessage)
-  })
-
-  it(`Should stop countdown if crowdsale was finalized`, () => {
-    const wrapper = shallow(
-      <CountdownTimer
-        displaySeconds={false}
-        nextTick={{ type: 'start', order: 1 }}
-        tiersLength={2}
-        days={1}
-        hours={4}
-        minutes={45}
-        seconds={30}
-        msToNextTick={30445000}
-        onComplete={jest.fn()}
-        isFinalized={true}
-      />
-    )
-
-    expect(wrapper.find('ReactCountdownClock').props().seconds).toBe(0)
-  })
 })
diff --git a/test/components/Contribute/__snapshots__/ContributeDataList.spec.js.snap b/test/components/Contribute/__snapshots__/ContributeDataList.spec.js.snap
index 8bb14fc13..022989106 100644
--- a/test/components/Contribute/__snapshots__/ContributeDataList.spec.js.snap
+++ b/test/components/Contribute/__snapshots__/ContributeDataList.spec.js.snap
@@ -15,6 +15,32 @@ exports[`ContributeDataList should render ContributeDataList component 1`] = `
       >
         0x1237612212322c1237Cc7c8bBC123cE4D0Cb4123
       </span>
+      <button
+        className="sw-ButtonCopyToClipboard "
+        data-clipboard-action="copy"
+        data-clipboard-text="0x1237612212322c1237Cc7c8bBC123cE4D0Cb4123"
+        onClick={[Function]}
+        type="button"
+      >
+        <svg
+          height="20"
+          viewBox="0 0 16 20"
+          width="16"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <g
+            fill="#8CE1D7"
+            fillRule="nonzero"
+          >
+            <path
+              d="M10.867 3.493H1.602c-.87 0-1.575.707-1.575 1.579v13.32c0 .872.706 1.58 1.575 1.58h9.265c.87 0 1.576-.708 1.576-1.58V5.073a1.583 1.583 0 0 0-1.576-1.58zm.47 14.896a.474.474 0 0 1-.474.474H1.598a.474.474 0 0 1-.474-.474V5.072c0-.262.213-.475.474-.475h9.265c.261 0 .474.213.474.475v13.317z"
+            />
+            <path
+              d="M14.41 0H5.145c-.87 0-1.576.708-1.576 1.579a.55.55 0 0 0 .551.552.55.55 0 0 0 .551-.552c0-.262.213-.475.474-.475h9.265c.261 0 .474.213.474.475v13.32a.474.474 0 0 1-.474.475.55.55 0 0 0-.55.552.55.55 0 0 0 .55.553c.87 0 1.576-.708 1.576-1.58V1.58C15.986.708 15.28 0 14.41 0z"
+            />
+          </g>
+        </svg>
+      </button>
     </p>
     <h4
       className="cnt-ContributeDataList_ItemTitle"
@@ -40,12 +66,31 @@ exports[`ContributeDataList should render ContributeDataList component 1`] = `
         data-clipboard-text="0x1234eb123743c123631a1231e158123bb21b2864"
         onClick={[Function]}
         type="button"
-      />
+      >
+        <svg
+          height="20"
+          viewBox="0 0 16 20"
+          width="16"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <g
+            fill="#8CE1D7"
+            fillRule="nonzero"
+          >
+            <path
+              d="M10.867 3.493H1.602c-.87 0-1.575.707-1.575 1.579v13.32c0 .872.706 1.58 1.575 1.58h9.265c.87 0 1.576-.708 1.576-1.58V5.073a1.583 1.583 0 0 0-1.576-1.58zm.47 14.896a.474.474 0 0 1-.474.474H1.598a.474.474 0 0 1-.474-.474V5.072c0-.262.213-.475.474-.475h9.265c.261 0 .474.213.474.475v13.317z"
+            />
+            <path
+              d="M14.41 0H5.145c-.87 0-1.576.708-1.576 1.579a.55.55 0 0 0 .551.552.55.55 0 0 0 .551-.552c0-.262.213-.475.474-.475h9.265c.261 0 .474.213.474.475v13.32a.474.474 0 0 1-.474.475.55.55 0 0 0-.55.552.55.55 0 0 0 .55.553c.87 0 1.576-.708 1.576-1.58V1.58C15.986.708 15.28 0 14.41 0z"
+            />
+          </g>
+        </svg>
+      </button>
     </p>
     <h4
       className="cnt-ContributeDataList_ItemTitle"
     >
-      Crowdsale Execution ID
+      Proxy Address
     </h4>
   </div>
 </div>
diff --git a/test/components/Contribute/__snapshots__/ContributeForm.spec.js.snap b/test/components/Contribute/__snapshots__/ContributeForm.spec.js.snap
index b1a7ba8ff..fd65a46b9 100644
--- a/test/components/Contribute/__snapshots__/ContributeForm.spec.js.snap
+++ b/test/components/Contribute/__snapshots__/ContributeForm.spec.js.snap
@@ -41,7 +41,7 @@ exports[`ContributeForm Should set as disabled the contribute button if isTierSo
       dirtySinceLastSubmit={false}
       errors={
         Object {
-          "contribute": "This field is required",
+          "contribute": "You are not allowed",
         }
       }
       focus={[Function]}
@@ -110,7 +110,7 @@ exports[`ContributeForm Should set as disabled the contribute button if isTierSo
         dirtySinceLastSubmit={false}
         errors={
           Object {
-            "contribute": "This field is required",
+            "contribute": "You are not allowed",
           }
         }
         focus={[Function]}
@@ -178,7 +178,7 @@ exports[`ContributeForm Should set as disabled the contribute button if isTierSo
         web3Available={true}
       >
         <form
-          className="cnt-ContributeForm cnt-ContributeForm-full-height"
+          className="cnt-ContributeForm"
           onSubmit={[Function]}
         >
           <h3
@@ -215,7 +215,7 @@ exports[`ContributeForm Should set as disabled the contribute button if isTierSo
                     "data": Object {},
                     "dirty": false,
                     "dirtySinceLastSubmit": false,
-                    "error": "This field is required",
+                    "error": "You are not allowed",
                     "initial": undefined,
                     "invalid": true,
                     "pristine": true,
@@ -233,7 +233,6 @@ exports[`ContributeForm Should set as disabled the contribute button if isTierSo
                   className="sw-InputField2 cnt-ContributeForm_Amount"
                 >
                   <TextField
-                    autoComplete="off"
                     id="contribute"
                     name="contribute"
                     onBlur={[Function]}
@@ -243,6 +242,7 @@ exports[`ContributeForm Should set as disabled the contribute button if isTierSo
                     value=""
                   >
                     <input
+                      autoComplete="off"
                       className="sw-TextField"
                       id="contribute"
                       name="contribute"
@@ -278,7 +278,13 @@ exports[`ContributeForm Should set as disabled the contribute button if isTierSo
             >
               <div
                 className="sw-TokenDimension sw-TokenDimension-tokens "
-              />
+              >
+                <span
+                  className="sw-TokenDimension_Text sw-TokenDimension_Text-tokens"
+                >
+                  tokens
+                </span>
+              </div>
             </TokenDimension>
           </div>
           <select
@@ -303,11 +309,6 @@ exports[`ContributeForm Should set as disabled the contribute button if isTierSo
           >
             Contribute
           </button>
-          <p
-            className="cnt-ContributeForm_Description"
-          >
-            Think twice before contributing to Crowdsales. Tokens will be deposited on a wallet you used to buy tokens.
-          </p>
           <FormSpy
             onChange={[Function]}
             subscription={
@@ -325,7 +326,7 @@ exports[`ContributeForm Should set as disabled the contribute button if isTierSo
 
 exports[`ContributeForm should render ContributeForm component 1`] = `
 <form
-  className="cnt-ContributeForm cnt-ContributeForm-full-height"
+  className="cnt-ContributeForm"
   onSubmit={[Function]}
 >
   <h3
@@ -340,6 +341,7 @@ exports[`ContributeForm should render ContributeForm component 1`] = `
       className="sw-InputField2 cnt-ContributeForm_Amount"
     >
       <input
+        autoComplete="off"
         className="sw-TextField"
         id="contribute"
         name="contribute"
@@ -352,7 +354,13 @@ exports[`ContributeForm should render ContributeForm component 1`] = `
     </div>
     <div
       className="sw-TokenDimension sw-TokenDimension-tokens "
-    />
+    >
+      <span
+        className="sw-TokenDimension_Text sw-TokenDimension_Text-tokens"
+      >
+        tokens
+      </span>
+    </div>
   </div>
   <select
     className="sw_Select"
@@ -363,7 +371,7 @@ exports[`ContributeForm should render ContributeForm component 1`] = `
       disabled={false}
       value="metamask"
     >
-      Wallet
+      Wallet 
     </option>
     <option
       value="qr"
@@ -378,17 +386,12 @@ exports[`ContributeForm should render ContributeForm component 1`] = `
   >
     Contribute
   </button>
-  <p
-    className="cnt-ContributeForm_Description"
-  >
-    Think twice before contributing to Crowdsales. Tokens will be deposited on a wallet you used to buy tokens.
-  </p>
 </form>
 `;
 
 exports[`ContributeForm should render ContributeForm component and its children 1`] = `
 <form
-  className="cnt-ContributeForm cnt-ContributeForm-full-height"
+  className="cnt-ContributeForm"
   onSubmit={[Function]}
 >
   <h3
@@ -403,6 +406,7 @@ exports[`ContributeForm should render ContributeForm component and its children
       className="sw-InputField2 cnt-ContributeForm_Amount"
     >
       <input
+        autoComplete="off"
         className="sw-TextField"
         id="contribute"
         name="contribute"
@@ -415,7 +419,13 @@ exports[`ContributeForm should render ContributeForm component and its children
     </div>
     <div
       className="sw-TokenDimension sw-TokenDimension-tokens "
-    />
+    >
+      <span
+        className="sw-TokenDimension_Text sw-TokenDimension_Text-tokens"
+      >
+        tokens
+      </span>
+    </div>
   </div>
   <select
     className="sw_Select"
@@ -426,7 +436,7 @@ exports[`ContributeForm should render ContributeForm component and its children
       disabled={false}
       value="metamask"
     >
-      Wallet
+      Wallet 
     </option>
     <option
       value="qr"
@@ -441,10 +451,5 @@ exports[`ContributeForm should render ContributeForm component and its children
   >
     Contribute
   </button>
-  <p
-    className="cnt-ContributeForm_Description"
-  >
-    Think twice before contributing to Crowdsales. Tokens will be deposited on a wallet you used to buy tokens.
-  </p>
 </form>
 `;
diff --git a/test/components/Contribute/__snapshots__/CountdownTimer.spec.js.snap b/test/components/Contribute/__snapshots__/CountdownTimer.spec.js.snap
index 7f6801063..d2adcc927 100644
--- a/test/components/Contribute/__snapshots__/CountdownTimer.spec.js.snap
+++ b/test/components/Contribute/__snapshots__/CountdownTimer.spec.js.snap
@@ -53,7 +53,7 @@ exports[`CountdownTimer Should render the component 1`] = `
           <div
             className="cnt-CountdownTimer_TimeCount"
           >
-            4
+            04
           </div>
           <div
             className="cnt-CountdownTimer_TimeInterval"
@@ -139,7 +139,7 @@ exports[`CountdownTimer Should render the component showing only the seconds 1`]
           <div
             className="cnt-CountdownTimer_TimeCount"
           >
-            4
+            04
           </div>
           <div
             className="cnt-CountdownTimer_TimeInterval"
@@ -225,7 +225,7 @@ exports[`CountdownTimer Should render the component showing the time until the e
           <div
             className="cnt-CountdownTimer_TimeCount"
           >
-            4
+            04
           </div>
           <div
             className="cnt-CountdownTimer_TimeInterval"
@@ -311,7 +311,7 @@ exports[`CountdownTimer Should render the component when the crowdsale ended 1`]
           <div
             className="cnt-CountdownTimer_TimeCount"
           >
-            4
+            04
           </div>
           <div
             className="cnt-CountdownTimer_TimeInterval"
@@ -374,147 +374,10 @@ exports[`CountdownTimer Should render the component when the crowdsale was final
     <div
       className="cnt-CountdownTimer_TimeContainer"
     >
-      <div
-        className="cnt-CountdownTimer_Time"
-      >
-        <div
-          className="cnt-CountdownTimer_TimeItem"
-        >
-          <div
-            className="cnt-CountdownTimer_TimeCount"
-          >
-            1
-          </div>
-          <div
-            className="cnt-CountdownTimer_TimeInterval"
-          >
-            Days
-          </div>
-        </div>
-        <div
-          className="cnt-CountdownTimer_TimeItem cnt-CountdownTimer_TimeItem-blinking"
-        >
-          <div
-            className="cnt-CountdownTimer_TimeCount"
-          >
-            4
-          </div>
-          <div
-            className="cnt-CountdownTimer_TimeInterval"
-          >
-            Hours
-          </div>
-        </div>
-        <div
-          className="cnt-CountdownTimer_TimeItem"
-        >
-          <div
-            className="cnt-CountdownTimer_TimeCount"
-          >
-            45
-          </div>
-          <div
-            className="cnt-CountdownTimer_TimeInterval"
-          >
-            Mins
-          </div>
-        </div>
-      </div>
       <div
         className="cnt-CountdownTimer_Message"
       >
-        Crowdsale has ended
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`CountdownTimer Should render the component with alternative message 1`] = `
-<div
-  className="cnt-CountdownTimer"
->
-  <div
-    className="cnt-CountdownTimer_ReactCountdownClock"
-  >
-    <Circle
-      animate={true}
-      animationDuration="1s"
-      bgColor="#5a2da5"
-      lineWidth="50"
-      percentSpacing={10}
-      progress={0}
-      progressColor="#a971f9"
-      responsive={false}
-      roundedStroke={false}
-      showPercentage={false}
-      showPercentageSymbol={true}
-      size="250"
-      textColor="#6b778c"
-      textStyle={
-        Object {
-          "font": "bold 4rem Helvetica, Arial, sans-serif",
-        }
-      }
-    />
-    <div
-      className="cnt-CountdownTimer_TimeContainer"
-    >
-      <div
-        className="cnt-CountdownTimer_Time"
-      >
-        <div
-          className="cnt-CountdownTimer_TimeItem"
-        >
-          <div
-            className="cnt-CountdownTimer_TimeCount"
-          >
-            1
-          </div>
-          <div
-            className="cnt-CountdownTimer_TimeInterval"
-          >
-            Days
-          </div>
-        </div>
-        <div
-          className="cnt-CountdownTimer_TimeItem cnt-CountdownTimer_TimeItem-blinking"
-        >
-          <div
-            className="cnt-CountdownTimer_TimeCount"
-          >
-            4
-          </div>
-          <div
-            className="cnt-CountdownTimer_TimeInterval"
-          >
-            Hours
-          </div>
-        </div>
-        <div
-          className="cnt-CountdownTimer_TimeItem"
-        >
-          <div
-            className="cnt-CountdownTimer_TimeCount"
-          >
-            45
-          </div>
-          <div
-            className="cnt-CountdownTimer_TimeInterval"
-          >
-            Mins
-          </div>
-        </div>
-      </div>
-      <div
-        className="cnt-CountdownTimer_Message"
-      >
-        To start of tier 1 of 2
-      </div>
-      <div
-        className="cnt-CountdownTimer_AltMessage"
-      >
-        Alternative Message
+        crowdsale has been finalized
       </div>
     </div>
   </div>
diff --git a/test/components/Contribute/__snapshots__/QRPaymentProcess.spec.js.snap b/test/components/Contribute/__snapshots__/QRPaymentProcess.spec.js.snap
index 5e00f1466..ef5e3632b 100644
--- a/test/components/Contribute/__snapshots__/QRPaymentProcess.spec.js.snap
+++ b/test/components/Contribute/__snapshots__/QRPaymentProcess.spec.js.snap
@@ -32,7 +32,26 @@ exports[`QRPaymentProcess should render QRPaymentProcess component 1`] = `
       data-clipboard-text="0xcbf4eb5e9743c335631afe21e158bf1bb21b2864"
       onClick={[Function]}
       type="button"
-    />
+    >
+      <svg
+        height="20"
+        viewBox="0 0 16 20"
+        width="16"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <g
+          fill="#8CE1D7"
+          fillRule="nonzero"
+        >
+          <path
+            d="M10.867 3.493H1.602c-.87 0-1.575.707-1.575 1.579v13.32c0 .872.706 1.58 1.575 1.58h9.265c.87 0 1.576-.708 1.576-1.58V5.073a1.583 1.583 0 0 0-1.576-1.58zm.47 14.896a.474.474 0 0 1-.474.474H1.598a.474.474 0 0 1-.474-.474V5.072c0-.262.213-.475.474-.475h9.265c.261 0 .474.213.474.475v13.317z"
+          />
+          <path
+            d="M14.41 0H5.145c-.87 0-1.576.708-1.576 1.579a.55.55 0 0 0 .551.552.55.55 0 0 0 .551-.552c0-.262.213-.475.474-.475h9.265c.261 0 .474.213.474.475v13.32a.474.474 0 0 1-.474.475.55.55 0 0 0-.55.552.55.55 0 0 0 .55.553c.87 0 1.576-.708 1.576-1.58V1.58C15.986.708 15.28 0 14.41 0z"
+          />
+        </g>
+      </svg>
+    </button>
   </div>
   <div
     className="cnt-QRPaymentProcess_Note"
@@ -45,11 +64,46 @@ exports[`QRPaymentProcess should render QRPaymentProcess component 1`] = `
     <p
       className="cnt-QRPaymentProcess_NoteDescription"
     >
-      Send ethers to the Auth-os 
+      Send ethers to the crowdsale 
       RegistryExec
-       smart-contract address with a MethodID: 
-      0x55f8650100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000004a6f2ae3a00000000000000000000000000000000000000000000000000000000
+       address with a data:
+       
     </p>
+    <div
+      className="cnt-QRPaymentProcess_txDataContainer"
+    >
+      <span
+        className="cnt-QRPaymentProcess_txData"
+      >
+        0x55f8650100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000004a6f2ae3a00000000000000000000000000000000000000000000000000000000
+      </span>
+      <button
+        className="sw-ButtonCopyToClipboard "
+        data-clipboard-action="copy"
+        data-clipboard-text="0x55f8650100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000004a6f2ae3a00000000000000000000000000000000000000000000000000000000"
+        onClick={[Function]}
+        type="button"
+      >
+        <svg
+          height="20"
+          viewBox="0 0 16 20"
+          width="16"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <g
+            fill="#270167"
+            fillRule="nonzero"
+          >
+            <path
+              d="M10.867 3.493H1.602c-.87 0-1.575.707-1.575 1.579v13.32c0 .872.706 1.58 1.575 1.58h9.265c.87 0 1.576-.708 1.576-1.58V5.073a1.583 1.583 0 0 0-1.576-1.58zm.47 14.896a.474.474 0 0 1-.474.474H1.598a.474.474 0 0 1-.474-.474V5.072c0-.262.213-.475.474-.475h9.265c.261 0 .474.213.474.475v13.317z"
+            />
+            <path
+              d="M14.41 0H5.145c-.87 0-1.576.708-1.576 1.579a.55.55 0 0 0 .551.552.55.55 0 0 0 .551-.552c0-.262.213-.475.474-.475h9.265c.261 0 .474.213.474.475v13.32a.474.474 0 0 1-.474.475.55.55 0 0 0-.55.552.55.55 0 0 0 .55.553c.87 0 1.576-.708 1.576-1.58V1.58C15.986.708 15.28 0 14.41 0z"
+            />
+          </g>
+        </svg>
+      </button>
+    </div>
   </div>
 </div>
 `;
diff --git a/test/components/Contribute/__snapshots__/index.spec.js.snap b/test/components/Contribute/__snapshots__/index.spec.js.snap
index 689238303..c0995cd6c 100644
--- a/test/components/Contribute/__snapshots__/index.spec.js.snap
+++ b/test/components/Contribute/__snapshots__/index.spec.js.snap
@@ -285,7 +285,7 @@ exports[`Contribute should render Contribute component 1`] = `
             </p>
           </div>
           <form
-            className="cnt-ContributeForm "
+            className="cnt-ContributeForm"
             onSubmit={[Function]}
           >
             <h3
@@ -300,6 +300,7 @@ exports[`Contribute should render Contribute component 1`] = `
                 className="sw-InputField2 cnt-ContributeForm_Amount"
               >
                 <input
+                  autoComplete="off"
                   className="sw-TextField"
                   id="contribute"
                   name="contribute"
@@ -312,7 +313,13 @@ exports[`Contribute should render Contribute component 1`] = `
               </div>
               <div
                 className="sw-TokenDimension sw-TokenDimension-tokens "
-              />
+              >
+                <span
+                  className="sw-TokenDimension_Text sw-TokenDimension_Text-tokens"
+                >
+                  tokens
+                </span>
+              </div>
             </div>
             <select
               className="sw_Select"
@@ -333,6 +340,11 @@ exports[`Contribute should render Contribute component 1`] = `
               </option>
             </select>
           </form>
+          <p
+            className="cnt-Contribute_Warning"
+          >
+            Think twice before contributing to crowdsales. Tokens will be deposited on a wallet you used to buy tokens.
+          </p>
         </div>
       </div>
       <div
diff --git a/test/components/Crowdsale/__snapshots__/CrowdsaleID.spec.js.snap b/test/components/Crowdsale/__snapshots__/CrowdsaleID.spec.js.snap
index 5bec03568..051375956 100644
--- a/test/components/Crowdsale/__snapshots__/CrowdsaleID.spec.js.snap
+++ b/test/components/Crowdsale/__snapshots__/CrowdsaleID.spec.js.snap
@@ -19,7 +19,26 @@ exports[`CrowdsaleID should render CrowdsaleID component 1`] = `
         data-clipboard-action="copy"
         onClick={[Function]}
         type="button"
-      />
+      >
+        <svg
+          height="20"
+          viewBox="0 0 16 20"
+          width="16"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <g
+            fill="#8CE1D7"
+            fillRule="nonzero"
+          >
+            <path
+              d="M10.867 3.493H1.602c-.87 0-1.575.707-1.575 1.579v13.32c0 .872.706 1.58 1.575 1.58h9.265c.87 0 1.576-.708 1.576-1.58V5.073a1.583 1.583 0 0 0-1.576-1.58zm.47 14.896a.474.474 0 0 1-.474.474H1.598a.474.474 0 0 1-.474-.474V5.072c0-.262.213-.475.474-.475h9.265c.261 0 .474.213.474.475v13.317z"
+            />
+            <path
+              d="M14.41 0H5.145c-.87 0-1.576.708-1.576 1.579a.55.55 0 0 0 .551.552.55.55 0 0 0 .551-.552c0-.262.213-.475.474-.475h9.265c.261 0 .474.213.474.475v13.32a.474.474 0 0 1-.474.475.55.55 0 0 0-.55.552.55.55 0 0 0 .55.553c.87 0 1.576-.708 1.576-1.58V1.58C15.986.708 15.28 0 14.41 0z"
+            />
+          </g>
+        </svg>
+      </button>
     </h3>
     <p
       className="cs-CrowdsaleID_Description"
diff --git a/test/components/Crowdsale/__snapshots__/index.spec.js.snap b/test/components/Crowdsale/__snapshots__/index.spec.js.snap
new file mode 100644
index 000000000..3694cfe65
--- /dev/null
+++ b/test/components/Crowdsale/__snapshots__/index.spec.js.snap
@@ -0,0 +1,302 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Crowdsale index should render Crowdsale 1`] = `
+<div>
+  <section
+    className="lo-MenuBarAndContent"
+  >
+    <div
+      className="st-StepNavigation"
+    >
+      <a
+        className="sw-LogoWhite"
+        href="/"
+      />
+      <div
+        className="st-StepNavigation_Container"
+      >
+        <div
+          className="st-StepItem
+        active  "
+        >
+          <div
+            className="st-StepItem_Circle"
+          />
+          <div
+            className="st-StepItem_Line"
+          />
+          <span
+            className="st-StepItem_Text"
+          >
+            Crowdsale Strategy
+          </span>
+        </div>
+        <div
+          className="st-StepItem
+        active  "
+        >
+          <div
+            className="st-StepItem_Circle"
+          />
+          <div
+            className="st-StepItem_Line"
+          />
+          <span
+            className="st-StepItem_Text"
+          >
+            Token Setup
+          </span>
+        </div>
+        <div
+          className="st-StepItem
+        active  "
+        >
+          <div
+            className="st-StepItem_Circle"
+          />
+          <div
+            className="st-StepItem_Line"
+          />
+          <span
+            className="st-StepItem_Text"
+          >
+            Crowdsale Setup
+          </span>
+        </div>
+        <div
+          className="st-StepItem
+        active  "
+        >
+          <div
+            className="st-StepItem_Circle"
+          />
+          <div
+            className="st-StepItem_Line"
+          />
+          <span
+            className="st-StepItem_Text"
+          >
+            Publish
+          </span>
+        </div>
+        <div
+          className="st-StepItem
+        active  "
+        >
+          <div
+            className="st-StepItem_Circle"
+          />
+          <span
+            className="st-StepItem_Text"
+          >
+            Crowdsale Page
+          </span>
+        </div>
+      </div>
+    </div>
+    <div
+      className="st-StepContent"
+    >
+      <div
+        className="st-SectionInfo "
+      >
+        <div
+          className="st-SectionInfo_Icon st-SectionInfo_Icon-step5"
+        />
+        <div
+          className="st-SectionInfo_Text"
+        >
+          <h1
+            className="st-SectionInfo_Title"
+          >
+            Crowdsale Page
+          </h1>
+          <p
+            className="st-SectionInfo_Description"
+            dangerouslySetInnerHTML={
+              Object {
+                "__html": "Page with statistics of crowdsale. Statistics for all tiers combined on the page. Please press Ctrl-D to bookmark the page.",
+              }
+            }
+          />
+        </div>
+      </div>
+      <div
+        className="cs-CrowdsaleProgress "
+      >
+        <div
+          className="cs-CrowdsaleProgress_Funds"
+        >
+          <div
+            className="cs-CrowdsaleProgress_FundsAmount cs-CrowdsaleProgress_FundsAmount-total-raised"
+          >
+            <h2
+              className="cs-CrowdsaleProgress_FundsTitle"
+            >
+              0
+               
+              <span
+                className="cs-CrowdsaleProgress_NoBreak"
+              >
+                ETH
+              </span>
+            </h2>
+            <p
+              className="cs-CrowdsaleProgress_FundsDescription"
+            >
+              Total Raised Funds
+            </p>
+          </div>
+          <div
+            className="cs-CrowdsaleProgress_FundsAmount cs-CrowdsaleProgress_FundsAmount-goal"
+          >
+            <h2
+              className="cs-CrowdsaleProgress_FundsTitle"
+            >
+              0
+               
+              <span
+                className="cs-CrowdsaleProgress_NoBreak"
+              >
+                ETH
+              </span>
+            </h2>
+            <p
+              className="cs-CrowdsaleProgress_FundsDescription"
+            >
+              Goal
+            </p>
+          </div>
+        </div>
+        <div
+          className="cs-CrowdsaleProgress_Bar"
+        >
+          <div
+            className="cs-CrowdsaleProgress_BarWidth"
+            style={
+              Object {
+                "width": "0%",
+              }
+            }
+          />
+          <div
+            className="cs-CrowdsaleProgress_Division"
+          />
+          <div
+            className="cs-CrowdsaleProgress_Division"
+          />
+          <div
+            className="cs-CrowdsaleProgress_Division"
+          />
+          <div
+            className="cs-CrowdsaleProgress_Division"
+          />
+          <div
+            className="cs-CrowdsaleProgress_Division"
+          />
+          <div
+            className="cs-CrowdsaleProgress_Division"
+          />
+          <div
+            className="cs-CrowdsaleProgress_Division"
+          />
+          <div
+            className="cs-CrowdsaleProgress_Division"
+          />
+          <div
+            className="cs-CrowdsaleProgress_Division"
+          />
+        </div>
+      </div>
+      <div
+        className="cs-CrowdsaleID "
+      >
+        <div
+          className="cs-CrowdsaleID_InnerContainer"
+        >
+          <h3
+            className="cs-CrowdsaleID_Hash"
+          >
+            <span
+              className="cs-CrowdsaleID_HashText"
+            />
+             
+            <button
+              className="sw-ButtonCopyToClipboard "
+              data-clipboard-action="copy"
+              onClick={[Function]}
+              type="button"
+            >
+              <svg
+                height="20"
+                viewBox="0 0 16 20"
+                width="16"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <g
+                  fill="#8CE1D7"
+                  fillRule="nonzero"
+                >
+                  <path
+                    d="M10.867 3.493H1.602c-.87 0-1.575.707-1.575 1.579v13.32c0 .872.706 1.58 1.575 1.58h9.265c.87 0 1.576-.708 1.576-1.58V5.073a1.583 1.583 0 0 0-1.576-1.58zm.47 14.896a.474.474 0 0 1-.474.474H1.598a.474.474 0 0 1-.474-.474V5.072c0-.262.213-.475.474-.475h9.265c.261 0 .474.213.474.475v13.317z"
+                  />
+                  <path
+                    d="M14.41 0H5.145c-.87 0-1.576.708-1.576 1.579a.55.55 0 0 0 .551.552.55.55 0 0 0 .551-.552c0-.262.213-.475.474-.475h9.265c.261 0 .474.213.474.475v13.32a.474.474 0 0 1-.474.475.55.55 0 0 0-.55.552.55.55 0 0 0 .55.553c.87 0 1.576-.708 1.576-1.58V1.58C15.986.708 15.28 0 14.41 0z"
+                  />
+                </g>
+              </svg>
+            </button>
+          </h3>
+          <p
+            className="cs-CrowdsaleID_Description"
+          >
+            Crowdsale Proxy Address
+          </p>
+        </div>
+      </div>
+      <div
+        className="st-StepContent_Buttons"
+      >
+        <button
+          className="sw-ButtonContinue "
+          disabled={false}
+          onClick={[Function]}
+          type="button"
+        >
+          <span
+            className="sw-ButtonContinue_Text"
+          >
+            Contribute
+          </span>
+        </button>
+      </div>
+    </div>
+  </section>
+  <div
+    className="sw-FullscreenBackdrop"
+  >
+    <div
+      className="sw-Loader"
+    >
+      <div
+        className="sw-Loader_AnimatedItem"
+      />
+      <div
+        className="sw-Loader_AnimatedItem"
+      />
+      <div
+        className="sw-Loader_AnimatedItem"
+      />
+      <div
+        className="sw-Loader_AnimatedItem"
+      />
+      <div
+        className="sw-Loader_AnimatedItem"
+      />
+      <div
+        className="sw-Loader_AnimatedItem"
+      />
+    </div>
+  </div>
+</div>
+`;
diff --git a/test/components/Crowdsale/index.spec.js b/test/components/Crowdsale/index.spec.js
new file mode 100644
index 000000000..a73923252
--- /dev/null
+++ b/test/components/Crowdsale/index.spec.js
@@ -0,0 +1,39 @@
+import React from 'react'
+import Adapter from 'enzyme-adapter-react-15'
+import { Provider } from 'mobx-react'
+import { configure } from 'enzyme'
+import renderer from 'react-test-renderer'
+import { MemoryRouter } from 'react-router'
+import {
+  contractStore,
+  crowdsaleStore,
+  crowdsalePageStore,
+  web3Store,
+  tierStore,
+  tokenStore,
+  generalStore
+} from '../../../src/stores'
+import { Crowdsale } from '../../../src/components/Crowdsale'
+
+configure({ adapter: new Adapter() })
+
+describe('Crowdsale index', () => {
+  const stores = { contractStore, crowdsaleStore, crowdsalePageStore, web3Store, tierStore, tokenStore, generalStore }
+
+  it(`should render Crowdsale`, () => {
+    // Given
+    const component = renderer.create(
+      <Provider {...stores}>
+        <MemoryRouter initialEntries={['/crowdsale']}>
+          <Crowdsale />
+        </MemoryRouter>
+      </Provider>
+    )
+
+    // When
+    const tree = component.toJSON()
+
+    // Then
+    expect(tree).toMatchSnapshot()
+  })
+})
diff --git a/test/components/Crowdsales/CrowdsalesList.spec.js b/test/components/Crowdsales/CrowdsalesList.spec.js
index 915752ec1..12894cb80 100644
--- a/test/components/Crowdsales/CrowdsalesList.spec.js
+++ b/test/components/Crowdsales/CrowdsalesList.spec.js
@@ -1,10 +1,12 @@
 import React from 'react'
 import CrowdsalesList from '../../../src/components/Crowdsales/CrowdsalesList'
 import Adapter from 'enzyme-adapter-react-15'
-import { configure, mount } from 'enzyme'
+import { configure, mount, shallow } from 'enzyme'
 import CrowdsaleStore from '../../../src/stores/CrowdsaleStore'
 import Web3Store from '../../../src/stores/Web3Store'
 import Web3 from 'web3'
+import { generalStore } from '../../../src/stores'
+import { GAS_PRICE } from '../../../src/utils/constants'
 
 configure({ adapter: new Adapter() })
 
@@ -13,6 +15,9 @@ const accounts = ['0xcCca436070962a1A884b88E8506C2C750E342BEA', '0x9726cdb823589
 
 describe('CrowdsaleList ', () => {
   const crowdsaleStore = new CrowdsaleStore()
+  const web3Store = new Web3Store()
+
+  let wrapper
   let crowdsales = []
   crowdsales.push(new Crowdsale())
   crowdsales.push(new Crowdsale())
@@ -20,46 +25,46 @@ describe('CrowdsaleList ', () => {
   crowdsales[1].execID = accounts[1]
   crowdsaleStore.setCrowdsales(crowdsales)
 
-  const web3Store = new Web3Store()
-  web3Store.web3 = new Web3(new Web3.providers.HttpProvider('https://sokol.poa.network'))
+  beforeEach(() => {
+    web3Store.web3 = new Web3(new Web3.providers.HttpProvider('https://sokol.poa.network'))
+
+    wrapper = mount(
+      <CrowdsalesList web3Store={web3Store} crowdsales={crowdsaleStore.crowdsales} crowdsaleStore={crowdsaleStore} />
+    )
+  })
 
-  const wrapper = mount(
-    <CrowdsalesList web3Store={web3Store} crowdsales={crowdsaleStore.crowdsales} crowdsaleStore={crowdsaleStore} />
-  )
   it(`should render CrowdsaleList component`, () => {
     expect(wrapper).toMatchSnapshot()
   })
+
   it(`should render correct number of crowdsales`, () => {
+    const wrapper = shallow(
+      <CrowdsalesList web3Store={web3Store} crowdsales={crowdsaleStore.crowdsales} crowdsaleStore={crowdsaleStore} />
+    )
+
     expect(
       wrapper
         .find('[className="sw-FlexTable_Td"]')
         .at(0)
         .text()
-    ).toBe('Address')
+    ).toBe('')
     expect(
       wrapper
         .find('[className="sw-FlexTable_Td"]')
         .at(1)
         .text()
-    ).toBe(crowdsales[0].execID)
+    ).toBe('')
     expect(
       wrapper
         .find('[className="sw-FlexTable_Td"]')
         .at(2)
         .text()
-    ).toBe(crowdsales[1].execID)
+    ).toBe('')
   })
   it(`button'Continue' should be disabled if nothing selected `, () => {
     expect(wrapper.find('[className="button button_disabled"]')).toBeDefined()
   })
 
-  it(`button'Continue' should be enabled if crowdsale selected `, () => {
-    wrapper
-      .find('[className="sw-FlexTable_Td"]')
-      .at(1)
-      .simulate('click')
-    expect(wrapper.find('[className="button button_fill"]')).toBeDefined()
-  })
   it(`should render if list is empty  `, () => {
     const crowdsaleStore = new CrowdsaleStore()
     const wrapper = mount(
diff --git a/test/components/Common/__snapshots__/CrowdsalesList.spec.js.snap b/test/components/Crowdsales/__snapshots__/CrowdsalesList.spec.js.snap
similarity index 95%
rename from test/components/Common/__snapshots__/CrowdsalesList.spec.js.snap
rename to test/components/Crowdsales/__snapshots__/CrowdsalesList.spec.js.snap
index 7fb819e5b..8f9c7a598 100644
--- a/test/components/Common/__snapshots__/CrowdsalesList.spec.js.snap
+++ b/test/components/Crowdsales/__snapshots__/CrowdsalesList.spec.js.snap
@@ -1181,50 +1181,78 @@ exports[`CrowdsaleList  should render CrowdsaleList component 1`] = `
       }
     }
   >
-    <div>
+    <div
+      className="mng-CrowdsalesList"
+    >
+      <h2
+        className="mng-CrowdsalesList_Title"
+      >
+        Select Address
+      </h2>
       <div
-        className="sw-FlexTable"
+        className="mng-CrowdsalesList_Container"
       >
-        <div
-          className="sw-FlexTable_Head sw-FlexTable_Row"
+        <label
+          className="mng-CrowdsalesList_Item"
+          key="0"
+          onClick={[Function]}
         >
-          <div
-            className="sw-FlexTable_Td"
+          <input
+            checked={false}
+            className="mng-CrowdsalesList_InputRadio"
+            name="crowdsaleItem"
+            type="radio"
+            value="0"
+          />
+          <span
+            className="mng-CrowdsalesList_ItemContent"
           >
-            Address
-          </div>
-        </div>
-        <div
-          className="sw-FlexTable_Body sw-FlexTable_Body-scrollable sw-FlexTable_Body-crowdsale m-b-15"
-        >
-          <div
-            className="sw-FlexTable_Row sw-FlexTable_Row-selectable
-                "
-            key="0"
-            onClick={[Function]}
-          >
-            <div
-              className="sw-FlexTable_Td"
+            <span
+              className="mng-CrowdsalesList_ItemContentText"
             >
-              0xcCca436070962a1A884b88E8506C2C750E342BEA
-            </div>
-          </div>
-          <div
-            className="sw-FlexTable_Row sw-FlexTable_Row-selectable
-                "
-            key="1"
-            onClick={[Function]}
+              <span
+                className="mng-CrowdsalesList_ItemDescription"
+              >
+                0xcCca436070962a1A884b88E8506C2C750E342BEA
+              </span>
+            </span>
+            <span
+              className="mng-CrowdsalesList_Radio"
+            />
+          </span>
+        </label>
+        <label
+          className="mng-CrowdsalesList_Item"
+          key="1"
+          onClick={[Function]}
+        >
+          <input
+            checked={false}
+            className="mng-CrowdsalesList_InputRadio"
+            name="crowdsaleItem"
+            type="radio"
+            value="1"
+          />
+          <span
+            className="mng-CrowdsalesList_ItemContent"
           >
-            <div
-              className="sw-FlexTable_Td"
+            <span
+              className="mng-CrowdsalesList_ItemContentText"
             >
-              0x9726cdb82358972b7a17260e7897C8de02d584e6
-            </div>
-          </div>
-        </div>
+              <span
+                className="mng-CrowdsalesList_ItemDescription"
+              >
+                0x9726cdb82358972b7a17260e7897C8de02d584e6
+              </span>
+            </span>
+            <span
+              className="mng-CrowdsalesList_Radio"
+            />
+          </span>
+        </label>
       </div>
       <div
-        className="sw-ModalWindow_ButtonsContainer sw-ModalWindow_ButtonsContainer-right"
+        className="st-StepContent_Buttons"
       >
         <ButtonContinue
           disabled={true}
@@ -2358,50 +2386,78 @@ exports[`CrowdsaleList  should render if list is empty   1`] = `
       }
     }
   >
-    <div>
+    <div
+      className="mng-CrowdsalesList"
+    >
+      <h2
+        className="mng-CrowdsalesList_Title"
+      >
+        Select Address
+      </h2>
       <div
-        className="sw-FlexTable"
+        className="mng-CrowdsalesList_Container"
       >
-        <div
-          className="sw-FlexTable_Head sw-FlexTable_Row"
+        <label
+          className="mng-CrowdsalesList_Item"
+          key="0"
+          onClick={[Function]}
         >
-          <div
-            className="sw-FlexTable_Td"
+          <input
+            checked={false}
+            className="mng-CrowdsalesList_InputRadio"
+            name="crowdsaleItem"
+            type="radio"
+            value="0"
+          />
+          <span
+            className="mng-CrowdsalesList_ItemContent"
           >
-            Address
-          </div>
-        </div>
-        <div
-          className="sw-FlexTable_Body sw-FlexTable_Body-scrollable sw-FlexTable_Body-crowdsale m-b-15"
-        >
-          <div
-            className="sw-FlexTable_Row sw-FlexTable_Row-selectable
-                "
-            key="0"
-            onClick={[Function]}
-          >
-            <div
-              className="sw-FlexTable_Td"
+            <span
+              className="mng-CrowdsalesList_ItemContentText"
             >
-              0xcCca436070962a1A884b88E8506C2C750E342BEA
-            </div>
-          </div>
-          <div
-            className="sw-FlexTable_Row sw-FlexTable_Row-selectable
-                "
-            key="1"
-            onClick={[Function]}
+              <span
+                className="mng-CrowdsalesList_ItemDescription"
+              >
+                0xcCca436070962a1A884b88E8506C2C750E342BEA
+              </span>
+            </span>
+            <span
+              className="mng-CrowdsalesList_Radio"
+            />
+          </span>
+        </label>
+        <label
+          className="mng-CrowdsalesList_Item"
+          key="1"
+          onClick={[Function]}
+        >
+          <input
+            checked={false}
+            className="mng-CrowdsalesList_InputRadio"
+            name="crowdsaleItem"
+            type="radio"
+            value="1"
+          />
+          <span
+            className="mng-CrowdsalesList_ItemContent"
           >
-            <div
-              className="sw-FlexTable_Td"
+            <span
+              className="mng-CrowdsalesList_ItemContentText"
             >
-              0x9726cdb82358972b7a17260e7897C8de02d584e6
-            </div>
-          </div>
-        </div>
+              <span
+                className="mng-CrowdsalesList_ItemDescription"
+              >
+                0x9726cdb82358972b7a17260e7897C8de02d584e6
+              </span>
+            </span>
+            <span
+              className="mng-CrowdsalesList_Radio"
+            />
+          </span>
+        </label>
       </div>
       <div
-        className="sw-ModalWindow_ButtonsContainer sw-ModalWindow_ButtonsContainer-right"
+        className="st-StepContent_Buttons"
       >
         <ButtonContinue
           disabled={true}
diff --git a/test/components/Crowdsales/__snapshots__/index.spec.js.snap b/test/components/Crowdsales/__snapshots__/index.spec.js.snap
index f8249ce3c..57b26aec1 100644
--- a/test/components/Crowdsales/__snapshots__/index.spec.js.snap
+++ b/test/components/Crowdsales/__snapshots__/index.spec.js.snap
@@ -2,40 +2,107 @@
 
 exports[`Crowdsales should render screen  1`] = `
 <div>
-  <div>
+  <section
+    className="lo-MenuBarAndContent"
+  >
     <div
-      className="sw-FlexTable"
+      className="mng-ManageNavigation"
     >
+      <a
+        className="sw-LogoWhite"
+        href="/"
+      />
       <div
-        className="sw-FlexTable_Head sw-FlexTable_Row"
+        className="mng-ManageNavigation_Container"
       >
         <div
-          className="sw-FlexTable_Td"
+          className="st-StepItem
+        active  "
+        >
+          <div
+            className="st-StepItem_Circle"
+          />
+          <div
+            className="st-StepItem_Line"
+          />
+          <span
+            className="st-StepItem_Text"
+          >
+            Crowdsale List
+          </span>
+        </div>
+        <div
+          className="st-StepItem
+          "
         >
-          Address
+          <div
+            className="st-StepItem_Circle"
+          />
+          <span
+            className="st-StepItem_Text"
+          >
+            Manage Crowdsale
+          </span>
         </div>
       </div>
-      <div
-        className="sw-FlexTable_Body sw-FlexTable_Body-scrollable sw-FlexTable_Body-crowdsale m-b-15"
-      />
     </div>
     <div
-      className="sw-ModalWindow_ButtonsContainer sw-ModalWindow_ButtonsContainer-right"
+      className="st-StepContent"
     >
-      <button
-        className="sw-ButtonContinue "
-        disabled={true}
-        onClick={[Function]}
-        type="button"
+      <div
+        className="st-SectionInfo "
       >
-        <span
-          className="sw-ButtonContinue_Text"
+        <div
+          className="st-SectionInfo_Icon st-SectionInfo_Icon-step0"
+        />
+        <div
+          className="st-SectionInfo_Text"
         >
-          Continue
-        </span>
-      </button>
+          <h1
+            className="st-SectionInfo_Title"
+          >
+            Crowdsale List
+          </h1>
+          <p
+            className="st-SectionInfo_Description"
+            dangerouslySetInnerHTML={
+              Object {
+                "__html": "The list of your updatable crowdsales. Choose crowdsale address, click Continue and you’ll be able to update the parameters of crowdsale.",
+              }
+            }
+          />
+        </div>
+      </div>
+      <div
+        className="mng-CrowdsalesList"
+      >
+        <h2
+          className="mng-CrowdsalesList_Title"
+        >
+          Select Address
+        </h2>
+        <div
+          className="mng-CrowdsalesList_Container"
+        />
+        <div
+          className="st-StepContent_Buttons"
+        >
+          <button
+            className="sw-ButtonContinue "
+            disabled={true}
+            onClick={[Function]}
+            type="button"
+          >
+            <span
+              className="sw-ButtonContinue_Text"
+            >
+              Continue
+            </span>
+          </button>
+        </div>
+      </div>
     </div>
-  </div>
+  </section>
   <div
     className="sw-FullscreenBackdrop"
   >
diff --git a/test/components/Home/utils.spec.js b/test/components/Home/utils.spec.js
new file mode 100644
index 000000000..81b99b3a0
--- /dev/null
+++ b/test/components/Home/utils.spec.js
@@ -0,0 +1,31 @@
+import React from 'react'
+import Adapter from 'enzyme-adapter-react-15'
+import { configure } from 'enzyme'
+import { reloadStorage } from '../../../src/components/Home/utils'
+import { generalStore, contractStore } from '../../../src/stores/index'
+
+configure({ adapter: new Adapter() })
+
+describe('Home utils', () => {
+  const data = {
+    generalStore: generalStore,
+    contractStore: contractStore
+  }
+
+  it('Test reloadStorage with data', async () => {
+    const result = async () => await reloadStorage(data)
+    expect(result).toBeTruthy()
+  })
+
+  it('Test reloadStorage with empty data', async () => {
+    expect(reloadStorage({})).rejects.toEqual(new Error('There is no stores to set'))
+  })
+
+  it('Test reloadStorage with only generalStore', async () => {
+    expect(reloadStorage({ generalStore: generalStore })).rejects.toEqual(new Error('There is no stores to set'))
+  })
+
+  it('Test reloadStorage with only contractStore', async () => {
+    expect(reloadStorage({ contractStore: contractStore })).rejects.toEqual(new Error('There is no stores to set'))
+  })
+})
diff --git a/test/components/manage/FinalizeCrowdsaleStep.spec.js b/test/components/Manage/FinalizeCrowdsaleStep.spec.js
similarity index 53%
rename from test/components/manage/FinalizeCrowdsaleStep.spec.js
rename to test/components/Manage/FinalizeCrowdsaleStep.spec.js
index 6a00111e8..f2e36f53e 100644
--- a/test/components/manage/FinalizeCrowdsaleStep.spec.js
+++ b/test/components/Manage/FinalizeCrowdsaleStep.spec.js
@@ -1,6 +1,6 @@
 import React from 'react'
 import { StaticRouter } from 'react-router'
-import { FinalizeCrowdsaleStep } from '../../../src/components/manage/FinalizeCrowdsaleStep'
+import { FinalizeCrowdsaleStep } from '../../../src/components/Manage/FinalizeCrowdsaleStep'
 import renderer from 'react-test-renderer'
 import Adapter from 'enzyme-adapter-react-15'
 import { configure, mount } from 'enzyme'
@@ -41,42 +41,4 @@ describe('FinalizeCrowdsaleStep', () => {
         .toJSON()
     ).toMatchSnapshot()
   })
-
-  it('should call handleClick', () => {
-    const finalizeCrowdsaleStateParams = {
-      disabled: false,
-      handleClick: jest.fn()
-    }
-
-    const wrapper = mount(
-      <StaticRouter location="testLocation" context={{}}>
-        <FinalizeCrowdsaleStep {...finalizeCrowdsaleStateParams} />
-      </StaticRouter>
-    )
-
-    const button = wrapper.find('Link').at(0)
-
-    button.simulate('click')
-
-    expect(finalizeCrowdsaleStateParams.handleClick).toHaveBeenCalled()
-  })
-
-  it('should not call handleClick', () => {
-    const finalizeCrowdsaleStateParams = {
-      disabled: true,
-      handleClick: jest.fn()
-    }
-
-    const wrapper = mount(
-      <StaticRouter location="testLocation" context={{}}>
-        <FinalizeCrowdsaleStep {...finalizeCrowdsaleStateParams} />
-      </StaticRouter>
-    )
-
-    const button = wrapper.find('Link').at(0)
-
-    button.simulate('click')
-
-    expect(finalizeCrowdsaleStateParams.handleClick).toHaveBeenCalledTimes(0)
-  })
 })
diff --git a/test/components/manage/ManageForm.spec.js b/test/components/Manage/ManageForm.spec.js
similarity index 99%
rename from test/components/manage/ManageForm.spec.js
rename to test/components/Manage/ManageForm.spec.js
index 79e3ce4a1..5c94c7c1c 100644
--- a/test/components/manage/ManageForm.spec.js
+++ b/test/components/Manage/ManageForm.spec.js
@@ -2,7 +2,7 @@ import React from 'react'
 import { BrowserRouter } from 'react-router-dom'
 import { Form } from 'react-final-form'
 import arrayMutators from 'final-form-arrays'
-import { ManageForm } from '../../../src/components/manage/ManageForm'
+import { ManageForm } from '../../../src/components/Manage/ManageForm'
 import Adapter from 'enzyme-adapter-react-15'
 import { configure, mount } from 'enzyme'
 import MockDate from 'mockdate'
diff --git a/test/components/manage/ManageTierBlock.spec.js b/test/components/Manage/ManageTierBlock.spec.js
similarity index 59%
rename from test/components/manage/ManageTierBlock.spec.js
rename to test/components/Manage/ManageTierBlock.spec.js
index c93e699fd..f41c73076 100644
--- a/test/components/manage/ManageTierBlock.spec.js
+++ b/test/components/Manage/ManageTierBlock.spec.js
@@ -5,10 +5,14 @@ import renderer from 'react-test-renderer'
 import Adapter from 'enzyme-adapter-react-15'
 import { configure } from 'enzyme'
 import MockDate from 'mockdate'
-import { ManageTierBlock } from '../../../src/components/manage/ManageTierBlock'
+import { ManageTierBlock } from '../../../src/components/Manage/ManageTierBlock'
 import CrowdsaleStore from '../../../src/stores/CrowdsaleStore'
 import TokenStore from '../../../src/stores/TokenStore'
-import { CROWDSALE_STRATEGIES } from '../../../src/utils/constants'
+import TierStore from '../../../src/stores/TierStore'
+import { Provider } from 'mobx-react'
+import { CROWDSALE_STRATEGIES, VALIDATION_TYPES } from '../../../src/utils/constants'
+
+const { VALID } = VALIDATION_TYPES
 
 const DATE = {
   TIER_0: {
@@ -23,7 +27,7 @@ const DATE = {
   }
 }
 
-const initialTiers = [
+const tiers = [
   {
     whitelist: [
       { addr: '0x22d491Bde2303f2f43325b2108D26f1eAbA1e32b', min: 1234, max: 50505, stored: true },
@@ -58,18 +62,85 @@ const initialTiers = [
     endTime: '2018-04-21T00:00',
     updatable: false,
     tier: 'Tier 2',
+    whitelistEnabled: 'yes',
     supply: '156',
     rate: '55',
     minCap: '0'
   }
 ]
 
+const initialTiers = [
+  {
+    whitelist: [
+      { addr: '0x22d491Bde2303f2f43325b2108D26f1eAbA1e32b', min: 1234, max: 50505, stored: true },
+      { addr: '0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1', min: 1234, max: 50505, stored: true },
+      { addr: '0xE11BA2b4D45Eaed5996Cd0823791E0C93114882d', min: 1234, max: 50505, stored: true },
+      { addr: '0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0', min: 1234, max: 50505, stored: true }
+    ],
+    startTime: '2018-04-13T16:07',
+    endTime: '2018-04-17T00:00',
+    duration: '1528827423500',
+    updatable: true,
+    tier: 'Tier 1',
+    isWhitelisted: 'yes',
+    supply: '132',
+    rate: '123',
+    index: '0',
+    addresses: {
+      crowdsaleAddress: '0x42a7b7dd785cd69714a189dffb3fd7d7174edc9ece837694ce50f7078f7c31ae'
+    },
+    minCap: '0'
+  },
+  {
+    whitelist: [
+      { addr: '0x1dF62f291b2E969fB0849d99D9Ce41e2F137006e', min: 1234, max: 50505, stored: true },
+      { addr: '0x22d491Bde2303f2f43325b2108D26f1eAbA1e32b', min: 1234, max: 50505, stored: true },
+      { addr: '0x3E5e9111Ae8eB78Fe1CC3bb8915d5D461F3Ef9A9', min: 1234, max: 50505, stored: true },
+      { addr: '0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1', min: 1234, max: 50505, stored: true },
+      { addr: '0x95cED938F7991cd0dFcb48F0a06a40FA1aF46EBC', min: 1234, max: 50505, stored: true },
+      { addr: '0xACa94ef8bD5ffEE41947b4585a84BdA5a3d3DA6E', min: 1234, max: 50505, stored: true },
+      { addr: '0xd03ea8624C8C5987235048901fB614fDcA89b117', min: 1234, max: 50505, stored: true },
+      { addr: '0xE11BA2b4D45Eaed5996Cd0823791E0C93114882d', min: 1234, max: 50505, stored: true },
+      { addr: '0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0', min: 1234, max: 50505, stored: true }
+    ],
+    startTime: '2018-04-17T00:00',
+    endTime: '2018-04-21T00:00',
+    duration: '1528827423500',
+    updatable: false,
+    tier: 'Tier 2',
+    isWhitelisted: 'yes',
+    supply: '156',
+    rate: '55',
+    index: '1',
+    addresses: {
+      crowdsaleAddress: '0x42a7b7dd785cd69714a189dffb3fd7d7174edc9ece837694ce50f7078f7c31ae'
+    },
+    minCap: '0'
+  }
+]
+
+const validations = {
+  tier: VALID,
+  walletAddress: VALID,
+  rate: VALID,
+  supply: VALID,
+  startTime: VALID,
+  endTime: VALID,
+  updatable: VALID
+}
+
 configure({ adapter: new Adapter() })
 
 describe('ManageTierBlock', () => {
   it('should render the ManageTierBlock component with tiers for Minted Capped Crowdsale', () => {
     const crowdsaleStore = new CrowdsaleStore()
     const tokenStore = new TokenStore()
+    const tierStore = new TierStore()
+
+    tierStore.addTier(tiers[0], validations)
+    tierStore.addTier(tiers[1], validations)
+
+    const stores = { crowdsaleStore, tokenStore, tierStore }
     crowdsaleStore.setProperty('strategy', CROWDSALE_STRATEGIES.MINTED_CAPPED_CROWDSALE)
 
     MockDate.set(DATE.TIER_0.ACTIVE)
@@ -87,15 +158,18 @@ describe('ManageTierBlock', () => {
       canEditTiers: false,
       aboutTier: <div id="about_tier">About Tier</div>,
       crowdsaleStore: crowdsaleStore,
-      tokenStore: tokenStore
+      tokenStore: tokenStore,
+      tierStore: tierStore
     }
 
     expect(
       renderer
         .create(
-          <StaticRouter location="testLocation" context={{}}>
-            <Form onSubmit={jest.fn()} render={() => <ManageTierBlock {...manageTierBlockProps} />} />
-          </StaticRouter>
+          <Provider {...stores}>
+            <StaticRouter location="testLocation" context={{}}>
+              <Form onSubmit={jest.fn()} render={() => <ManageTierBlock {...manageTierBlockProps} />} />
+            </StaticRouter>
+          </Provider>
         )
         .toJSON()
     ).toMatchSnapshot()
diff --git a/test/components/manage/ReservedTokensList.spec.js b/test/components/Manage/ReservedTokensList.spec.js
similarity index 76%
rename from test/components/manage/ReservedTokensList.spec.js
rename to test/components/Manage/ReservedTokensList.spec.js
index 4d25169ae..23a64e50d 100644
--- a/test/components/manage/ReservedTokensList.spec.js
+++ b/test/components/Manage/ReservedTokensList.spec.js
@@ -1,6 +1,6 @@
 import React from 'react'
 import { StaticRouter } from 'react-router'
-import { ReservedTokensList } from '../../../src/components/manage/ReservedTokensList'
+import { ReservedTokensList } from '../../../src/components/Manage/ReservedTokensList'
 import Adapter from 'enzyme-adapter-react-15'
 import { configure, mount } from 'enzyme'
 import ReservedTokenStore from '../../../src/stores/ReservedTokenStore'
@@ -41,25 +41,6 @@ describe('DistributeTokensStep', () => {
     reservedTokenStore.clearAll()
   })
 
-  it(`should render reserved token addresses if it's the owner`, () => {
-    tokenList.forEach(token => reservedTokenStore.addToken(token))
-
-    const distributeTokensStateParams = {
-      disabled: false,
-      handleClick: jest.fn(),
-      reservedTokenStore,
-      owner: true
-    }
-
-    const wrapper = mount(
-      <StaticRouter location="testLocation" context={{}}>
-        <ReservedTokensList {...distributeTokensStateParams} />
-      </StaticRouter>
-    )
-
-    expect(wrapper.find('.read-only')).toHaveLength(1)
-  })
-
   it(`should not render reserved token addresses if not the owner`, () => {
     tokenList.forEach(token => reservedTokenStore.addToken(token))
 
diff --git a/test/components/Manage/__snapshots__/FinalizeCrowdsaleStep.spec.js.snap b/test/components/Manage/__snapshots__/FinalizeCrowdsaleStep.spec.js.snap
new file mode 100644
index 000000000..bdf4ff43e
--- /dev/null
+++ b/test/components/Manage/__snapshots__/FinalizeCrowdsaleStep.spec.js.snap
@@ -0,0 +1,41 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`FinalizeCrowdsaleStep should render the component with active button 1`] = `
+<div
+  className="mng-FinalizeCrowdsaleStep"
+>
+  <div
+    className="mng-FinalizeCrowdsaleStep_Description"
+  >
+    After finalization, it’s not possible to update tiers or buy tokens. All tokens will be movable and reserved tokens will be issued.
+  </div>
+  <button
+    className="mng-FinalizeCrowdsaleStep_Button"
+    disabled={false}
+    onClick={[Function]}
+    type="button"
+  >
+    Finalize Crowdsale
+  </button>
+</div>
+`;
+
+exports[`FinalizeCrowdsaleStep should render the component with disabled button 1`] = `
+<div
+  className="mng-FinalizeCrowdsaleStep"
+>
+  <div
+    className="mng-FinalizeCrowdsaleStep_Description"
+  >
+    After finalization, it’s not possible to update tiers or buy tokens. All tokens will be movable and reserved tokens will be issued.
+  </div>
+  <button
+    className="mng-FinalizeCrowdsaleStep_Button"
+    disabled={true}
+    onClick={[Function]}
+    type="button"
+  >
+    Finalize Crowdsale
+  </button>
+</div>
+`;
diff --git a/test/components/manage/__snapshots__/ManageForm.spec.js.snap b/test/components/Manage/__snapshots__/ManageForm.spec.js.snap
similarity index 77%
rename from test/components/manage/__snapshots__/ManageForm.spec.js.snap
rename to test/components/Manage/__snapshots__/ManageForm.spec.js.snap
index 1d0f3acca..9a559267f 100644
--- a/test/components/manage/__snapshots__/ManageForm.spec.js.snap
+++ b/test/components/Manage/__snapshots__/ManageForm.spec.js.snap
@@ -2038,745 +2038,121 @@ exports[`ManageForm should render the component with tiers 1`] = `
             }
           >
             <form
+              className="mng-ManageForm"
               onSubmit={[Function]}
             >
-              <div
-                className="steps"
-              >
-                <div
-                  className="steps-content container"
-                >
-                  <AboutCrowdsale>
-                    <div
-                      className="about-step"
-                    >
-                      <div
-                        className="step-icons step-icons_crowdsale-setup"
-                      />
-                      <p
-                        className="title"
-                      >
-                         (
-                        ) Settings
-                      </p>
-                      <p
-                        className="description"
-                      >
-                        The most important and exciting part of the crowdsale process. Here you can
-              define parameters of your crowdsale campaign.
-                      </p>
-                      <Link
-                        className="crowdsale-page-link"
-                        replace={false}
-                        to="/crowdsale/?undefined=undefined&networkID=undefined"
-                      >
-                        <a
-                          className="crowdsale-page-link"
-                          href="/crowdsale/?undefined=undefined&networkID=undefined"
-                          onClick={[Function]}
-                        >
-                          Crowdsale page
-                        </a>
-                      </Link>
-                    </div>
-                  </AboutCrowdsale>
-                  <div
-                    className="input-block-container"
-                  >
-                    <InputField
-                      disabled={true}
-                      name="walletAddress"
-                      side="left"
-                      title="Wallet Address"
-                      type="text"
-                    >
-                      <div
-                        className="sw-InputField "
-                      >
-                        <FormControlTitle
-                          title="Wallet Address"
-                        >
-                          <div
-                            className="sw-FormControlTitle"
-                          >
-                            <label
-                              className="sw-FormControlTitle_Label"
-                            >
-                              Wallet Address
-                            </label>
-                          </div>
-                        </FormControlTitle>
-                        <TextField
-                          disabled={true}
-                          id="walletAddress"
-                          type="text"
-                        >
-                          <input
-                            className="sw-TextField"
-                            disabled={true}
-                            type="text"
-                          />
-                        </TextField>
-                      </div>
-                    </InputField>
-                  </div>
-                </div>
-              </div>
-              <ReactFinalFormFieldArray(4.6.1)(undefined)
-                name="tiers"
-              >
-                <inject-_class-with-crowdsaleStore-tokenStore
-                  __versions={
-                    Object {
-                      "final-form": "4.6.1",
-                      "react-final-form": "3.4.0",
-                    }
-                  }
-                  batch={[Function]}
-                  blur={[Function]}
-                  canEditTiers={true}
-                  change={[Function]}
-                  decorators={
-                    Array [
-                      [MockFunction] {
-                        "calls": Array [
-                          Array [
-                            Object {
-                              "batch": [Function],
-                              "blur": [Function],
-                              "change": [Function],
-                              "focus": [Function],
-                              "getFieldState": [Function],
-                              "getRegisteredFields": [Function],
-                              "getState": [Function],
-                              "initialize": [Function],
-                              "isValidationPaused": [Function],
-                              "mutators": Object {
-                                "insert": [Function],
-                                "move": [Function],
-                                "pop": [Function],
-                                "push": [Function],
-                                "remove": [Function],
-                                "shift": [Function],
-                                "swap": [Function],
-                                "unshift": [Function],
-                              },
-                              "pauseValidation": [Function],
-                              "registerField": [Function],
-                              "reset": [Function],
-                              "resumeValidation": [Function],
-                              "setConfig": [Function],
-                              "submit": [Function],
-                              "subscribe": [Function],
-                            },
-                          ],
-                        ],
-                        "results": Array [
-                          Object {
-                            "isThrow": false,
-                            "value": undefined,
-                          },
-                        ],
-                      },
-                    ]
-                  }
-                  dirty={false}
-                  dirtySinceLastSubmit={false}
-                  errors={
-                    Object {
-                      "tiers": Array [
-                        Object {
-                          "minCap": Array [
-                            "Decimals should not exceed the amount of decimals specified",
-                          ],
-                        },
-                        Object {
-                          "minCap": Array [
-                            "Decimals should not exceed the amount of decimals specified",
-                          ],
-                        },
-                      ],
-                    }
-                  }
-                  fields={
-                    Object {
-                      "active": false,
-                      "blur": [Function],
-                      "change": [Function],
-                      "data": Object {},
-                      "dirty": false,
-                      "dirtySinceLastSubmit": false,
-                      "error": undefined,
-                      "focus": [Function],
-                      "forEach": [Function],
-                      "initial": Array [
-                        Object {
-                          "addresses": Object {
-                            "crowdsaleAddress": "0x42a7b7dd785cd69714a189dffb3fd7d7174edc9ece837694ce50f7078f7c31ae",
-                          },
-                          "duration": "1528827423500",
-                          "endTime": "2018-04-17T00:00",
-                          "index": "0",
-                          "isWhitelisted": "yes",
-                          "minCap": "0",
-                          "rate": "123",
-                          "startTime": "2018-04-13T16:07",
-                          "supply": "132",
-                          "tier": "Tier 1",
-                          "updatable": true,
-                          "whitelist": Array [
-                            Object {
-                              "addr": "0x22d491Bde2303f2f43325b2108D26f1eAbA1e32b",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                            Object {
-                              "addr": "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                            Object {
-                              "addr": "0xE11BA2b4D45Eaed5996Cd0823791E0C93114882d",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                            Object {
-                              "addr": "0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                          ],
-                        },
-                        Object {
-                          "addresses": Object {
-                            "crowdsaleAddress": "0x42a7b7dd785cd69714a189dffb3fd7d7174edc9ece837694ce50f7078f7c31ae",
-                          },
-                          "duration": "1528827423500",
-                          "endTime": "2018-04-21T00:00",
-                          "index": "1",
-                          "isWhitelisted": "yes",
-                          "minCap": "0",
-                          "rate": "55",
-                          "startTime": "2018-04-17T00:00",
-                          "supply": "156",
-                          "tier": "Tier 2",
-                          "updatable": false,
-                          "whitelist": Array [
-                            Object {
-                              "addr": "0x1dF62f291b2E969fB0849d99D9Ce41e2F137006e",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                            Object {
-                              "addr": "0x22d491Bde2303f2f43325b2108D26f1eAbA1e32b",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                            Object {
-                              "addr": "0x3E5e9111Ae8eB78Fe1CC3bb8915d5D461F3Ef9A9",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                            Object {
-                              "addr": "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                            Object {
-                              "addr": "0x95cED938F7991cd0dFcb48F0a06a40FA1aF46EBC",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                            Object {
-                              "addr": "0xACa94ef8bD5ffEE41947b4585a84BdA5a3d3DA6E",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                            Object {
-                              "addr": "0xd03ea8624C8C5987235048901fB614fDcA89b117",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                            Object {
-                              "addr": "0xE11BA2b4D45Eaed5996Cd0823791E0C93114882d",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                            Object {
-                              "addr": "0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                          ],
-                        },
-                      ],
-                      "insert": [Function],
-                      "invalid": false,
-                      "length": 2,
-                      "map": [Function],
-                      "move": [Function],
-                      "name": "tiers",
-                      "pop": [Function],
-                      "pristine": true,
-                      "push": [Function],
-                      "remove": [Function],
-                      "shift": [Function],
-                      "submitError": undefined,
-                      "submitFailed": false,
-                      "submitSucceeded": false,
-                      "swap": [Function],
-                      "touched": false,
-                      "unshift": [Function],
-                      "valid": true,
-                      "value": Array [
-                        Object {
-                          "addresses": Object {
-                            "crowdsaleAddress": "0x42a7b7dd785cd69714a189dffb3fd7d7174edc9ece837694ce50f7078f7c31ae",
-                          },
-                          "duration": "1528827423500",
-                          "endTime": "2018-04-17T00:00",
-                          "index": "0",
-                          "isWhitelisted": "yes",
-                          "minCap": "0",
-                          "rate": "123",
-                          "startTime": "2018-04-13T16:07",
-                          "supply": "132",
-                          "tier": "Tier 1",
-                          "updatable": true,
-                          "whitelist": Array [
-                            Object {
-                              "addr": "0x22d491Bde2303f2f43325b2108D26f1eAbA1e32b",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                            Object {
-                              "addr": "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                            Object {
-                              "addr": "0xE11BA2b4D45Eaed5996Cd0823791E0C93114882d",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                            Object {
-                              "addr": "0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                          ],
-                        },
-                        Object {
-                          "addresses": Object {
-                            "crowdsaleAddress": "0x42a7b7dd785cd69714a189dffb3fd7d7174edc9ece837694ce50f7078f7c31ae",
-                          },
-                          "duration": "1528827423500",
-                          "endTime": "2018-04-21T00:00",
-                          "index": "1",
-                          "isWhitelisted": "yes",
-                          "minCap": "0",
-                          "rate": "55",
-                          "startTime": "2018-04-17T00:00",
-                          "supply": "156",
-                          "tier": "Tier 2",
-                          "updatable": false,
-                          "whitelist": Array [
-                            Object {
-                              "addr": "0x1dF62f291b2E969fB0849d99D9Ce41e2F137006e",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                            Object {
-                              "addr": "0x22d491Bde2303f2f43325b2108D26f1eAbA1e32b",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                            Object {
-                              "addr": "0x3E5e9111Ae8eB78Fe1CC3bb8915d5D461F3Ef9A9",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                            Object {
-                              "addr": "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                            Object {
-                              "addr": "0x95cED938F7991cd0dFcb48F0a06a40FA1aF46EBC",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                            Object {
-                              "addr": "0xACa94ef8bD5ffEE41947b4585a84BdA5a3d3DA6E",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                            Object {
-                              "addr": "0xd03ea8624C8C5987235048901fB614fDcA89b117",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                            Object {
-                              "addr": "0xE11BA2b4D45Eaed5996Cd0823791E0C93114882d",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                            Object {
-                              "addr": "0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                          ],
-                        },
-                      ],
-                      "visited": false,
-                    }
-                  }
-                  focus={[Function]}
-                  form={
-                    Object {
-                      "batch": [Function],
-                      "blur": [Function],
-                      "change": [Function],
-                      "focus": [Function],
-                      "getFieldState": [Function],
-                      "getRegisteredFields": [Function],
-                      "getState": [Function],
-                      "initialize": [Function],
-                      "isValidationPaused": [Function],
-                      "mutators": Object {
-                        "insert": [Function],
-                        "move": [Function],
-                        "pop": [Function],
-                        "push": [Function],
-                        "remove": [Function],
-                        "shift": [Function],
-                        "swap": [Function],
-                        "unshift": [Function],
-                      },
-                      "pauseValidation": [Function],
-                      "registerField": [Function],
-                      "reset": [Function],
-                      "resumeValidation": [Function],
-                      "setConfig": [Function],
-                      "submit": [Function],
-                      "subscribe": [Function],
-                    }
-                  }
-                  hasSubmitErrors={false}
-                  hasValidationErrors={true}
-                  initialValues={
-                    Object {
-                      "tiers": Array [
-                        Object {
-                          "addresses": Object {
-                            "crowdsaleAddress": "0x42a7b7dd785cd69714a189dffb3fd7d7174edc9ece837694ce50f7078f7c31ae",
-                          },
-                          "duration": "1528827423500",
-                          "endTime": "2018-04-17T00:00",
-                          "index": "0",
-                          "isWhitelisted": "yes",
-                          "minCap": "0",
-                          "rate": "123",
-                          "startTime": "2018-04-13T16:07",
-                          "supply": "132",
-                          "tier": "Tier 1",
-                          "updatable": true,
-                          "whitelist": Array [
-                            Object {
-                              "addr": "0x22d491Bde2303f2f43325b2108D26f1eAbA1e32b",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                            Object {
-                              "addr": "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                            Object {
-                              "addr": "0xE11BA2b4D45Eaed5996Cd0823791E0C93114882d",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                            Object {
-                              "addr": "0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                          ],
-                        },
-                        Object {
-                          "addresses": Object {
-                            "crowdsaleAddress": "0x42a7b7dd785cd69714a189dffb3fd7d7174edc9ece837694ce50f7078f7c31ae",
-                          },
-                          "duration": "1528827423500",
-                          "endTime": "2018-04-21T00:00",
-                          "index": "1",
-                          "isWhitelisted": "yes",
-                          "minCap": "0",
-                          "rate": "55",
-                          "startTime": "2018-04-17T00:00",
-                          "supply": "156",
-                          "tier": "Tier 2",
-                          "updatable": false,
-                          "whitelist": Array [
-                            Object {
-                              "addr": "0x1dF62f291b2E969fB0849d99D9Ce41e2F137006e",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                            Object {
-                              "addr": "0x22d491Bde2303f2f43325b2108D26f1eAbA1e32b",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                            Object {
-                              "addr": "0x3E5e9111Ae8eB78Fe1CC3bb8915d5D461F3Ef9A9",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                            Object {
-                              "addr": "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                            Object {
-                              "addr": "0x95cED938F7991cd0dFcb48F0a06a40FA1aF46EBC",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                            Object {
-                              "addr": "0xACa94ef8bD5ffEE41947b4585a84BdA5a3d3DA6E",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                            Object {
-                              "addr": "0xd03ea8624C8C5987235048901fB614fDcA89b117",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                            Object {
-                              "addr": "0xE11BA2b4D45Eaed5996Cd0823791E0C93114882d",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                            Object {
-                              "addr": "0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                          ],
-                        },
-                      ],
-                    }
-                  }
-                  initialize={[Function]}
-                  mutators={
-                    Object {
-                      "insert": [Function],
-                      "move": [Function],
-                      "pop": [Function],
-                      "push": [Function],
-                      "remove": [Function],
-                      "shift": [Function],
-                      "swap": [Function],
-                      "unshift": [Function],
-                    }
-                  }
-                  reset={[Function]}
-                  submitFailed={false}
-                  submitSucceeded={false}
-                  touched={
-                    Object {
-                      "tiers": false,
-                      "tiers[0].endTime": false,
-                      "tiers[0].minCap": false,
-                      "tiers[0].rate": false,
-                      "tiers[0].startTime": false,
-                      "tiers[0].supply": false,
-                      "tiers[1].endTime": false,
-                      "tiers[1].minCap": false,
-                      "tiers[1].rate": false,
-                      "tiers[1].startTime": false,
-                      "tiers[1].supply": false,
-                    }
-                  }
-                  valid={false}
-                  validating={false}
-                  values={
-                    Object {
-                      "tiers": Array [
-                        Object {
-                          "addresses": Object {
-                            "crowdsaleAddress": "0x42a7b7dd785cd69714a189dffb3fd7d7174edc9ece837694ce50f7078f7c31ae",
-                          },
-                          "duration": "1528827423500",
-                          "endTime": "2018-04-17T00:00",
-                          "index": "0",
-                          "isWhitelisted": "yes",
-                          "minCap": "0",
-                          "rate": "123",
-                          "startTime": "2018-04-13T16:07",
-                          "supply": "132",
-                          "tier": "Tier 1",
-                          "updatable": true,
-                          "whitelist": Array [
-                            Object {
-                              "addr": "0x22d491Bde2303f2f43325b2108D26f1eAbA1e32b",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                            Object {
-                              "addr": "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                            Object {
-                              "addr": "0xE11BA2b4D45Eaed5996Cd0823791E0C93114882d",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                            Object {
-                              "addr": "0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                          ],
-                        },
-                        Object {
-                          "addresses": Object {
-                            "crowdsaleAddress": "0x42a7b7dd785cd69714a189dffb3fd7d7174edc9ece837694ce50f7078f7c31ae",
-                          },
-                          "duration": "1528827423500",
-                          "endTime": "2018-04-21T00:00",
-                          "index": "1",
-                          "isWhitelisted": "yes",
-                          "minCap": "0",
-                          "rate": "55",
-                          "startTime": "2018-04-17T00:00",
-                          "supply": "156",
-                          "tier": "Tier 2",
-                          "updatable": false,
-                          "whitelist": Array [
-                            Object {
-                              "addr": "0x1dF62f291b2E969fB0849d99D9Ce41e2F137006e",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                            Object {
-                              "addr": "0x22d491Bde2303f2f43325b2108D26f1eAbA1e32b",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                            Object {
-                              "addr": "0x3E5e9111Ae8eB78Fe1CC3bb8915d5D461F3Ef9A9",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                            Object {
-                              "addr": "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                            Object {
-                              "addr": "0x95cED938F7991cd0dFcb48F0a06a40FA1aF46EBC",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                            Object {
-                              "addr": "0xACa94ef8bD5ffEE41947b4585a84BdA5a3d3DA6E",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                            Object {
-                              "addr": "0xd03ea8624C8C5987235048901fB614fDcA89b117",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                            Object {
-                              "addr": "0xE11BA2b4D45Eaed5996Cd0823791E0C93114882d",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                            Object {
-                              "addr": "0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0",
-                              "max": 50505,
-                              "min": 1234,
-                              "stored": true,
-                            },
-                          ],
-                        },
-                      ],
-                    }
-                  }
-                  visited={
-                    Object {
-                      "tiers": false,
-                      "tiers[0].endTime": false,
-                      "tiers[0].minCap": false,
-                      "tiers[0].rate": false,
-                      "tiers[0].startTime": false,
-                      "tiers[0].supply": false,
-                      "tiers[1].endTime": false,
-                      "tiers[1].minCap": false,
-                      "tiers[1].rate": false,
-                      "tiers[1].startTime": false,
-                      "tiers[1].supply": false,
-                    }
-                  }
+              <h2
+                className="mng-ManageForm_Title"
+              >
+                 
+                <span
+                  className="mng-ManageForm_Title-uppercase"
+                >
+                  (
+                  )
+                </span>
+                 Settings
+              </h2>
+              <div
+                className="mng-ManageForm_BorderedBlock"
+              >
+                <div
+                  className="mng-ManageForm_ItemsContainer"
+                >
+                  <div
+                    className="mng-ManageForm_Item"
+                  >
+                    <InputField
+                      disabled={true}
+                      name="crowdsaleType"
+                      readOnly={true}
+                      title="Crowdsale Type"
+                      type="text"
+                      value="Whitelist With Cap"
+                    >
+                      <div
+                        className="sw-InputField "
+                      >
+                        <FormControlTitle
+                          title="Crowdsale Type"
+                        >
+                          <div
+                            className="sw-FormControlTitle"
+                          >
+                            <label
+                              className="sw-FormControlTitle_Label"
+                            >
+                              Crowdsale Type
+                            </label>
+                          </div>
+                        </FormControlTitle>
+                        <TextField
+                          disabled={true}
+                          id="crowdsaleType"
+                          readOnly={true}
+                          type="text"
+                          value="Whitelist With Cap"
+                        >
+                          <input
+                            autoComplete="off"
+                            className="sw-TextField"
+                            disabled={true}
+                            readOnly={true}
+                            type="text"
+                            value="Whitelist With Cap"
+                          />
+                        </TextField>
+                      </div>
+                    </InputField>
+                  </div>
+                  <div
+                    className="mng-ManageForm_Item"
+                  >
+                    <InputField
+                      disabled={true}
+                      name="walletAddress"
+                      readOnly={true}
+                      title="Wallet Address"
+                      type="text"
+                    >
+                      <div
+                        className="sw-InputField "
+                      >
+                        <FormControlTitle
+                          title="Wallet Address"
+                        >
+                          <div
+                            className="sw-FormControlTitle"
+                          >
+                            <label
+                              className="sw-FormControlTitle_Label"
+                            >
+                              Wallet Address
+                            </label>
+                          </div>
+                        </FormControlTitle>
+                        <TextField
+                          disabled={true}
+                          id="walletAddress"
+                          readOnly={true}
+                          type="text"
+                        >
+                          <input
+                            autoComplete="off"
+                            className="sw-TextField"
+                            disabled={true}
+                            readOnly={true}
+                            type="text"
+                          />
+                        </TextField>
+                      </div>
+                    </InputField>
+                  </div>
+                </div>
+                <ReactFinalFormFieldArray(4.6.1)(undefined)
+                  name="tiers"
                 >
-                  <_class
+                  <inject-_class-with-crowdsaleStore-tokenStore
                     __versions={
                       Object {
                         "final-form": "4.6.1",
@@ -2787,20 +2163,6 @@ exports[`ManageForm should render the component with tiers 1`] = `
                     blur={[Function]}
                     canEditTiers={true}
                     change={[Function]}
-                    crowdsaleStore={
-                      CrowdsaleStore {
-                        "crowdsales": Array [],
-                        "endTime": undefined,
-                        "maximumSellableTokens": undefined,
-                        "maximumSellableTokensInWei": undefined,
-                        "selected": Object {
-                          "initialTiersValues": Array [],
-                          "updatable": false,
-                        },
-                        "strategy": "white-list-with-cap",
-                        "supply": undefined,
-                      }
-                    }
                     decorators={
                       Array [
                         [MockFunction] {
@@ -3290,20 +2652,6 @@ exports[`ManageForm should render the component with tiers 1`] = `
                     reset={[Function]}
                     submitFailed={false}
                     submitSucceeded={false}
-                    tokenStore={
-                      TokenStore {
-                        "decimals": undefined,
-                        "name": undefined,
-                        "reservedTokensInput": Object {},
-                        "supply": 0,
-                        "ticker": undefined,
-                        "validToken": Object {
-                          "decimals": "EMPTY",
-                          "name": "EMPTY",
-                          "ticker": "EMPTY",
-                        },
-                      }
-                    }
                     touched={
                       Object {
                         "tiers": false,
@@ -3428,137 +2776,751 @@ exports[`ManageForm should render the component with tiers 1`] = `
                                 "min": 1234,
                                 "stored": true,
                               },
-                              Object {
-                                "addr": "0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0",
-                                "max": 50505,
-                                "min": 1234,
-                                "stored": true,
+                              Object {
+                                "addr": "0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0",
+                                "max": 50505,
+                                "min": 1234,
+                                "stored": true,
+                              },
+                            ],
+                          },
+                        ],
+                      }
+                    }
+                    visited={
+                      Object {
+                        "tiers": false,
+                        "tiers[0].endTime": false,
+                        "tiers[0].minCap": false,
+                        "tiers[0].rate": false,
+                        "tiers[0].startTime": false,
+                        "tiers[0].supply": false,
+                        "tiers[1].endTime": false,
+                        "tiers[1].minCap": false,
+                        "tiers[1].rate": false,
+                        "tiers[1].startTime": false,
+                        "tiers[1].supply": false,
+                      }
+                    }
+                  >
+                    <_class
+                      __versions={
+                        Object {
+                          "final-form": "4.6.1",
+                          "react-final-form": "3.4.0",
+                        }
+                      }
+                      batch={[Function]}
+                      blur={[Function]}
+                      canEditTiers={true}
+                      change={[Function]}
+                      crowdsaleStore={
+                        CrowdsaleStore {
+                          "crowdsales": Array [],
+                          "endTime": undefined,
+                          "maximumSellableTokens": undefined,
+                          "maximumSellableTokensInWei": undefined,
+                          "selected": Object {
+                            "initialTiersValues": Array [],
+                            "updatable": false,
+                          },
+                          "strategy": "white-list-with-cap",
+                          "supply": undefined,
+                        }
+                      }
+                      decorators={
+                        Array [
+                          [MockFunction] {
+                            "calls": Array [
+                              Array [
+                                Object {
+                                  "batch": [Function],
+                                  "blur": [Function],
+                                  "change": [Function],
+                                  "focus": [Function],
+                                  "getFieldState": [Function],
+                                  "getRegisteredFields": [Function],
+                                  "getState": [Function],
+                                  "initialize": [Function],
+                                  "isValidationPaused": [Function],
+                                  "mutators": Object {
+                                    "insert": [Function],
+                                    "move": [Function],
+                                    "pop": [Function],
+                                    "push": [Function],
+                                    "remove": [Function],
+                                    "shift": [Function],
+                                    "swap": [Function],
+                                    "unshift": [Function],
+                                  },
+                                  "pauseValidation": [Function],
+                                  "registerField": [Function],
+                                  "reset": [Function],
+                                  "resumeValidation": [Function],
+                                  "setConfig": [Function],
+                                  "submit": [Function],
+                                  "subscribe": [Function],
+                                },
+                              ],
+                            ],
+                            "results": Array [
+                              Object {
+                                "isThrow": false,
+                                "value": undefined,
+                              },
+                            ],
+                          },
+                        ]
+                      }
+                      dirty={false}
+                      dirtySinceLastSubmit={false}
+                      errors={
+                        Object {
+                          "tiers": Array [
+                            Object {
+                              "minCap": Array [
+                                "Decimals should not exceed the amount of decimals specified",
+                              ],
+                            },
+                            Object {
+                              "minCap": Array [
+                                "Decimals should not exceed the amount of decimals specified",
+                              ],
+                            },
+                          ],
+                        }
+                      }
+                      fields={
+                        Object {
+                          "active": false,
+                          "blur": [Function],
+                          "change": [Function],
+                          "data": Object {},
+                          "dirty": false,
+                          "dirtySinceLastSubmit": false,
+                          "error": undefined,
+                          "focus": [Function],
+                          "forEach": [Function],
+                          "initial": Array [
+                            Object {
+                              "addresses": Object {
+                                "crowdsaleAddress": "0x42a7b7dd785cd69714a189dffb3fd7d7174edc9ece837694ce50f7078f7c31ae",
+                              },
+                              "duration": "1528827423500",
+                              "endTime": "2018-04-17T00:00",
+                              "index": "0",
+                              "isWhitelisted": "yes",
+                              "minCap": "0",
+                              "rate": "123",
+                              "startTime": "2018-04-13T16:07",
+                              "supply": "132",
+                              "tier": "Tier 1",
+                              "updatable": true,
+                              "whitelist": Array [
+                                Object {
+                                  "addr": "0x22d491Bde2303f2f43325b2108D26f1eAbA1e32b",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                                Object {
+                                  "addr": "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                                Object {
+                                  "addr": "0xE11BA2b4D45Eaed5996Cd0823791E0C93114882d",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                                Object {
+                                  "addr": "0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                              ],
+                            },
+                            Object {
+                              "addresses": Object {
+                                "crowdsaleAddress": "0x42a7b7dd785cd69714a189dffb3fd7d7174edc9ece837694ce50f7078f7c31ae",
+                              },
+                              "duration": "1528827423500",
+                              "endTime": "2018-04-21T00:00",
+                              "index": "1",
+                              "isWhitelisted": "yes",
+                              "minCap": "0",
+                              "rate": "55",
+                              "startTime": "2018-04-17T00:00",
+                              "supply": "156",
+                              "tier": "Tier 2",
+                              "updatable": false,
+                              "whitelist": Array [
+                                Object {
+                                  "addr": "0x1dF62f291b2E969fB0849d99D9Ce41e2F137006e",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                                Object {
+                                  "addr": "0x22d491Bde2303f2f43325b2108D26f1eAbA1e32b",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                                Object {
+                                  "addr": "0x3E5e9111Ae8eB78Fe1CC3bb8915d5D461F3Ef9A9",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                                Object {
+                                  "addr": "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                                Object {
+                                  "addr": "0x95cED938F7991cd0dFcb48F0a06a40FA1aF46EBC",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                                Object {
+                                  "addr": "0xACa94ef8bD5ffEE41947b4585a84BdA5a3d3DA6E",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                                Object {
+                                  "addr": "0xd03ea8624C8C5987235048901fB614fDcA89b117",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                                Object {
+                                  "addr": "0xE11BA2b4D45Eaed5996Cd0823791E0C93114882d",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                                Object {
+                                  "addr": "0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                              ],
+                            },
+                          ],
+                          "insert": [Function],
+                          "invalid": false,
+                          "length": 2,
+                          "map": [Function],
+                          "move": [Function],
+                          "name": "tiers",
+                          "pop": [Function],
+                          "pristine": true,
+                          "push": [Function],
+                          "remove": [Function],
+                          "shift": [Function],
+                          "submitError": undefined,
+                          "submitFailed": false,
+                          "submitSucceeded": false,
+                          "swap": [Function],
+                          "touched": false,
+                          "unshift": [Function],
+                          "valid": true,
+                          "value": Array [
+                            Object {
+                              "addresses": Object {
+                                "crowdsaleAddress": "0x42a7b7dd785cd69714a189dffb3fd7d7174edc9ece837694ce50f7078f7c31ae",
+                              },
+                              "duration": "1528827423500",
+                              "endTime": "2018-04-17T00:00",
+                              "index": "0",
+                              "isWhitelisted": "yes",
+                              "minCap": "0",
+                              "rate": "123",
+                              "startTime": "2018-04-13T16:07",
+                              "supply": "132",
+                              "tier": "Tier 1",
+                              "updatable": true,
+                              "whitelist": Array [
+                                Object {
+                                  "addr": "0x22d491Bde2303f2f43325b2108D26f1eAbA1e32b",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                                Object {
+                                  "addr": "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                                Object {
+                                  "addr": "0xE11BA2b4D45Eaed5996Cd0823791E0C93114882d",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                                Object {
+                                  "addr": "0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                              ],
+                            },
+                            Object {
+                              "addresses": Object {
+                                "crowdsaleAddress": "0x42a7b7dd785cd69714a189dffb3fd7d7174edc9ece837694ce50f7078f7c31ae",
+                              },
+                              "duration": "1528827423500",
+                              "endTime": "2018-04-21T00:00",
+                              "index": "1",
+                              "isWhitelisted": "yes",
+                              "minCap": "0",
+                              "rate": "55",
+                              "startTime": "2018-04-17T00:00",
+                              "supply": "156",
+                              "tier": "Tier 2",
+                              "updatable": false,
+                              "whitelist": Array [
+                                Object {
+                                  "addr": "0x1dF62f291b2E969fB0849d99D9Ce41e2F137006e",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                                Object {
+                                  "addr": "0x22d491Bde2303f2f43325b2108D26f1eAbA1e32b",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                                Object {
+                                  "addr": "0x3E5e9111Ae8eB78Fe1CC3bb8915d5D461F3Ef9A9",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                                Object {
+                                  "addr": "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                                Object {
+                                  "addr": "0x95cED938F7991cd0dFcb48F0a06a40FA1aF46EBC",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                                Object {
+                                  "addr": "0xACa94ef8bD5ffEE41947b4585a84BdA5a3d3DA6E",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                                Object {
+                                  "addr": "0xd03ea8624C8C5987235048901fB614fDcA89b117",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                                Object {
+                                  "addr": "0xE11BA2b4D45Eaed5996Cd0823791E0C93114882d",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                                Object {
+                                  "addr": "0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                              ],
+                            },
+                          ],
+                          "visited": false,
+                        }
+                      }
+                      focus={[Function]}
+                      form={
+                        Object {
+                          "batch": [Function],
+                          "blur": [Function],
+                          "change": [Function],
+                          "focus": [Function],
+                          "getFieldState": [Function],
+                          "getRegisteredFields": [Function],
+                          "getState": [Function],
+                          "initialize": [Function],
+                          "isValidationPaused": [Function],
+                          "mutators": Object {
+                            "insert": [Function],
+                            "move": [Function],
+                            "pop": [Function],
+                            "push": [Function],
+                            "remove": [Function],
+                            "shift": [Function],
+                            "swap": [Function],
+                            "unshift": [Function],
+                          },
+                          "pauseValidation": [Function],
+                          "registerField": [Function],
+                          "reset": [Function],
+                          "resumeValidation": [Function],
+                          "setConfig": [Function],
+                          "submit": [Function],
+                          "subscribe": [Function],
+                        }
+                      }
+                      hasSubmitErrors={false}
+                      hasValidationErrors={true}
+                      initialValues={
+                        Object {
+                          "tiers": Array [
+                            Object {
+                              "addresses": Object {
+                                "crowdsaleAddress": "0x42a7b7dd785cd69714a189dffb3fd7d7174edc9ece837694ce50f7078f7c31ae",
+                              },
+                              "duration": "1528827423500",
+                              "endTime": "2018-04-17T00:00",
+                              "index": "0",
+                              "isWhitelisted": "yes",
+                              "minCap": "0",
+                              "rate": "123",
+                              "startTime": "2018-04-13T16:07",
+                              "supply": "132",
+                              "tier": "Tier 1",
+                              "updatable": true,
+                              "whitelist": Array [
+                                Object {
+                                  "addr": "0x22d491Bde2303f2f43325b2108D26f1eAbA1e32b",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                                Object {
+                                  "addr": "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                                Object {
+                                  "addr": "0xE11BA2b4D45Eaed5996Cd0823791E0C93114882d",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                                Object {
+                                  "addr": "0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                              ],
+                            },
+                            Object {
+                              "addresses": Object {
+                                "crowdsaleAddress": "0x42a7b7dd785cd69714a189dffb3fd7d7174edc9ece837694ce50f7078f7c31ae",
                               },
-                            ],
+                              "duration": "1528827423500",
+                              "endTime": "2018-04-21T00:00",
+                              "index": "1",
+                              "isWhitelisted": "yes",
+                              "minCap": "0",
+                              "rate": "55",
+                              "startTime": "2018-04-17T00:00",
+                              "supply": "156",
+                              "tier": "Tier 2",
+                              "updatable": false,
+                              "whitelist": Array [
+                                Object {
+                                  "addr": "0x1dF62f291b2E969fB0849d99D9Ce41e2F137006e",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                                Object {
+                                  "addr": "0x22d491Bde2303f2f43325b2108D26f1eAbA1e32b",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                                Object {
+                                  "addr": "0x3E5e9111Ae8eB78Fe1CC3bb8915d5D461F3Ef9A9",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                                Object {
+                                  "addr": "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                                Object {
+                                  "addr": "0x95cED938F7991cd0dFcb48F0a06a40FA1aF46EBC",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                                Object {
+                                  "addr": "0xACa94ef8bD5ffEE41947b4585a84BdA5a3d3DA6E",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                                Object {
+                                  "addr": "0xd03ea8624C8C5987235048901fB614fDcA89b117",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                                Object {
+                                  "addr": "0xE11BA2b4D45Eaed5996Cd0823791E0C93114882d",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                                Object {
+                                  "addr": "0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                              ],
+                            },
+                          ],
+                        }
+                      }
+                      initialize={[Function]}
+                      mutators={
+                        Object {
+                          "insert": [Function],
+                          "move": [Function],
+                          "pop": [Function],
+                          "push": [Function],
+                          "remove": [Function],
+                          "shift": [Function],
+                          "swap": [Function],
+                          "unshift": [Function],
+                        }
+                      }
+                      reset={[Function]}
+                      submitFailed={false}
+                      submitSucceeded={false}
+                      tokenStore={
+                        TokenStore {
+                          "decimals": undefined,
+                          "name": undefined,
+                          "reservedTokensInput": Object {},
+                          "supply": 0,
+                          "ticker": undefined,
+                          "validToken": Object {
+                            "decimals": "EMPTY",
+                            "name": "EMPTY",
+                            "ticker": "EMPTY",
                           },
-                        ],
+                        }
                       }
-                    }
-                    visited={
-                      Object {
-                        "tiers": false,
-                        "tiers[0].endTime": false,
-                        "tiers[0].minCap": false,
-                        "tiers[0].rate": false,
-                        "tiers[0].startTime": false,
-                        "tiers[0].supply": false,
-                        "tiers[1].endTime": false,
-                        "tiers[1].minCap": false,
-                        "tiers[1].rate": false,
-                        "tiers[1].startTime": false,
-                        "tiers[1].supply": false,
+                      touched={
+                        Object {
+                          "tiers": false,
+                          "tiers[0].endTime": false,
+                          "tiers[0].minCap": false,
+                          "tiers[0].rate": false,
+                          "tiers[0].startTime": false,
+                          "tiers[0].supply": false,
+                          "tiers[1].endTime": false,
+                          "tiers[1].minCap": false,
+                          "tiers[1].rate": false,
+                          "tiers[1].startTime": false,
+                          "tiers[1].supply": false,
+                        }
                       }
-                    }
-                  >
-                    <div>
+                      valid={false}
+                      validating={false}
+                      values={
+                        Object {
+                          "tiers": Array [
+                            Object {
+                              "addresses": Object {
+                                "crowdsaleAddress": "0x42a7b7dd785cd69714a189dffb3fd7d7174edc9ece837694ce50f7078f7c31ae",
+                              },
+                              "duration": "1528827423500",
+                              "endTime": "2018-04-17T00:00",
+                              "index": "0",
+                              "isWhitelisted": "yes",
+                              "minCap": "0",
+                              "rate": "123",
+                              "startTime": "2018-04-13T16:07",
+                              "supply": "132",
+                              "tier": "Tier 1",
+                              "updatable": true,
+                              "whitelist": Array [
+                                Object {
+                                  "addr": "0x22d491Bde2303f2f43325b2108D26f1eAbA1e32b",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                                Object {
+                                  "addr": "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                                Object {
+                                  "addr": "0xE11BA2b4D45Eaed5996Cd0823791E0C93114882d",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                                Object {
+                                  "addr": "0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                              ],
+                            },
+                            Object {
+                              "addresses": Object {
+                                "crowdsaleAddress": "0x42a7b7dd785cd69714a189dffb3fd7d7174edc9ece837694ce50f7078f7c31ae",
+                              },
+                              "duration": "1528827423500",
+                              "endTime": "2018-04-21T00:00",
+                              "index": "1",
+                              "isWhitelisted": "yes",
+                              "minCap": "0",
+                              "rate": "55",
+                              "startTime": "2018-04-17T00:00",
+                              "supply": "156",
+                              "tier": "Tier 2",
+                              "updatable": false,
+                              "whitelist": Array [
+                                Object {
+                                  "addr": "0x1dF62f291b2E969fB0849d99D9Ce41e2F137006e",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                                Object {
+                                  "addr": "0x22d491Bde2303f2f43325b2108D26f1eAbA1e32b",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                                Object {
+                                  "addr": "0x3E5e9111Ae8eB78Fe1CC3bb8915d5D461F3Ef9A9",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                                Object {
+                                  "addr": "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                                Object {
+                                  "addr": "0x95cED938F7991cd0dFcb48F0a06a40FA1aF46EBC",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                                Object {
+                                  "addr": "0xACa94ef8bD5ffEE41947b4585a84BdA5a3d3DA6E",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                                Object {
+                                  "addr": "0xd03ea8624C8C5987235048901fB614fDcA89b117",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                                Object {
+                                  "addr": "0xE11BA2b4D45Eaed5996Cd0823791E0C93114882d",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                                Object {
+                                  "addr": "0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0",
+                                  "max": 50505,
+                                  "min": 1234,
+                                  "stored": true,
+                                },
+                              ],
+                            },
+                          ],
+                        }
+                      }
+                      visited={
+                        Object {
+                          "tiers": false,
+                          "tiers[0].endTime": false,
+                          "tiers[0].minCap": false,
+                          "tiers[0].rate": false,
+                          "tiers[0].startTime": false,
+                          "tiers[0].supply": false,
+                          "tiers[1].endTime": false,
+                          "tiers[1].minCap": false,
+                          "tiers[1].rate": false,
+                          "tiers[1].startTime": false,
+                          "tiers[1].supply": false,
+                        }
+                      }
+                    >
                       <div
-                        className="steps"
-                        key="0"
+                        className="mng-ManageTierBlock"
                       >
                         <div
-                          className="steps-content container"
+                          className="mng-ManageTierBlock_Content"
+                          key="0"
                         >
+                          <h3
+                            className="mng-ManageTierBlock_Title"
+                          >
+                            Tier Name: 
+                            Tier 1
+                          </h3>
                           <div
-                            className=""
+                            className="mng-ManageTierBlock_ItemsContainer"
                           >
                             <div
-                              className="input-block-container"
-                            >
-                              <InputField
-                                disabled={true}
-                                name="tiers[0].crowdsale_name"
-                                side="left"
-                                title="Tier setup name"
-                                type="text"
-                                value="Tier 1"
-                              >
-                                <div
-                                  className="sw-InputField "
-                                >
-                                  <FormControlTitle
-                                    title="Tier setup name"
-                                  >
-                                    <div
-                                      className="sw-FormControlTitle"
-                                    >
-                                      <label
-                                        className="sw-FormControlTitle_Label"
-                                      >
-                                        Tier setup name
-                                      </label>
-                                    </div>
-                                  </FormControlTitle>
-                                  <TextField
-                                    disabled={true}
-                                    id="tiers[0].crowdsale_name"
-                                    type="text"
-                                    value="Tier 1"
-                                  >
-                                    <input
-                                      className="sw-TextField"
-                                      disabled={true}
-                                      type="text"
-                                      value="Tier 1"
-                                    />
-                                  </TextField>
-                                </div>
-                              </InputField>
-                            </div>
-                            <div
-                              className="input-block-container"
+                              className="mng-ManageTierBlock_Item"
                             >
                               <CrowdsaleStartTime
                                 disabled={true}
-                                errorStyle={
-                                  Object {
-                                    "color": "red",
-                                    "fontSize": "12px",
-                                    "fontWeight": "bold",
-                                    "height": "20px",
-                                    "width": "100%",
-                                  }
-                                }
                                 index={0}
                                 name="tiers[0].startTime"
-                                side="left"
+                                readOnly={true}
                               >
                                 <Field
                                   component={[Function]}
                                   description="Date and time when the tier starts. Can't be in the past from the current moment."
                                   disabled={true}
-                                  errorStyle={
-                                    Object {
-                                      "color": "red",
-                                      "fontSize": "12px",
-                                      "fontWeight": "bold",
-                                      "height": "20px",
-                                      "width": "100%",
-                                    }
-                                  }
                                   format={[Function]}
                                   label="Start Time"
                                   name="tiers[0].startTime"
                                   parse={[Function]}
-                                  side="left"
+                                  readOnly={true}
                                   type="datetime-local"
                                 >
                                   <InputField2
                                     description="Date and time when the tier starts. Can't be in the past from the current moment."
                                     disabled={true}
-                                    errorStyle={
-                                      Object {
-                                        "color": "red",
-                                        "fontSize": "12px",
-                                        "fontWeight": "bold",
-                                        "height": "20px",
-                                        "width": "100%",
-                                      }
-                                    }
                                     input={
                                       Object {
                                         "name": "tiers[0].startTime",
@@ -3587,7 +3549,7 @@ exports[`ManageForm should render the component with tiers 1`] = `
                                         "visited": false,
                                       }
                                     }
-                                    side="left"
+                                    readOnly={true}
                                     type="datetime-local"
                                   >
                                     <div
@@ -3618,17 +3580,18 @@ exports[`ManageForm should render the component with tiers 1`] = `
                                         </div>
                                       </FormControlTitle>
                                       <TextField
-                                        autoComplete="off"
                                         disabled={true}
                                         id="tiers[0].startTime"
                                         name="tiers[0].startTime"
                                         onBlur={[Function]}
                                         onChange={[Function]}
                                         onFocus={[Function]}
+                                        readOnly={true}
                                         type="datetime-local"
                                         value="2018-04-13T16:07"
                                       >
                                         <input
+                                          autoComplete="off"
                                           className="sw-TextField"
                                           disabled={true}
                                           id="tiers[0].startTime"
@@ -3636,6 +3599,7 @@ exports[`ManageForm should render the component with tiers 1`] = `
                                           onBlur={[Function]}
                                           onChange={[Function]}
                                           onFocus={[Function]}
+                                          readOnly={true}
                                           type="datetime-local"
                                           value="2018-04-13T16:07"
                                         />
@@ -3661,54 +3625,31 @@ exports[`ManageForm should render the component with tiers 1`] = `
                                   </InputField2>
                                 </Field>
                               </CrowdsaleStartTime>
+                            </div>
+                            <div
+                              className="mng-ManageTierBlock_Item"
+                            >
                               <CrowdsaleEndTime
                                 disabled={false}
-                                errorStyle={
-                                  Object {
-                                    "color": "red",
-                                    "fontSize": "12px",
-                                    "fontWeight": "bold",
-                                    "height": "20px",
-                                    "width": "100%",
-                                  }
-                                }
                                 index={0}
                                 name="tiers[0].endTime"
-                                side="right"
+                                readOnly={false}
                               >
                                 <Field
                                   component={[Function]}
                                   description="Date and time when the tier ends. Can be only in the future."
                                   disabled={false}
-                                  errorStyle={
-                                    Object {
-                                      "color": "red",
-                                      "fontSize": "12px",
-                                      "fontWeight": "bold",
-                                      "height": "20px",
-                                      "width": "100%",
-                                    }
-                                  }
                                   format={[Function]}
                                   label="End Time"
                                   name="tiers[0].endTime"
                                   parse={[Function]}
-                                  side="right"
+                                  readOnly={false}
                                   type="datetime-local"
                                   validate={[Function]}
                                 >
                                   <InputField2
                                     description="Date and time when the tier ends. Can be only in the future."
                                     disabled={false}
-                                    errorStyle={
-                                      Object {
-                                        "color": "red",
-                                        "fontSize": "12px",
-                                        "fontWeight": "bold",
-                                        "height": "20px",
-                                        "width": "100%",
-                                      }
-                                    }
                                     input={
                                       Object {
                                         "name": "tiers[0].endTime",
@@ -3737,7 +3678,7 @@ exports[`ManageForm should render the component with tiers 1`] = `
                                         "visited": false,
                                       }
                                     }
-                                    side="right"
+                                    readOnly={false}
                                     type="datetime-local"
                                   >
                                     <div
@@ -3768,17 +3709,18 @@ exports[`ManageForm should render the component with tiers 1`] = `
                                         </div>
                                       </FormControlTitle>
                                       <TextField
-                                        autoComplete="off"
                                         disabled={false}
                                         id="tiers[0].endTime"
                                         name="tiers[0].endTime"
                                         onBlur={[Function]}
                                         onChange={[Function]}
                                         onFocus={[Function]}
+                                        readOnly={false}
                                         type="datetime-local"
                                         value="2018-04-17T00:00"
                                       >
                                         <input
+                                          autoComplete="off"
                                           className="sw-TextField"
                                           disabled={false}
                                           id="tiers[0].endTime"
@@ -3786,6 +3728,7 @@ exports[`ManageForm should render the component with tiers 1`] = `
                                           onBlur={[Function]}
                                           onChange={[Function]}
                                           onFocus={[Function]}
+                                          readOnly={false}
                                           type="datetime-local"
                                           value="2018-04-17T00:00"
                                         />
@@ -3813,55 +3756,28 @@ exports[`ManageForm should render the component with tiers 1`] = `
                               </CrowdsaleEndTime>
                             </div>
                             <div
-                              className="input-block-container"
+                              className="mng-ManageTierBlock_Item"
                             >
                               <CrowdsaleRate
                                 disabled={true}
-                                errorStyle={
-                                  Object {
-                                    "color": "red",
-                                    "fontSize": "12px",
-                                    "fontWeight": "bold",
-                                    "height": "20px",
-                                    "width": "100%",
-                                  }
-                                }
                                 name="tiers[0].rate"
-                                side="left"
+                                readOnly={true}
                               >
                                 <Field
                                   component={[Function]}
                                   description="Exchange rate Ethereum to Tokens. If it's 100, then for 1 Ether you can buy 100 tokens"
                                   disabled={true}
-                                  errorStyle={
-                                    Object {
-                                      "color": "red",
-                                      "fontSize": "12px",
-                                      "fontWeight": "bold",
-                                      "height": "20px",
-                                      "width": "100%",
-                                    }
-                                  }
                                   format={[Function]}
                                   label="Rate"
                                   name="tiers[0].rate"
                                   parse={[Function]}
                                   placeholder="Enter here"
-                                  side="left"
+                                  readOnly={true}
                                   type="text"
                                 >
                                   <InputField2
                                     description="Exchange rate Ethereum to Tokens. If it's 100, then for 1 Ether you can buy 100 tokens"
                                     disabled={true}
-                                    errorStyle={
-                                      Object {
-                                        "color": "red",
-                                        "fontSize": "12px",
-                                        "fontWeight": "bold",
-                                        "height": "20px",
-                                        "width": "100%",
-                                      }
-                                    }
                                     input={
                                       Object {
                                         "name": "tiers[0].rate",
@@ -3891,7 +3807,7 @@ exports[`ManageForm should render the component with tiers 1`] = `
                                       }
                                     }
                                     placeholder="Enter here"
-                                    side="left"
+                                    readOnly={true}
                                     type="text"
                                   >
                                     <div
@@ -3922,7 +3838,6 @@ exports[`ManageForm should render the component with tiers 1`] = `
                                         </div>
                                       </FormControlTitle>
                                       <TextField
-                                        autoComplete="off"
                                         disabled={true}
                                         id="tiers[0].rate"
                                         name="tiers[0].rate"
@@ -3930,10 +3845,12 @@ exports[`ManageForm should render the component with tiers 1`] = `
                                         onChange={[Function]}
                                         onFocus={[Function]}
                                         placeholder="Enter here"
+                                        readOnly={true}
                                         type="text"
                                         value="123"
                                       >
                                         <input
+                                          autoComplete="off"
                                           className="sw-TextField"
                                           disabled={true}
                                           id="tiers[0].rate"
@@ -3942,6 +3859,7 @@ exports[`ManageForm should render the component with tiers 1`] = `
                                           onChange={[Function]}
                                           onFocus={[Function]}
                                           placeholder="Enter here"
+                                          readOnly={true}
                                           type="text"
                                           value="123"
                                         />
@@ -3967,54 +3885,31 @@ exports[`ManageForm should render the component with tiers 1`] = `
                                   </InputField2>
                                 </Field>
                               </CrowdsaleRate>
+                            </div>
+                            <div
+                              className="mng-ManageTierBlock_Item"
+                            >
                               <Supply
                                 disabled={true}
-                                errorStyle={
-                                  Object {
-                                    "color": "red",
-                                    "fontSize": "12px",
-                                    "fontWeight": "bold",
-                                    "height": "20px",
-                                    "width": "100%",
-                                  }
-                                }
                                 name="tiers[0].supply"
-                                side="right"
+                                readOnly={true}
                               >
                                 <Field
                                   component={[Function]}
                                   description="How many tokens will be sold on this tier. Cap of crowdsale equals to sum of supply of all tiers"
                                   disabled={true}
-                                  errorStyle={
-                                    Object {
-                                      "color": "red",
-                                      "fontSize": "12px",
-                                      "fontWeight": "bold",
-                                      "height": "20px",
-                                      "width": "100%",
-                                    }
-                                  }
                                   format={[Function]}
                                   label="Supply"
                                   name="tiers[0].supply"
                                   parse={[Function]}
                                   placeholder="Enter here"
-                                  side="right"
+                                  readOnly={true}
                                   type="text"
                                   val={null}
                                 >
                                   <InputField2
                                     description="How many tokens will be sold on this tier. Cap of crowdsale equals to sum of supply of all tiers"
                                     disabled={true}
-                                    errorStyle={
-                                      Object {
-                                        "color": "red",
-                                        "fontSize": "12px",
-                                        "fontWeight": "bold",
-                                        "height": "20px",
-                                        "width": "100%",
-                                      }
-                                    }
                                     input={
                                       Object {
                                         "name": "tiers[0].supply",
@@ -4044,7 +3939,7 @@ exports[`ManageForm should render the component with tiers 1`] = `
                                       }
                                     }
                                     placeholder="Enter here"
-                                    side="right"
+                                    readOnly={true}
                                     type="text"
                                     val={null}
                                   >
@@ -4076,7 +3971,6 @@ exports[`ManageForm should render the component with tiers 1`] = `
                                         </div>
                                       </FormControlTitle>
                                       <TextField
-                                        autoComplete="off"
                                         disabled={true}
                                         id="tiers[0].supply"
                                         name="tiers[0].supply"
@@ -4084,10 +3978,12 @@ exports[`ManageForm should render the component with tiers 1`] = `
                                         onChange={[Function]}
                                         onFocus={[Function]}
                                         placeholder="Enter here"
+                                        readOnly={true}
                                         type="text"
                                         value="132"
                                       >
                                         <input
+                                          autoComplete="off"
                                           className="sw-TextField"
                                           disabled={true}
                                           id="tiers[0].supply"
@@ -4096,6 +3992,7 @@ exports[`ManageForm should render the component with tiers 1`] = `
                                           onChange={[Function]}
                                           onFocus={[Function]}
                                           placeholder="Enter here"
+                                          readOnly={true}
                                           type="text"
                                           value="132"
                                         />
@@ -4123,39 +4020,21 @@ exports[`ManageForm should render the component with tiers 1`] = `
                               </Supply>
                             </div>
                             <div
-                              className="input-block-container"
+                              className="mng-ManageTierBlock_Item"
                             >
                               <Field
                                 component={[Function]}
                                 disabled={false}
-                                errorStyle={
-                                  Object {
-                                    "color": "red",
-                                    "fontSize": "12px",
-                                    "fontWeight": "bold",
-                                    "height": "20px",
-                                    "width": "100%",
-                                  }
-                                }
                                 format={[Function]}
                                 label="Contributor min cap"
                                 name="tiers[0].minCap"
                                 parse={[Function]}
-                                side="left"
+                                readOnly={false}
                                 type="number"
                                 validate={[Function]}
                               >
                                 <InputField2
                                   disabled={false}
-                                  errorStyle={
-                                    Object {
-                                      "color": "red",
-                                      "fontSize": "12px",
-                                      "fontWeight": "bold",
-                                      "height": "20px",
-                                      "width": "100%",
-                                    }
-                                  }
                                   input={
                                     Object {
                                       "name": "tiers[0].minCap",
@@ -4186,7 +4065,7 @@ exports[`ManageForm should render the component with tiers 1`] = `
                                       "visited": false,
                                     }
                                   }
-                                  side="left"
+                                  readOnly={false}
                                   type="number"
                                 >
                                   <div
@@ -4206,17 +4085,18 @@ exports[`ManageForm should render the component with tiers 1`] = `
                                       </div>
                                     </FormControlTitle>
                                     <TextField
-                                      autoComplete="off"
                                       disabled={false}
                                       id="tiers[0].minCap"
                                       name="tiers[0].minCap"
                                       onBlur={[Function]}
                                       onChange={[Function]}
                                       onFocus={[Function]}
+                                      readOnly={false}
                                       type="number"
                                       value="0"
                                     >
                                       <input
+                                        autoComplete="off"
                                         className="sw-TextField"
                                         disabled={false}
                                         id="tiers[0].minCap"
@@ -4224,6 +4104,7 @@ exports[`ManageForm should render the component with tiers 1`] = `
                                         onBlur={[Function]}
                                         onChange={[Function]}
                                         onFocus={[Function]}
+                                        readOnly={false}
                                         type="number"
                                         value="0"
                                       />
@@ -4251,110 +4132,42 @@ exports[`ManageForm should render the component with tiers 1`] = `
                             </div>
                           </div>
                         </div>
-                      </div>
-                      <div
-                        className="steps"
-                        key="1"
-                      >
                         <div
-                          className="steps-content container"
+                          className="mng-ManageTierBlock_Content"
+                          key="1"
                         >
+                          <h3
+                            className="mng-ManageTierBlock_Title"
+                          >
+                            Tier Name: 
+                            Tier 2
+                          </h3>
                           <div
-                            className=""
+                            className="mng-ManageTierBlock_ItemsContainer"
                           >
                             <div
-                              className="input-block-container"
-                            >
-                              <InputField
-                                disabled={true}
-                                name="tiers[1].crowdsale_name"
-                                side="left"
-                                title="Tier setup name"
-                                type="text"
-                                value="Tier 2"
-                              >
-                                <div
-                                  className="sw-InputField "
-                                >
-                                  <FormControlTitle
-                                    title="Tier setup name"
-                                  >
-                                    <div
-                                      className="sw-FormControlTitle"
-                                    >
-                                      <label
-                                        className="sw-FormControlTitle_Label"
-                                      >
-                                        Tier setup name
-                                      </label>
-                                    </div>
-                                  </FormControlTitle>
-                                  <TextField
-                                    disabled={true}
-                                    id="tiers[1].crowdsale_name"
-                                    type="text"
-                                    value="Tier 2"
-                                  >
-                                    <input
-                                      className="sw-TextField"
-                                      disabled={true}
-                                      type="text"
-                                      value="Tier 2"
-                                    />
-                                  </TextField>
-                                </div>
-                              </InputField>
-                            </div>
-                            <div
-                              className="input-block-container"
+                              className="mng-ManageTierBlock_Item"
                             >
                               <CrowdsaleStartTime
                                 disabled={true}
-                                errorStyle={
-                                  Object {
-                                    "color": "red",
-                                    "fontSize": "12px",
-                                    "fontWeight": "bold",
-                                    "height": "20px",
-                                    "width": "100%",
-                                  }
-                                }
                                 index={1}
                                 name="tiers[1].startTime"
-                                side="left"
+                                readOnly={true}
                               >
                                 <Field
                                   component={[Function]}
                                   description="Date and time when the tier starts. Can't be in the past from the current moment."
                                   disabled={true}
-                                  errorStyle={
-                                    Object {
-                                      "color": "red",
-                                      "fontSize": "12px",
-                                      "fontWeight": "bold",
-                                      "height": "20px",
-                                      "width": "100%",
-                                    }
-                                  }
                                   format={[Function]}
                                   label="Start Time"
                                   name="tiers[1].startTime"
                                   parse={[Function]}
-                                  side="left"
+                                  readOnly={true}
                                   type="datetime-local"
                                 >
                                   <InputField2
                                     description="Date and time when the tier starts. Can't be in the past from the current moment."
                                     disabled={true}
-                                    errorStyle={
-                                      Object {
-                                        "color": "red",
-                                        "fontSize": "12px",
-                                        "fontWeight": "bold",
-                                        "height": "20px",
-                                        "width": "100%",
-                                      }
-                                    }
                                     input={
                                       Object {
                                         "name": "tiers[1].startTime",
@@ -4383,7 +4196,7 @@ exports[`ManageForm should render the component with tiers 1`] = `
                                         "visited": false,
                                       }
                                     }
-                                    side="left"
+                                    readOnly={true}
                                     type="datetime-local"
                                   >
                                     <div
@@ -4414,17 +4227,18 @@ exports[`ManageForm should render the component with tiers 1`] = `
                                         </div>
                                       </FormControlTitle>
                                       <TextField
-                                        autoComplete="off"
                                         disabled={true}
                                         id="tiers[1].startTime"
                                         name="tiers[1].startTime"
                                         onBlur={[Function]}
                                         onChange={[Function]}
                                         onFocus={[Function]}
+                                        readOnly={true}
                                         type="datetime-local"
                                         value="2018-04-17T00:00"
                                       >
                                         <input
+                                          autoComplete="off"
                                           className="sw-TextField"
                                           disabled={true}
                                           id="tiers[1].startTime"
@@ -4432,6 +4246,7 @@ exports[`ManageForm should render the component with tiers 1`] = `
                                           onBlur={[Function]}
                                           onChange={[Function]}
                                           onFocus={[Function]}
+                                          readOnly={true}
                                           type="datetime-local"
                                           value="2018-04-17T00:00"
                                         />
@@ -4457,53 +4272,30 @@ exports[`ManageForm should render the component with tiers 1`] = `
                                   </InputField2>
                                 </Field>
                               </CrowdsaleStartTime>
+                            </div>
+                            <div
+                              className="mng-ManageTierBlock_Item"
+                            >
                               <CrowdsaleEndTime
                                 disabled={true}
-                                errorStyle={
-                                  Object {
-                                    "color": "red",
-                                    "fontSize": "12px",
-                                    "fontWeight": "bold",
-                                    "height": "20px",
-                                    "width": "100%",
-                                  }
-                                }
                                 index={1}
                                 name="tiers[1].endTime"
-                                side="right"
+                                readOnly={true}
                               >
                                 <Field
                                   component={[Function]}
                                   description="Date and time when the tier ends. Can be only in the future."
                                   disabled={true}
-                                  errorStyle={
-                                    Object {
-                                      "color": "red",
-                                      "fontSize": "12px",
-                                      "fontWeight": "bold",
-                                      "height": "20px",
-                                      "width": "100%",
-                                    }
-                                  }
                                   format={[Function]}
                                   label="End Time"
                                   name="tiers[1].endTime"
                                   parse={[Function]}
-                                  side="right"
+                                  readOnly={true}
                                   type="datetime-local"
                                 >
                                   <InputField2
                                     description="Date and time when the tier ends. Can be only in the future."
                                     disabled={true}
-                                    errorStyle={
-                                      Object {
-                                        "color": "red",
-                                        "fontSize": "12px",
-                                        "fontWeight": "bold",
-                                        "height": "20px",
-                                        "width": "100%",
-                                      }
-                                    }
                                     input={
                                       Object {
                                         "name": "tiers[1].endTime",
@@ -4532,7 +4324,7 @@ exports[`ManageForm should render the component with tiers 1`] = `
                                         "visited": false,
                                       }
                                     }
-                                    side="right"
+                                    readOnly={true}
                                     type="datetime-local"
                                   >
                                     <div
@@ -4563,17 +4355,18 @@ exports[`ManageForm should render the component with tiers 1`] = `
                                         </div>
                                       </FormControlTitle>
                                       <TextField
-                                        autoComplete="off"
                                         disabled={true}
                                         id="tiers[1].endTime"
                                         name="tiers[1].endTime"
                                         onBlur={[Function]}
                                         onChange={[Function]}
                                         onFocus={[Function]}
+                                        readOnly={true}
                                         type="datetime-local"
                                         value="2018-04-21T00:00"
                                       >
                                         <input
+                                          autoComplete="off"
                                           className="sw-TextField"
                                           disabled={true}
                                           id="tiers[1].endTime"
@@ -4581,6 +4374,7 @@ exports[`ManageForm should render the component with tiers 1`] = `
                                           onBlur={[Function]}
                                           onChange={[Function]}
                                           onFocus={[Function]}
+                                          readOnly={true}
                                           type="datetime-local"
                                           value="2018-04-21T00:00"
                                         />
@@ -4608,55 +4402,28 @@ exports[`ManageForm should render the component with tiers 1`] = `
                               </CrowdsaleEndTime>
                             </div>
                             <div
-                              className="input-block-container"
+                              className="mng-ManageTierBlock_Item"
                             >
                               <CrowdsaleRate
                                 disabled={true}
-                                errorStyle={
-                                  Object {
-                                    "color": "red",
-                                    "fontSize": "12px",
-                                    "fontWeight": "bold",
-                                    "height": "20px",
-                                    "width": "100%",
-                                  }
-                                }
                                 name="tiers[1].rate"
-                                side="left"
+                                readOnly={true}
                               >
                                 <Field
                                   component={[Function]}
                                   description="Exchange rate Ethereum to Tokens. If it's 100, then for 1 Ether you can buy 100 tokens"
                                   disabled={true}
-                                  errorStyle={
-                                    Object {
-                                      "color": "red",
-                                      "fontSize": "12px",
-                                      "fontWeight": "bold",
-                                      "height": "20px",
-                                      "width": "100%",
-                                    }
-                                  }
                                   format={[Function]}
                                   label="Rate"
                                   name="tiers[1].rate"
                                   parse={[Function]}
                                   placeholder="Enter here"
-                                  side="left"
+                                  readOnly={true}
                                   type="text"
                                 >
                                   <InputField2
                                     description="Exchange rate Ethereum to Tokens. If it's 100, then for 1 Ether you can buy 100 tokens"
                                     disabled={true}
-                                    errorStyle={
-                                      Object {
-                                        "color": "red",
-                                        "fontSize": "12px",
-                                        "fontWeight": "bold",
-                                        "height": "20px",
-                                        "width": "100%",
-                                      }
-                                    }
                                     input={
                                       Object {
                                         "name": "tiers[1].rate",
@@ -4686,7 +4453,7 @@ exports[`ManageForm should render the component with tiers 1`] = `
                                       }
                                     }
                                     placeholder="Enter here"
-                                    side="left"
+                                    readOnly={true}
                                     type="text"
                                   >
                                     <div
@@ -4717,7 +4484,6 @@ exports[`ManageForm should render the component with tiers 1`] = `
                                         </div>
                                       </FormControlTitle>
                                       <TextField
-                                        autoComplete="off"
                                         disabled={true}
                                         id="tiers[1].rate"
                                         name="tiers[1].rate"
@@ -4725,10 +4491,12 @@ exports[`ManageForm should render the component with tiers 1`] = `
                                         onChange={[Function]}
                                         onFocus={[Function]}
                                         placeholder="Enter here"
+                                        readOnly={true}
                                         type="text"
                                         value="55"
                                       >
                                         <input
+                                          autoComplete="off"
                                           className="sw-TextField"
                                           disabled={true}
                                           id="tiers[1].rate"
@@ -4737,6 +4505,7 @@ exports[`ManageForm should render the component with tiers 1`] = `
                                           onChange={[Function]}
                                           onFocus={[Function]}
                                           placeholder="Enter here"
+                                          readOnly={true}
                                           type="text"
                                           value="55"
                                         />
@@ -4762,54 +4531,31 @@ exports[`ManageForm should render the component with tiers 1`] = `
                                   </InputField2>
                                 </Field>
                               </CrowdsaleRate>
+                            </div>
+                            <div
+                              className="mng-ManageTierBlock_Item"
+                            >
                               <Supply
                                 disabled={true}
-                                errorStyle={
-                                  Object {
-                                    "color": "red",
-                                    "fontSize": "12px",
-                                    "fontWeight": "bold",
-                                    "height": "20px",
-                                    "width": "100%",
-                                  }
-                                }
                                 name="tiers[1].supply"
-                                side="right"
+                                readOnly={true}
                               >
                                 <Field
                                   component={[Function]}
                                   description="How many tokens will be sold on this tier. Cap of crowdsale equals to sum of supply of all tiers"
                                   disabled={true}
-                                  errorStyle={
-                                    Object {
-                                      "color": "red",
-                                      "fontSize": "12px",
-                                      "fontWeight": "bold",
-                                      "height": "20px",
-                                      "width": "100%",
-                                    }
-                                  }
                                   format={[Function]}
                                   label="Supply"
                                   name="tiers[1].supply"
                                   parse={[Function]}
                                   placeholder="Enter here"
-                                  side="right"
+                                  readOnly={true}
                                   type="text"
                                   val={null}
                                 >
                                   <InputField2
                                     description="How many tokens will be sold on this tier. Cap of crowdsale equals to sum of supply of all tiers"
                                     disabled={true}
-                                    errorStyle={
-                                      Object {
-                                        "color": "red",
-                                        "fontSize": "12px",
-                                        "fontWeight": "bold",
-                                        "height": "20px",
-                                        "width": "100%",
-                                      }
-                                    }
                                     input={
                                       Object {
                                         "name": "tiers[1].supply",
@@ -4839,7 +4585,7 @@ exports[`ManageForm should render the component with tiers 1`] = `
                                       }
                                     }
                                     placeholder="Enter here"
-                                    side="right"
+                                    readOnly={true}
                                     type="text"
                                     val={null}
                                   >
@@ -4871,7 +4617,6 @@ exports[`ManageForm should render the component with tiers 1`] = `
                                         </div>
                                       </FormControlTitle>
                                       <TextField
-                                        autoComplete="off"
                                         disabled={true}
                                         id="tiers[1].supply"
                                         name="tiers[1].supply"
@@ -4879,10 +4624,12 @@ exports[`ManageForm should render the component with tiers 1`] = `
                                         onChange={[Function]}
                                         onFocus={[Function]}
                                         placeholder="Enter here"
+                                        readOnly={true}
                                         type="text"
                                         value="156"
                                       >
                                         <input
+                                          autoComplete="off"
                                           className="sw-TextField"
                                           disabled={true}
                                           id="tiers[1].supply"
@@ -4891,6 +4638,7 @@ exports[`ManageForm should render the component with tiers 1`] = `
                                           onChange={[Function]}
                                           onFocus={[Function]}
                                           placeholder="Enter here"
+                                          readOnly={true}
                                           type="text"
                                           value="156"
                                         />
@@ -4918,39 +4666,21 @@ exports[`ManageForm should render the component with tiers 1`] = `
                               </Supply>
                             </div>
                             <div
-                              className="input-block-container"
+                              className="mng-ManageTierBlock_Item"
                             >
                               <Field
                                 component={[Function]}
                                 disabled={true}
-                                errorStyle={
-                                  Object {
-                                    "color": "red",
-                                    "fontSize": "12px",
-                                    "fontWeight": "bold",
-                                    "height": "20px",
-                                    "width": "100%",
-                                  }
-                                }
                                 format={[Function]}
                                 label="Contributor min cap"
                                 name="tiers[1].minCap"
                                 parse={[Function]}
-                                side="left"
+                                readOnly={true}
                                 type="number"
                                 validate={[Function]}
                               >
                                 <InputField2
                                   disabled={true}
-                                  errorStyle={
-                                    Object {
-                                      "color": "red",
-                                      "fontSize": "12px",
-                                      "fontWeight": "bold",
-                                      "height": "20px",
-                                      "width": "100%",
-                                    }
-                                  }
                                   input={
                                     Object {
                                       "name": "tiers[1].minCap",
@@ -4981,7 +4711,7 @@ exports[`ManageForm should render the component with tiers 1`] = `
                                       "visited": false,
                                     }
                                   }
-                                  side="left"
+                                  readOnly={true}
                                   type="number"
                                 >
                                   <div
@@ -5001,17 +4731,18 @@ exports[`ManageForm should render the component with tiers 1`] = `
                                       </div>
                                     </FormControlTitle>
                                     <TextField
-                                      autoComplete="off"
                                       disabled={true}
                                       id="tiers[1].minCap"
                                       name="tiers[1].minCap"
                                       onBlur={[Function]}
                                       onChange={[Function]}
                                       onFocus={[Function]}
+                                      readOnly={true}
                                       type="number"
                                       value="0"
                                     >
                                       <input
+                                        autoComplete="off"
                                         className="sw-TextField"
                                         disabled={true}
                                         id="tiers[1].minCap"
@@ -5019,6 +4750,7 @@ exports[`ManageForm should render the component with tiers 1`] = `
                                         onBlur={[Function]}
                                         onChange={[Function]}
                                         onFocus={[Function]}
+                                        readOnly={true}
                                         type="number"
                                         value="0"
                                       />
@@ -5047,162 +4779,164 @@ exports[`ManageForm should render the component with tiers 1`] = `
                           </div>
                         </div>
                       </div>
-                    </div>
-                  </_class>
-                </inject-_class-with-crowdsaleStore-tokenStore>
-              </ReactFinalFormFieldArray(4.6.1)(undefined)>
-              <FormSpy
-                onChange={
-                  [MockFunction] {
-                    "calls": Array [
-                      Array [
-                        Object {
-                          "values": Object {
-                            "tiers": Array [
-                              Object {
-                                "addresses": Object {
-                                  "crowdsaleAddress": "0x42a7b7dd785cd69714a189dffb3fd7d7174edc9ece837694ce50f7078f7c31ae",
-                                },
-                                "duration": "1528827423500",
-                                "endTime": "2018-04-17T00:00",
-                                "index": "0",
-                                "isWhitelisted": "yes",
-                                "minCap": "0",
-                                "rate": "123",
-                                "startTime": "2018-04-13T16:07",
-                                "supply": "132",
-                                "tier": "Tier 1",
-                                "updatable": true,
-                                "whitelist": Array [
-                                  Object {
-                                    "addr": "0x22d491Bde2303f2f43325b2108D26f1eAbA1e32b",
-                                    "max": 50505,
-                                    "min": 1234,
-                                    "stored": true,
-                                  },
-                                  Object {
-                                    "addr": "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
-                                    "max": 50505,
-                                    "min": 1234,
-                                    "stored": true,
-                                  },
-                                  Object {
-                                    "addr": "0xE11BA2b4D45Eaed5996Cd0823791E0C93114882d",
-                                    "max": 50505,
-                                    "min": 1234,
-                                    "stored": true,
-                                  },
-                                  Object {
-                                    "addr": "0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0",
-                                    "max": 50505,
-                                    "min": 1234,
-                                    "stored": true,
+                    </_class>
+                  </inject-_class-with-crowdsaleStore-tokenStore>
+                </ReactFinalFormFieldArray(4.6.1)(undefined)>
+                <FormSpy
+                  onChange={
+                    [MockFunction] {
+                      "calls": Array [
+                        Array [
+                          Object {
+                            "values": Object {
+                              "tiers": Array [
+                                Object {
+                                  "addresses": Object {
+                                    "crowdsaleAddress": "0x42a7b7dd785cd69714a189dffb3fd7d7174edc9ece837694ce50f7078f7c31ae",
                                   },
-                                ],
-                              },
-                              Object {
-                                "addresses": Object {
-                                  "crowdsaleAddress": "0x42a7b7dd785cd69714a189dffb3fd7d7174edc9ece837694ce50f7078f7c31ae",
+                                  "duration": "1528827423500",
+                                  "endTime": "2018-04-17T00:00",
+                                  "index": "0",
+                                  "isWhitelisted": "yes",
+                                  "minCap": "0",
+                                  "rate": "123",
+                                  "startTime": "2018-04-13T16:07",
+                                  "supply": "132",
+                                  "tier": "Tier 1",
+                                  "updatable": true,
+                                  "whitelist": Array [
+                                    Object {
+                                      "addr": "0x22d491Bde2303f2f43325b2108D26f1eAbA1e32b",
+                                      "max": 50505,
+                                      "min": 1234,
+                                      "stored": true,
+                                    },
+                                    Object {
+                                      "addr": "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
+                                      "max": 50505,
+                                      "min": 1234,
+                                      "stored": true,
+                                    },
+                                    Object {
+                                      "addr": "0xE11BA2b4D45Eaed5996Cd0823791E0C93114882d",
+                                      "max": 50505,
+                                      "min": 1234,
+                                      "stored": true,
+                                    },
+                                    Object {
+                                      "addr": "0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0",
+                                      "max": 50505,
+                                      "min": 1234,
+                                      "stored": true,
+                                    },
+                                  ],
                                 },
-                                "duration": "1528827423500",
-                                "endTime": "2018-04-21T00:00",
-                                "index": "1",
-                                "isWhitelisted": "yes",
-                                "minCap": "0",
-                                "rate": "55",
-                                "startTime": "2018-04-17T00:00",
-                                "supply": "156",
-                                "tier": "Tier 2",
-                                "updatable": false,
-                                "whitelist": Array [
-                                  Object {
-                                    "addr": "0x1dF62f291b2E969fB0849d99D9Ce41e2F137006e",
-                                    "max": 50505,
-                                    "min": 1234,
-                                    "stored": true,
-                                  },
-                                  Object {
-                                    "addr": "0x22d491Bde2303f2f43325b2108D26f1eAbA1e32b",
-                                    "max": 50505,
-                                    "min": 1234,
-                                    "stored": true,
-                                  },
-                                  Object {
-                                    "addr": "0x3E5e9111Ae8eB78Fe1CC3bb8915d5D461F3Ef9A9",
-                                    "max": 50505,
-                                    "min": 1234,
-                                    "stored": true,
-                                  },
-                                  Object {
-                                    "addr": "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
-                                    "max": 50505,
-                                    "min": 1234,
-                                    "stored": true,
-                                  },
-                                  Object {
-                                    "addr": "0x95cED938F7991cd0dFcb48F0a06a40FA1aF46EBC",
-                                    "max": 50505,
-                                    "min": 1234,
-                                    "stored": true,
+                                Object {
+                                  "addresses": Object {
+                                    "crowdsaleAddress": "0x42a7b7dd785cd69714a189dffb3fd7d7174edc9ece837694ce50f7078f7c31ae",
                                   },
-                                  Object {
-                                    "addr": "0xACa94ef8bD5ffEE41947b4585a84BdA5a3d3DA6E",
-                                    "max": 50505,
-                                    "min": 1234,
-                                    "stored": true,
-                                  },
-                                  Object {
-                                    "addr": "0xd03ea8624C8C5987235048901fB614fDcA89b117",
-                                    "max": 50505,
-                                    "min": 1234,
-                                    "stored": true,
-                                  },
-                                  Object {
-                                    "addr": "0xE11BA2b4D45Eaed5996Cd0823791E0C93114882d",
-                                    "max": 50505,
-                                    "min": 1234,
-                                    "stored": true,
-                                  },
-                                  Object {
-                                    "addr": "0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0",
-                                    "max": 50505,
-                                    "min": 1234,
-                                    "stored": true,
-                                  },
-                                ],
-                              },
-                            ],
+                                  "duration": "1528827423500",
+                                  "endTime": "2018-04-21T00:00",
+                                  "index": "1",
+                                  "isWhitelisted": "yes",
+                                  "minCap": "0",
+                                  "rate": "55",
+                                  "startTime": "2018-04-17T00:00",
+                                  "supply": "156",
+                                  "tier": "Tier 2",
+                                  "updatable": false,
+                                  "whitelist": Array [
+                                    Object {
+                                      "addr": "0x1dF62f291b2E969fB0849d99D9Ce41e2F137006e",
+                                      "max": 50505,
+                                      "min": 1234,
+                                      "stored": true,
+                                    },
+                                    Object {
+                                      "addr": "0x22d491Bde2303f2f43325b2108D26f1eAbA1e32b",
+                                      "max": 50505,
+                                      "min": 1234,
+                                      "stored": true,
+                                    },
+                                    Object {
+                                      "addr": "0x3E5e9111Ae8eB78Fe1CC3bb8915d5D461F3Ef9A9",
+                                      "max": 50505,
+                                      "min": 1234,
+                                      "stored": true,
+                                    },
+                                    Object {
+                                      "addr": "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
+                                      "max": 50505,
+                                      "min": 1234,
+                                      "stored": true,
+                                    },
+                                    Object {
+                                      "addr": "0x95cED938F7991cd0dFcb48F0a06a40FA1aF46EBC",
+                                      "max": 50505,
+                                      "min": 1234,
+                                      "stored": true,
+                                    },
+                                    Object {
+                                      "addr": "0xACa94ef8bD5ffEE41947b4585a84BdA5a3d3DA6E",
+                                      "max": 50505,
+                                      "min": 1234,
+                                      "stored": true,
+                                    },
+                                    Object {
+                                      "addr": "0xd03ea8624C8C5987235048901fB614fDcA89b117",
+                                      "max": 50505,
+                                      "min": 1234,
+                                      "stored": true,
+                                    },
+                                    Object {
+                                      "addr": "0xE11BA2b4D45Eaed5996Cd0823791E0C93114882d",
+                                      "max": 50505,
+                                      "min": 1234,
+                                      "stored": true,
+                                    },
+                                    Object {
+                                      "addr": "0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0",
+                                      "max": 50505,
+                                      "min": 1234,
+                                      "stored": true,
+                                    },
+                                  ],
+                                },
+                              ],
+                            },
                           },
+                        ],
+                      ],
+                      "results": Array [
+                        Object {
+                          "isThrow": false,
+                          "value": undefined,
                         },
                       ],
-                    ],
-                    "results": Array [
-                      Object {
-                        "isThrow": false,
-                        "value": undefined,
-                      },
-                    ],
+                    }
                   }
-                }
-                subscription={
-                  Object {
-                    "values": true,
+                  subscription={
+                    Object {
+                      "values": true,
+                    }
                   }
-                }
-              />
-              <div
-                className="steps"
-              >
+                />
                 <div
-                  className="button-container"
+                  className="mng-ManageForm_ButtonsContainer"
                 >
-                  <button
-                    className="no_arrow button button_fill button_no_border button_disabled"
+                  <Button
+                    buttonText="Save"
                     disabled={true}
                     type="submit"
                   >
-                    Save
-                  </button>
+                    <button
+                      className="sw-Button "
+                      disabled={true}
+                      type="submit"
+                    >
+                      Save
+                    </button>
+                  </Button>
                 </div>
               </div>
             </form>
diff --git a/test/components/Manage/__snapshots__/ManageTierBlock.spec.js.snap b/test/components/Manage/__snapshots__/ManageTierBlock.spec.js.snap
new file mode 100644
index 000000000..8d3095b55
--- /dev/null
+++ b/test/components/Manage/__snapshots__/ManageTierBlock.spec.js.snap
@@ -0,0 +1,839 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ManageTierBlock should render the ManageTierBlock component with tiers for Dutch Auction Crowdsale 1`] = `
+<div
+  className="mng-ManageTierBlock"
+>
+  <div
+    className="mng-ManageTierBlock_Content"
+  >
+    <h3
+      className="mng-ManageTierBlock_Title"
+    >
+      Tier Name: 
+      Tier 1
+    </h3>
+    <div
+      className="mng-ManageTierBlock_ItemsContainer"
+    >
+      <div
+        className="mng-ManageTierBlock_Item"
+      >
+        <div
+          className="sw-InputField2 "
+        >
+          <div
+            className="sw-FormControlTitle"
+          >
+            <label
+              className="sw-FormControlTitle_Label"
+            >
+              Start Time
+            </label>
+            <div
+              className="sw-FormControlTitle_Info"
+              tabIndex="-1"
+            >
+              <span
+                className="sw-FormControlTitle_Tooltip"
+              >
+                Date and time when the tier starts. Can't be in the past from the current moment.
+              </span>
+            </div>
+          </div>
+          <input
+            autoComplete="off"
+            className="sw-TextField"
+            disabled={true}
+            id="tiers[0].0.startTime"
+            name="tiers[0].0.startTime"
+            onBlur={[Function]}
+            onChange={[Function]}
+            onFocus={[Function]}
+            readOnly={true}
+            type="datetime-local"
+            value=""
+          />
+        </div>
+      </div>
+      <div
+        className="mng-ManageTierBlock_Item"
+      >
+        <div
+          className="sw-InputField2 "
+        >
+          <div
+            className="sw-FormControlTitle"
+          >
+            <label
+              className="sw-FormControlTitle_Label"
+            >
+              End Time
+            </label>
+            <div
+              className="sw-FormControlTitle_Info"
+              tabIndex="-1"
+            >
+              <span
+                className="sw-FormControlTitle_Tooltip"
+              >
+                Date and time when the tier ends. Can be only in the future.
+              </span>
+            </div>
+          </div>
+          <input
+            autoComplete="off"
+            className="sw-TextField"
+            disabled={true}
+            id="tiers[0].0.endTime"
+            name="tiers[0].0.endTime"
+            onBlur={[Function]}
+            onChange={[Function]}
+            onFocus={[Function]}
+            readOnly={true}
+            type="datetime-local"
+            value=""
+          />
+        </div>
+      </div>
+      <div
+        className="mng-ManageTierBlock_Item"
+      >
+        <div
+          className="sw-InputField2 "
+        >
+          <div
+            className="sw-FormControlTitle"
+          >
+            <label
+              className="sw-FormControlTitle_Label"
+            >
+              Rate
+            </label>
+            <div
+              className="sw-FormControlTitle_Info"
+              tabIndex="-1"
+            >
+              <span
+                className="sw-FormControlTitle_Tooltip"
+              >
+                Exchange rate Ethereum to Tokens. If it's 100, then for 1 Ether you can buy 100 tokens
+              </span>
+            </div>
+          </div>
+          <input
+            autoComplete="off"
+            className="sw-TextField"
+            disabled={true}
+            id="tiers[0].0.rate"
+            name="tiers[0].0.rate"
+            onBlur={[Function]}
+            onChange={[Function]}
+            onFocus={[Function]}
+            placeholder="Enter here"
+            readOnly={true}
+            type="text"
+            value=""
+          />
+        </div>
+      </div>
+      <div
+        className="mng-ManageTierBlock_Item"
+      >
+        <div
+          className="sw-InputField2 "
+        >
+          <div
+            className="sw-FormControlTitle"
+          >
+            <label
+              className="sw-FormControlTitle_Label"
+            >
+              Supply
+            </label>
+            <div
+              className="sw-FormControlTitle_Info"
+              tabIndex="-1"
+            >
+              <span
+                className="sw-FormControlTitle_Tooltip"
+              >
+                How many tokens will be sold on this tier. Cap of crowdsale equals to sum of supply of all tiers
+              </span>
+            </div>
+          </div>
+          <input
+            autoComplete="off"
+            className="sw-TextField"
+            disabled={true}
+            id="tiers[0].0.supply"
+            name="tiers[0].0.supply"
+            onBlur={[Function]}
+            onChange={[Function]}
+            onFocus={[Function]}
+            placeholder="Enter here"
+            readOnly={true}
+            type="text"
+            value=""
+          />
+        </div>
+      </div>
+      <div
+        className="mng-ManageTierBlock_Item"
+      >
+        <div
+          className="sw-InputField2 "
+        >
+          <div
+            className="sw-FormControlTitle"
+          >
+            <label
+              className="sw-FormControlTitle_Label"
+            >
+              Contributor min cap
+            </label>
+          </div>
+          <input
+            autoComplete="off"
+            className="sw-TextField"
+            disabled={true}
+            id="tiers[0].0.minCap"
+            name="tiers[0].0.minCap"
+            onBlur={[Function]}
+            onChange={[Function]}
+            onFocus={[Function]}
+            readOnly={true}
+            type="number"
+            value=""
+          />
+        </div>
+      </div>
+    </div>
+  </div>
+  <div
+    className="mng-ManageTierBlock_Content"
+  >
+    <h3
+      className="mng-ManageTierBlock_Title"
+    >
+      Tier Name: 
+      Tier 2
+    </h3>
+    <div
+      className="mng-ManageTierBlock_ItemsContainer"
+    >
+      <div
+        className="mng-ManageTierBlock_Item"
+      >
+        <div
+          className="sw-InputField2 "
+        >
+          <div
+            className="sw-FormControlTitle"
+          >
+            <label
+              className="sw-FormControlTitle_Label"
+            >
+              Start Time
+            </label>
+            <div
+              className="sw-FormControlTitle_Info"
+              tabIndex="-1"
+            >
+              <span
+                className="sw-FormControlTitle_Tooltip"
+              >
+                Date and time when the tier starts. Can't be in the past from the current moment.
+              </span>
+            </div>
+          </div>
+          <input
+            autoComplete="off"
+            className="sw-TextField"
+            disabled={true}
+            id="tiers[1].1.startTime"
+            name="tiers[1].1.startTime"
+            onBlur={[Function]}
+            onChange={[Function]}
+            onFocus={[Function]}
+            readOnly={true}
+            type="datetime-local"
+            value=""
+          />
+        </div>
+      </div>
+      <div
+        className="mng-ManageTierBlock_Item"
+      >
+        <div
+          className="sw-InputField2 "
+        >
+          <div
+            className="sw-FormControlTitle"
+          >
+            <label
+              className="sw-FormControlTitle_Label"
+            >
+              End Time
+            </label>
+            <div
+              className="sw-FormControlTitle_Info"
+              tabIndex="-1"
+            >
+              <span
+                className="sw-FormControlTitle_Tooltip"
+              >
+                Date and time when the tier ends. Can be only in the future.
+              </span>
+            </div>
+          </div>
+          <input
+            autoComplete="off"
+            className="sw-TextField"
+            disabled={true}
+            id="tiers[1].1.endTime"
+            name="tiers[1].1.endTime"
+            onBlur={[Function]}
+            onChange={[Function]}
+            onFocus={[Function]}
+            readOnly={true}
+            type="datetime-local"
+            value=""
+          />
+        </div>
+      </div>
+      <div
+        className="mng-ManageTierBlock_Item"
+      >
+        <div
+          className="sw-InputField2 "
+        >
+          <div
+            className="sw-FormControlTitle"
+          >
+            <label
+              className="sw-FormControlTitle_Label"
+            >
+              Rate
+            </label>
+            <div
+              className="sw-FormControlTitle_Info"
+              tabIndex="-1"
+            >
+              <span
+                className="sw-FormControlTitle_Tooltip"
+              >
+                Exchange rate Ethereum to Tokens. If it's 100, then for 1 Ether you can buy 100 tokens
+              </span>
+            </div>
+          </div>
+          <input
+            autoComplete="off"
+            className="sw-TextField"
+            disabled={true}
+            id="tiers[1].1.rate"
+            name="tiers[1].1.rate"
+            onBlur={[Function]}
+            onChange={[Function]}
+            onFocus={[Function]}
+            placeholder="Enter here"
+            readOnly={true}
+            type="text"
+            value=""
+          />
+        </div>
+      </div>
+      <div
+        className="mng-ManageTierBlock_Item"
+      >
+        <div
+          className="sw-InputField2 "
+        >
+          <div
+            className="sw-FormControlTitle"
+          >
+            <label
+              className="sw-FormControlTitle_Label"
+            >
+              Supply
+            </label>
+            <div
+              className="sw-FormControlTitle_Info"
+              tabIndex="-1"
+            >
+              <span
+                className="sw-FormControlTitle_Tooltip"
+              >
+                How many tokens will be sold on this tier. Cap of crowdsale equals to sum of supply of all tiers
+              </span>
+            </div>
+          </div>
+          <input
+            autoComplete="off"
+            className="sw-TextField"
+            disabled={true}
+            id="tiers[1].1.supply"
+            name="tiers[1].1.supply"
+            onBlur={[Function]}
+            onChange={[Function]}
+            onFocus={[Function]}
+            placeholder="Enter here"
+            readOnly={true}
+            type="text"
+            value=""
+          />
+        </div>
+      </div>
+      <div
+        className="mng-ManageTierBlock_Item"
+      >
+        <div
+          className="sw-InputField2 "
+        >
+          <div
+            className="sw-FormControlTitle"
+          >
+            <label
+              className="sw-FormControlTitle_Label"
+            >
+              Contributor min cap
+            </label>
+          </div>
+          <input
+            autoComplete="off"
+            className="sw-TextField"
+            disabled={true}
+            id="tiers[1].1.minCap"
+            name="tiers[1].1.minCap"
+            onBlur={[Function]}
+            onChange={[Function]}
+            onFocus={[Function]}
+            readOnly={true}
+            type="number"
+            value=""
+          />
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`ManageTierBlock should render the ManageTierBlock component with tiers for Minted Capped Crowdsale 1`] = `
+<div
+  className="mng-ManageTierBlock"
+>
+  <div
+    className="mng-ManageTierBlock_Content"
+  >
+    <h3
+      className="mng-ManageTierBlock_Title"
+    >
+      Tier Name: 
+      Tier 1
+    </h3>
+    <div
+      className="mng-ManageTierBlock_ItemsContainer"
+    >
+      <div
+        className="mng-ManageTierBlock_Item"
+      >
+        <div
+          className="sw-InputField2 "
+        >
+          <div
+            className="sw-FormControlTitle"
+          >
+            <label
+              className="sw-FormControlTitle_Label"
+            >
+              Start Time
+            </label>
+            <div
+              className="sw-FormControlTitle_Info"
+              tabIndex="-1"
+            >
+              <span
+                className="sw-FormControlTitle_Tooltip"
+              >
+                Date and time when the tier starts. Can't be in the past from the current moment.
+              </span>
+            </div>
+          </div>
+          <input
+            autoComplete="off"
+            className="sw-TextField"
+            disabled={true}
+            id="tiers[0].0.startTime"
+            name="tiers[0].0.startTime"
+            onBlur={[Function]}
+            onChange={[Function]}
+            onFocus={[Function]}
+            readOnly={true}
+            type="datetime-local"
+            value=""
+          />
+        </div>
+      </div>
+      <div
+        className="mng-ManageTierBlock_Item"
+      >
+        <div
+          className="sw-InputField2 "
+        >
+          <div
+            className="sw-FormControlTitle"
+          >
+            <label
+              className="sw-FormControlTitle_Label"
+            >
+              End Time
+            </label>
+            <div
+              className="sw-FormControlTitle_Info"
+              tabIndex="-1"
+            >
+              <span
+                className="sw-FormControlTitle_Tooltip"
+              >
+                Date and time when the tier ends. Can be only in the future.
+              </span>
+            </div>
+          </div>
+          <input
+            autoComplete="off"
+            className="sw-TextField"
+            disabled={true}
+            id="tiers[0].0.endTime"
+            name="tiers[0].0.endTime"
+            onBlur={[Function]}
+            onChange={[Function]}
+            onFocus={[Function]}
+            readOnly={true}
+            type="datetime-local"
+            value=""
+          />
+        </div>
+      </div>
+      <div
+        className="mng-ManageTierBlock_Item"
+      >
+        <div
+          className="sw-InputField2 "
+        >
+          <div
+            className="sw-FormControlTitle"
+          >
+            <label
+              className="sw-FormControlTitle_Label"
+            >
+              Rate
+            </label>
+            <div
+              className="sw-FormControlTitle_Info"
+              tabIndex="-1"
+            >
+              <span
+                className="sw-FormControlTitle_Tooltip"
+              >
+                Exchange rate Ethereum to Tokens. If it's 100, then for 1 Ether you can buy 100 tokens
+              </span>
+            </div>
+          </div>
+          <input
+            autoComplete="off"
+            className="sw-TextField"
+            disabled={true}
+            id="tiers[0].0.rate"
+            name="tiers[0].0.rate"
+            onBlur={[Function]}
+            onChange={[Function]}
+            onFocus={[Function]}
+            placeholder="Enter here"
+            readOnly={true}
+            type="text"
+            value=""
+          />
+        </div>
+      </div>
+      <div
+        className="mng-ManageTierBlock_Item"
+      >
+        <div
+          className="sw-InputField2 "
+        >
+          <div
+            className="sw-FormControlTitle"
+          >
+            <label
+              className="sw-FormControlTitle_Label"
+            >
+              Supply
+            </label>
+            <div
+              className="sw-FormControlTitle_Info"
+              tabIndex="-1"
+            >
+              <span
+                className="sw-FormControlTitle_Tooltip"
+              >
+                How many tokens will be sold on this tier. Cap of crowdsale equals to sum of supply of all tiers
+              </span>
+            </div>
+          </div>
+          <input
+            autoComplete="off"
+            className="sw-TextField"
+            disabled={true}
+            id="tiers[0].0.supply"
+            name="tiers[0].0.supply"
+            onBlur={[Function]}
+            onChange={[Function]}
+            onFocus={[Function]}
+            placeholder="Enter here"
+            readOnly={true}
+            type="text"
+            value=""
+          />
+        </div>
+      </div>
+      <div
+        className="mng-ManageTierBlock_Item"
+      >
+        <div
+          className="sw-InputField2 "
+        >
+          <div
+            className="sw-FormControlTitle"
+          >
+            <label
+              className="sw-FormControlTitle_Label"
+            >
+              Contributor min cap
+            </label>
+          </div>
+          <input
+            autoComplete="off"
+            className="sw-TextField"
+            disabled={true}
+            id="tiers[0].0.minCap"
+            name="tiers[0].0.minCap"
+            onBlur={[Function]}
+            onChange={[Function]}
+            onFocus={[Function]}
+            readOnly={true}
+            type="number"
+            value=""
+          />
+        </div>
+      </div>
+    </div>
+  </div>
+  <div
+    className="mng-ManageTierBlock_Content"
+  >
+    <h3
+      className="mng-ManageTierBlock_Title"
+    >
+      Tier Name: 
+      Tier 2
+    </h3>
+    <div
+      className="mng-ManageTierBlock_ItemsContainer"
+    >
+      <div
+        className="mng-ManageTierBlock_Item"
+      >
+        <div
+          className="sw-InputField2 "
+        >
+          <div
+            className="sw-FormControlTitle"
+          >
+            <label
+              className="sw-FormControlTitle_Label"
+            >
+              Start Time
+            </label>
+            <div
+              className="sw-FormControlTitle_Info"
+              tabIndex="-1"
+            >
+              <span
+                className="sw-FormControlTitle_Tooltip"
+              >
+                Date and time when the tier starts. Can't be in the past from the current moment.
+              </span>
+            </div>
+          </div>
+          <input
+            autoComplete="off"
+            className="sw-TextField"
+            disabled={true}
+            id="tiers[1].1.startTime"
+            name="tiers[1].1.startTime"
+            onBlur={[Function]}
+            onChange={[Function]}
+            onFocus={[Function]}
+            readOnly={true}
+            type="datetime-local"
+            value=""
+          />
+        </div>
+      </div>
+      <div
+        className="mng-ManageTierBlock_Item"
+      >
+        <div
+          className="sw-InputField2 "
+        >
+          <div
+            className="sw-FormControlTitle"
+          >
+            <label
+              className="sw-FormControlTitle_Label"
+            >
+              End Time
+            </label>
+            <div
+              className="sw-FormControlTitle_Info"
+              tabIndex="-1"
+            >
+              <span
+                className="sw-FormControlTitle_Tooltip"
+              >
+                Date and time when the tier ends. Can be only in the future.
+              </span>
+            </div>
+          </div>
+          <input
+            autoComplete="off"
+            className="sw-TextField"
+            disabled={true}
+            id="tiers[1].1.endTime"
+            name="tiers[1].1.endTime"
+            onBlur={[Function]}
+            onChange={[Function]}
+            onFocus={[Function]}
+            readOnly={true}
+            type="datetime-local"
+            value=""
+          />
+        </div>
+      </div>
+      <div
+        className="mng-ManageTierBlock_Item"
+      >
+        <div
+          className="sw-InputField2 "
+        >
+          <div
+            className="sw-FormControlTitle"
+          >
+            <label
+              className="sw-FormControlTitle_Label"
+            >
+              Rate
+            </label>
+            <div
+              className="sw-FormControlTitle_Info"
+              tabIndex="-1"
+            >
+              <span
+                className="sw-FormControlTitle_Tooltip"
+              >
+                Exchange rate Ethereum to Tokens. If it's 100, then for 1 Ether you can buy 100 tokens
+              </span>
+            </div>
+          </div>
+          <input
+            autoComplete="off"
+            className="sw-TextField"
+            disabled={true}
+            id="tiers[1].1.rate"
+            name="tiers[1].1.rate"
+            onBlur={[Function]}
+            onChange={[Function]}
+            onFocus={[Function]}
+            placeholder="Enter here"
+            readOnly={true}
+            type="text"
+            value=""
+          />
+        </div>
+      </div>
+      <div
+        className="mng-ManageTierBlock_Item"
+      >
+        <div
+          className="sw-InputField2 "
+        >
+          <div
+            className="sw-FormControlTitle"
+          >
+            <label
+              className="sw-FormControlTitle_Label"
+            >
+              Supply
+            </label>
+            <div
+              className="sw-FormControlTitle_Info"
+              tabIndex="-1"
+            >
+              <span
+                className="sw-FormControlTitle_Tooltip"
+              >
+                How many tokens will be sold on this tier. Cap of crowdsale equals to sum of supply of all tiers
+              </span>
+            </div>
+          </div>
+          <input
+            autoComplete="off"
+            className="sw-TextField"
+            disabled={true}
+            id="tiers[1].1.supply"
+            name="tiers[1].1.supply"
+            onBlur={[Function]}
+            onChange={[Function]}
+            onFocus={[Function]}
+            placeholder="Enter here"
+            readOnly={true}
+            type="text"
+            value=""
+          />
+        </div>
+      </div>
+      <div
+        className="mng-ManageTierBlock_Item"
+      >
+        <div
+          className="sw-InputField2 "
+        >
+          <div
+            className="sw-FormControlTitle"
+          >
+            <label
+              className="sw-FormControlTitle_Label"
+            >
+              Contributor min cap
+            </label>
+          </div>
+          <input
+            autoComplete="off"
+            className="sw-TextField"
+            disabled={true}
+            id="tiers[1].1.minCap"
+            name="tiers[1].1.minCap"
+            onBlur={[Function]}
+            onChange={[Function]}
+            onFocus={[Function]}
+            readOnly={true}
+            type="number"
+            value=""
+          />
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;
diff --git a/test/components/Manage/__snapshots__/index.spec.js.snap b/test/components/Manage/__snapshots__/index.spec.js.snap
new file mode 100644
index 000000000..da7f98f3f
--- /dev/null
+++ b/test/components/Manage/__snapshots__/index.spec.js.snap
@@ -0,0 +1,145 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Manage index should render Manage 1`] = `
+<div
+  className="mng-Manage"
+>
+  <section
+    className="lo-MenuBarAndContent"
+  >
+    <div
+      className="mng-ManageNavigation"
+    >
+      <a
+        className="sw-LogoWhite"
+        href="/"
+      />
+      <div
+        className="mng-ManageNavigation_Container"
+      >
+        <div
+          className="st-StepItem
+        active  "
+        >
+          <div
+            className="st-StepItem_Circle"
+          />
+          <div
+            className="st-StepItem_Line"
+          />
+          <span
+            className="st-StepItem_Text"
+          >
+            Crowdsale List
+          </span>
+        </div>
+        <div
+          className="st-StepItem
+        active  "
+        >
+          <div
+            className="st-StepItem_Circle"
+          />
+          <span
+            className="st-StepItem_Text"
+          >
+            Manage Crowdsale
+          </span>
+        </div>
+      </div>
+    </div>
+    <div
+      className="st-StepContent"
+    >
+      <div
+        className="st-SectionInfo "
+      >
+        <div
+          className="st-SectionInfo_Icon st-SectionInfo_Icon-step0"
+        />
+        <div
+          className="st-SectionInfo_Text"
+        >
+          <h1
+            className="st-SectionInfo_Title"
+          >
+            Manage Crowdsale
+          </h1>
+          <p
+            className="st-SectionInfo_Description"
+            dangerouslySetInnerHTML={
+              Object {
+                "__html": "Here you can manage parameters of your crowdsale campaign.",
+              }
+            }
+          />
+        </div>
+      </div>
+      <h3
+        className="sw-BorderedBlockTitle sw-BorderedBlockTitle-margin-bottom-xl"
+      >
+        <a
+          href="/crowdsale/?undefined=test&networkID=undefined"
+          onClick={[Function]}
+        >
+          Crowdsale Page
+        </a>
+      </h3>
+      <div
+        className="mng-FinalizeCrowdsaleStep"
+      >
+        <div
+          className="mng-FinalizeCrowdsaleStep_Description"
+        >
+          After finalization, it’s not possible to update tiers or buy tokens. All tokens will be movable and reserved tokens will be issued.
+        </div>
+        <button
+          className="mng-FinalizeCrowdsaleStep_Button"
+          disabled={true}
+          onClick={[Function]}
+          type="button"
+        >
+          Finalize Crowdsale
+        </button>
+      </div>
+      <div
+        className="st-StepContent_Buttons"
+      >
+        <button
+          className="sw-ButtonBack "
+          onClick={[Function]}
+          type="button"
+        >
+          Back
+        </button>
+      </div>
+    </div>
+  </section>
+  <div
+    className="sw-FullscreenBackdrop"
+  >
+    <div
+      className="sw-Loader"
+    >
+      <div
+        className="sw-Loader_AnimatedItem"
+      />
+      <div
+        className="sw-Loader_AnimatedItem"
+      />
+      <div
+        className="sw-Loader_AnimatedItem"
+      />
+      <div
+        className="sw-Loader_AnimatedItem"
+      />
+      <div
+        className="sw-Loader_AnimatedItem"
+      />
+      <div
+        className="sw-Loader_AnimatedItem"
+      />
+    </div>
+  </div>
+</div>
+`;
diff --git a/test/components/Manage/index.spec.js b/test/components/Manage/index.spec.js
new file mode 100644
index 000000000..5574c6c5d
--- /dev/null
+++ b/test/components/Manage/index.spec.js
@@ -0,0 +1,57 @@
+import React from 'react'
+import Adapter from 'enzyme-adapter-react-15'
+import { Provider } from 'mobx-react'
+import { configure } from 'enzyme'
+import renderer from 'react-test-renderer'
+import { MemoryRouter } from 'react-router'
+import { Manage } from '../../../src/components/Manage/index'
+import {
+  crowdsaleStore,
+  web3Store,
+  tierStore,
+  contractStore,
+  reservedTokenStore,
+  stepTwoValidationStore,
+  generalStore,
+  tokenStore,
+  gasPriceStore,
+  deploymentStore
+} from '../../../src/stores'
+
+configure({ adapter: new Adapter() })
+
+describe('Manage index', () => {
+  const stores = {
+    crowdsaleStore,
+    web3Store,
+    tierStore,
+    contractStore,
+    reservedTokenStore,
+    stepTwoValidationStore,
+    generalStore,
+    tokenStore,
+    gasPriceStore,
+    deploymentStore
+  }
+
+  it(`should render Manage`, () => {
+    // Given
+    const data = {
+      params: { crowdsalePointer: 'test' }
+    }
+
+    const component = renderer.create(
+      <Provider {...stores}>
+        <MemoryRouter initialEntries={['/manage']}>
+          <Manage match={data} />
+        </MemoryRouter>
+      </Provider>
+    )
+
+    // When
+    const tree = component.toJSON()
+
+    // Then
+    expect(tree).toMatchSnapshot()
+  })
+})
diff --git a/test/components/manage/utils.spec.js b/test/components/Manage/utils.spec.js
similarity index 97%
rename from test/components/manage/utils.spec.js
rename to test/components/Manage/utils.spec.js
index d9e4b7bee..1b7d7083d 100644
--- a/test/components/manage/utils.spec.js
+++ b/test/components/Manage/utils.spec.js
@@ -1,4 +1,4 @@
-import { getFieldsToUpdate } from '../../../src/components/manage/utils'
+import { getFieldsToUpdate } from '../../../src/components/Manage/utils'
 
 describe('getFieldsToUpdate', () => {
   it('should include only fields that have changed', () => {
diff --git a/test/components/Stats/__snapshots__/index.spec.js.snap b/test/components/Stats/__snapshots__/index.spec.js.snap
new file mode 100644
index 000000000..1a6bd7c63
--- /dev/null
+++ b/test/components/Stats/__snapshots__/index.spec.js.snap
@@ -0,0 +1,481 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Stats index should render Stats 1`] = `
+<div>
+  <section
+    className="lo-MenuBarAndContent"
+  >
+    <div
+      className="mng-ManageNavigation"
+    >
+      <a
+        className="sw-LogoWhite"
+        href="/"
+      />
+      <div
+        className="mng-ManageNavigation_Container"
+      >
+        <div
+          className="st-StepItem
+        active  "
+        >
+          <div
+            className="st-StepItem_Circle"
+          />
+          <span
+            className="st-StepItem_Text"
+          >
+            Statistics
+          </span>
+        </div>
+      </div>
+    </div>
+    <div
+      className="st-StepContent"
+    >
+      <div
+        className="st-SectionInfo "
+      >
+        <div
+          className="st-SectionInfo_Icon st-SectionInfo_Icon-step0"
+        />
+        <div
+          className="st-SectionInfo_Text"
+        >
+          <h1
+            className="st-SectionInfo_Title"
+          >
+            Statistics
+          </h1>
+          <p
+            className="st-SectionInfo_Description"
+            dangerouslySetInnerHTML={
+              Object {
+                "__html": "Useful statistics about the Token Wizard",
+              }
+            }
+          />
+        </div>
+      </div>
+      <div
+        className="stats-table"
+      >
+        <div
+          className="stats-table-cell"
+        >
+          <div
+            className="stats-items"
+          >
+            <div
+              className="stats-items-i"
+            >
+              <p
+                className="stats-items-title"
+              >
+                0
+              </p>
+              <p
+                className="stats-items-description"
+              >
+                Total crowdsales amount
+              </p>
+            </div>
+          </div>
+        </div>
+        <div
+          className="stats-table-cell"
+        >
+          <div
+            className="stats-items"
+          >
+            <div
+              className="stats-items-i"
+            >
+              <p
+                className="stats-items-title"
+              >
+                0
+              </p>
+              <p
+                className="stats-items-description"
+              >
+                Total amount of eth raised
+              </p>
+            </div>
+          </div>
+        </div>
+        <div
+          className="stats-table-cell"
+        >
+          <div
+            className="stats-items"
+          >
+            <div
+              className="stats-items-i"
+            >
+              <p
+                className="stats-items-title"
+              >
+                0
+              </p>
+              <p
+                className="stats-items-description"
+              >
+                Total contributors amount
+              </p>
+            </div>
+          </div>
+        </div>
+        <div
+          className="stats-table-cell"
+        >
+          <div
+            className="stats-items"
+          >
+            <div
+              className="stats-items-i"
+            >
+              <p
+                className="stats-items-title"
+              >
+                0
+              </p>
+              <p
+                className="stats-items-description"
+              >
+                Max amount of eth raised in one crowdsale
+              </p>
+            </div>
+          </div>
+        </div>
+      </div>
+      <p
+        className="title-secondary"
+      >
+        Minted capped crowdsales statistics
+      </p>
+      <div
+        className="stats-table"
+      >
+        <div
+          className="stats-table-cell"
+        >
+          <div
+            className="stats-items"
+          >
+            <div
+              className="stats-items-i"
+            >
+              <p
+                className="stats-items-title"
+              >
+                0
+              </p>
+              <p
+                className="stats-items-description"
+              >
+                Crowdsales amount
+              </p>
+            </div>
+            <div
+              className="stats-items-i"
+            >
+              <p
+                className="stats-items-title"
+              >
+                0
+              </p>
+              <p
+                className="stats-items-description"
+              >
+                Total amount of eth raised
+              </p>
+            </div>
+            <div
+              className="stats-items-i"
+            >
+              <p
+                className="stats-items-title"
+              >
+                0
+              </p>
+              <p
+                className="stats-items-description"
+              >
+                Total contributors amount
+              </p>
+            </div>
+          </div>
+        </div>
+        <div
+          className="stats-table-cell"
+        >
+          <div
+            className="stats-items"
+          >
+            <div
+              className="stats-items-i"
+            >
+              <p
+                className="stats-items-title"
+              >
+                0
+              </p>
+              <p
+                className="stats-items-description"
+              >
+                Ongoing crowdsales amount
+              </p>
+            </div>
+            <div
+              className="stats-items-i"
+            >
+              <p
+                className="stats-items-title"
+              >
+                0
+              </p>
+              <p
+                className="stats-items-description"
+              >
+                Future crowdsales amount
+              </p>
+            </div>
+            <div
+              className="stats-items-i"
+            >
+              <p
+                className="stats-items-title"
+              >
+                0
+              </p>
+              <p
+                className="stats-items-description"
+              >
+                Past crowdsales amount
+              </p>
+            </div>
+          </div>
+        </div>
+        <div
+          className="stats-table-cell"
+        >
+          <div
+            className="stats-items"
+          >
+            <div
+              className="stats-items-i"
+            >
+              <p
+                className="stats-items-title"
+              >
+                0
+              </p>
+              <p
+                className="stats-items-description"
+              >
+                Max amount of eth raised in one crowdsale
+              </p>
+            </div>
+            <div
+              className="stats-items-i"
+            >
+              <p
+                className="stats-items-title"
+              >
+                0
+              </p>
+              <p
+                className="stats-items-description"
+              >
+                % of finalized crowdsales from ended
+              </p>
+            </div>
+            <div
+              className="stats-items-i"
+            >
+              <p
+                className="stats-items-title"
+              >
+                0
+              </p>
+              <p
+                className="stats-items-description"
+              >
+                % of crowdsales with multiple tiers
+              </p>
+            </div>
+          </div>
+        </div>
+        <div
+          className="stats-table-cell"
+        >
+          <div
+            className="stats-items"
+          >
+            <div
+              className="stats-items-i"
+            >
+              <p
+                className="stats-items-title"
+              >
+                0
+              </p>
+              <p
+                className="stats-items-description"
+              >
+                Max tiers amount in one crowdsale
+              </p>
+            </div>
+          </div>
+        </div>
+      </div>
+      <p
+        className="title-secondary"
+      >
+        Dutch auction crowdsales statistics
+      </p>
+      <div
+        className="stats-table"
+      >
+        <div
+          className="stats-table-cell"
+        >
+          <div
+            className="stats-items"
+          >
+            <div
+              className="stats-items-i"
+            >
+              <p
+                className="stats-items-title"
+              >
+                0
+              </p>
+              <p
+                className="stats-items-description"
+              >
+                Crowdsales amount
+              </p>
+            </div>
+            <div
+              className="stats-items-i"
+            >
+              <p
+                className="stats-items-title"
+              >
+                0
+              </p>
+              <p
+                className="stats-items-description"
+              >
+                Total amount of eth raised
+              </p>
+            </div>
+            <div
+              className="stats-items-i"
+            >
+              <p
+                className="stats-items-title"
+              >
+                0
+              </p>
+              <p
+                className="stats-items-description"
+              >
+                Total contributors amount
+              </p>
+            </div>
+          </div>
+        </div>
+        <div
+          className="stats-table-cell"
+        >
+          <div
+            className="stats-items"
+          >
+            <div
+              className="stats-items-i"
+            >
+              <p
+                className="stats-items-title"
+              >
+                0
+              </p>
+              <p
+                className="stats-items-description"
+              >
+                Ongoing crowdsales amount
+              </p>
+            </div>
+            <div
+              className="stats-items-i"
+            >
+              <p
+                className="stats-items-title"
+              >
+                0
+              </p>
+              <p
+                className="stats-items-description"
+              >
+                Future crowdsales amount
+              </p>
+            </div>
+            <div
+              className="stats-items-i"
+            >
+              <p
+                className="stats-items-title"
+              >
+                0
+              </p>
+              <p
+                className="stats-items-description"
+              >
+                Past crowdsales amount
+              </p>
+            </div>
+          </div>
+        </div>
+        <div
+          className="stats-table-cell"
+        >
+          <div
+            className="stats-items"
+          >
+            <div
+              className="stats-items-i"
+            >
+              <p
+                className="stats-items-title"
+              >
+                0
+              </p>
+              <p
+                className="stats-items-description"
+              >
+                Max amount of eth raised in one crowdsale
+              </p>
+            </div>
+            <div
+              className="stats-items-i"
+            >
+              <p
+                className="stats-items-title"
+              >
+                0
+              </p>
+              <p
+                className="stats-items-description"
+              >
+                % of finalized crowdsales from ended
+              </p>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </section>
+</div>
+`;
diff --git a/test/components/Stats/index.spec.js b/test/components/Stats/index.spec.js
new file mode 100644
index 000000000..c496d05fa
--- /dev/null
+++ b/test/components/Stats/index.spec.js
@@ -0,0 +1,34 @@
+import React from 'react'
+import Adapter from 'enzyme-adapter-react-15'
+import { Provider } from 'mobx-react'
+import { configure } from 'enzyme'
+import renderer from 'react-test-renderer'
+import { MemoryRouter } from 'react-router'
+import { Stats } from '../../../src/components/Stats/index'
+import { web3Store, statsStore } from '../../../src/stores'
+
+configure({ adapter: new Adapter() })
+
+describe('Stats index', () => {
+  const stores = {
+    web3Store,
+    statsStore
+  }
+
+  it(`should render Stats`, () => {
+    // Given
+    const component = renderer.create(
+      <Provider {...stores}>
+        <MemoryRouter initialEntries={['/stat']}>
+          <Stats />
+        </MemoryRouter>
+      </Provider>
+    )
+
+    // When
+    const tree = component.toJSON()
+
+    // Then
+    expect(tree).toMatchSnapshot()
+  })
+})
diff --git a/test/components/StepFour/BorderedSection.spec.js b/test/components/StepFour/BorderedSection.spec.js
new file mode 100644
index 000000000..787beb83b
--- /dev/null
+++ b/test/components/StepFour/BorderedSection.spec.js
@@ -0,0 +1,18 @@
+import React from 'react'
+import Adapter from 'enzyme-adapter-react-15'
+import { configure, mount, shallow } from 'enzyme'
+import { BorderedSection } from '../../../src/components/StepFour/BorderedSection'
+import renderer from 'react-test-renderer'
+import { NAVIGATION_STEPS } from '../../../src/utils/constants'
+
+configure({ adapter: new Adapter() })
+
+describe('BorderedSection', () => {
+  it(`should render the component `, () => {
+    const { CROWDSALE_STRATEGY } = NAVIGATION_STEPS
+
+    const wrapper = shallow(<BorderedSection dataStep="1" title={CROWDSALE_STRATEGY} text="Minted Capped" />)
+
+    expect(wrapper).toMatchSnapshot()
+  })
+})
diff --git a/test/components/StepFour/ConfigurationBlock.spec.js b/test/components/StepFour/ConfigurationBlock.spec.js
new file mode 100644
index 000000000..a394cfee6
--- /dev/null
+++ b/test/components/StepFour/ConfigurationBlock.spec.js
@@ -0,0 +1,21 @@
+import React from 'react'
+import Adapter from 'enzyme-adapter-react-15'
+import { configure, mount, shallow } from 'enzyme'
+import { ConfigurationBlock } from '../../../src/components/StepFour/ConfigurationBlock'
+import { crowdsaleStore } from '../../../src/stores'
+import { CROWDSALE_STRATEGIES } from '../../../src/utils/constants'
+
+configure({ adapter: new Adapter() })
+
+describe('Configuration block', () => {
+  it(`should render the component `, () => {
+    crowdsaleStore.strategy = CROWDSALE_STRATEGIES.MINTED_CAPPED_CROWDSALE
+
+    const stores = {
+      store: { crowdsaleStore: crowdsaleStore }
+    }
+    const wrapper = shallow(<ConfigurationBlock {...stores} />)
+
+    expect(wrapper).toMatchSnapshot()
+  })
+})
diff --git a/test/components/StepFour/CrowdsaleSetupBlockDutchAuction.spec.js b/test/components/StepFour/CrowdsaleSetupBlockDutchAuction.spec.js
new file mode 100644
index 000000000..04ec4f4a1
--- /dev/null
+++ b/test/components/StepFour/CrowdsaleSetupBlockDutchAuction.spec.js
@@ -0,0 +1,35 @@
+import React from 'react'
+import Adapter from 'enzyme-adapter-react-15'
+import { configure, shallow } from 'enzyme'
+import { CrowdsaleSetupBlockDutchAuction } from '../../../src/components/StepFour/CrowdsaleSetupBlockDutchAuction'
+import { tierStore } from '../../../src/stores'
+import { defaultTier, defaultTierValidations } from '../../../src/utils/constants'
+
+configure({ adapter: new Adapter() })
+
+describe('CrowdsalSetupBlockDutchAuction', () => {
+  it(`should render the component `, () => {
+    const addCrowdsale = num => {
+      const newTier = Object.assign({}, defaultTier)
+      const newTierValidations = Object.assign({}, defaultTierValidations)
+      newTier.tier = `Tier ${num + 1}`
+      if (0 === num) {
+        newTier.whitelistEnabled = 'no'
+        newTier.burnExcess = 'no'
+        newTier.walletAddress = '0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1'
+        newTier.endTime = 1234
+      }
+
+      tierStore.addTier(newTier, newTierValidations)
+    }
+
+    addCrowdsale(0)
+
+    const stores = {
+      tierStore: tierStore
+    }
+    const wrapper = shallow(<CrowdsaleSetupBlockDutchAuction {...stores} />)
+
+    expect(wrapper).toMatchSnapshot()
+  })
+})
diff --git a/test/components/StepFour/CrowdsaleSetupBlockWhitelistWithCap.spec.js b/test/components/StepFour/CrowdsaleSetupBlockWhitelistWithCap.spec.js
new file mode 100644
index 000000000..c0ba045fd
--- /dev/null
+++ b/test/components/StepFour/CrowdsaleSetupBlockWhitelistWithCap.spec.js
@@ -0,0 +1,35 @@
+import React from 'react'
+import Adapter from 'enzyme-adapter-react-15'
+import { configure, shallow } from 'enzyme'
+import { CrowdsaleSetupBlockWhitelistWithCap } from '../../../src/components/StepFour/CrowdsaleSetupBlockWhitelistWithCap'
+import { tierStore } from '../../../src/stores'
+import { defaultTier, defaultTierValidations } from '../../../src/utils/constants'
+
+configure({ adapter: new Adapter() })
+
+describe('CrowdsaleSetupBlockWhitelistWithCap', () => {
+  it(`should render the component `, () => {
+    const addCrowdsale = num => {
+      const newTier = Object.assign({}, defaultTier)
+      const newTierValidations = Object.assign({}, defaultTierValidations)
+      newTier.tier = `Tier ${num + 1}`
+      if (0 === num) {
+        newTier.whitelistEnabled = 'no'
+        newTier.burnExcess = 'no'
+        newTier.walletAddress = '0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1'
+        newTier.endTime = 1234
+      }
+
+      tierStore.addTier(newTier, newTierValidations)
+    }
+
+    addCrowdsale(0)
+
+    const stores = {
+      tierStore: tierStore
+    }
+    const wrapper = shallow(<CrowdsaleSetupBlockWhitelistWithCap {...stores} />)
+
+    expect(wrapper).toMatchSnapshot()
+  })
+})
diff --git a/test/components/StepFour/TierSetupDutchAuction.spec.js b/test/components/StepFour/TierSetupDutchAuction.spec.js
new file mode 100644
index 000000000..5b4400e10
--- /dev/null
+++ b/test/components/StepFour/TierSetupDutchAuction.spec.js
@@ -0,0 +1,35 @@
+import React from 'react'
+import Adapter from 'enzyme-adapter-react-15'
+import { configure, shallow } from 'enzyme'
+import { TierSetupDutchAuction } from '../../../src/components/StepFour/TierSetupDutchAuction'
+import { tierStore } from '../../../src/stores'
+import { defaultTier, defaultTierValidations } from '../../../src/utils/constants'
+
+configure({ adapter: new Adapter() })
+
+describe('TierSetupDutchAuction', () => {
+  it(`should render the component `, () => {
+    const addCrowdsale = num => {
+      const newTier = Object.assign({}, defaultTier)
+      const newTierValidations = Object.assign({}, defaultTierValidations)
+      newTier.tier = `Tier ${num + 1}`
+      if (0 === num) {
+        newTier.whitelistEnabled = 'no'
+        newTier.burnExcess = 'no'
+        newTier.walletAddress = '0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1'
+        newTier.endTime = 1234
+      }
+
+      tierStore.addTier(newTier, newTierValidations)
+    }
+
+    addCrowdsale(0)
+
+    const stores = {
+      tier: tierStore.tiers[0]
+    }
+    const wrapper = shallow(<TierSetupDutchAuction {...stores} />)
+
+    expect(wrapper).toMatchSnapshot()
+  })
+})
diff --git a/test/components/StepFour/TierSetupWhitelistWithCap.spec.js b/test/components/StepFour/TierSetupWhitelistWithCap.spec.js
new file mode 100644
index 000000000..1a444d487
--- /dev/null
+++ b/test/components/StepFour/TierSetupWhitelistWithCap.spec.js
@@ -0,0 +1,35 @@
+import React from 'react'
+import Adapter from 'enzyme-adapter-react-15'
+import { configure, shallow } from 'enzyme'
+import { TierSetupWhitelistWithCap } from '../../../src/components/StepFour/TierSetupWhitelistWithCap'
+import { tierStore } from '../../../src/stores'
+import { defaultTier, defaultTierValidations } from '../../../src/utils/constants'
+
+configure({ adapter: new Adapter() })
+
+describe('TierSetupWhitelistWithCap', () => {
+  it(`should render the component `, () => {
+    const addCrowdsale = num => {
+      const newTier = Object.assign({}, defaultTier)
+      const newTierValidations = Object.assign({}, defaultTierValidations)
+      newTier.tier = `Tier ${num + 1}`
+      if (0 === num) {
+        newTier.whitelistEnabled = 'no'
+        newTier.burnExcess = 'no'
+        newTier.walletAddress = '0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1'
+        newTier.endTime = 1234
+      }
+
+      tierStore.addTier(newTier, newTierValidations)
+    }
+
+    addCrowdsale(0)
+
+    const stores = {
+      tier: tierStore.tiers[0]
+    }
+    const wrapper = shallow(<TierSetupWhitelistWithCap {...stores} />)
+
+    expect(wrapper).toMatchSnapshot()
+  })
+})
diff --git a/test/components/StepFour/TokenSetupBlock.spec.js b/test/components/StepFour/TokenSetupBlock.spec.js
new file mode 100644
index 000000000..596d80c8a
--- /dev/null
+++ b/test/components/StepFour/TokenSetupBlock.spec.js
@@ -0,0 +1,22 @@
+import React from 'react'
+import Adapter from 'enzyme-adapter-react-15'
+import { configure, shallow } from 'enzyme'
+import { TokenSetupBlock } from '../../../src/components/StepFour/TokenSetupBlock'
+
+configure({ adapter: new Adapter() })
+
+describe('TokenSetupBlock', () => {
+  it(`should render the component `, () => {
+    const data = {
+      tokenStore: {
+        name: 'This is a valid name',
+        ticker: 'TTK',
+        decimals: '14',
+        supply: '0'
+      }
+    }
+    const wrapper = shallow(<TokenSetupBlock {...data} />)
+
+    expect(wrapper).toMatchSnapshot()
+  })
+})
diff --git a/test/components/StepFour/__snapshots__/BorderedSection.spec.js.snap b/test/components/StepFour/__snapshots__/BorderedSection.spec.js.snap
new file mode 100644
index 000000000..b41af0972
--- /dev/null
+++ b/test/components/StepFour/__snapshots__/BorderedSection.spec.js.snap
@@ -0,0 +1,19 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`BorderedSection should render the component  1`] = `
+<div
+  className="sw-BorderedSection"
+  data-step="1"
+>
+  <h2
+    className="sw-BorderedSection_Title"
+  >
+    Crowdsale Strategy
+  </h2>
+  <p
+    className="sw-BorderedSection_Text"
+  >
+    Minted Capped
+  </p>
+</div>
+`;
diff --git a/test/components/StepFour/__snapshots__/ConfigurationBlock.spec.js.snap b/test/components/StepFour/__snapshots__/ConfigurationBlock.spec.js.snap
new file mode 100644
index 000000000..1f9f47c4b
--- /dev/null
+++ b/test/components/StepFour/__snapshots__/ConfigurationBlock.spec.js.snap
@@ -0,0 +1,23 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Configuration block should render the component  1`] = `
+<div
+  className="cb-ConfigurationBlock"
+>
+  <DisplayField
+    description="Compiler Version"
+    title="Compiler Version"
+    value="0.4.24"
+  />
+  <DisplayField
+    description="Crowdsale contract name"
+    title="Contract Name"
+    value="MintedCappedProxy"
+  />
+  <DisplayField
+    description="Optimization in compiling"
+    title="Optimized"
+    value="Yes"
+  />
+</div>
+`;
diff --git a/test/components/StepFour/__snapshots__/CrowdsaleSetupBlockDutchAuction.spec.js.snap b/test/components/StepFour/__snapshots__/CrowdsaleSetupBlockDutchAuction.spec.js.snap
new file mode 100644
index 000000000..ae0f01a24
--- /dev/null
+++ b/test/components/StepFour/__snapshots__/CrowdsaleSetupBlockDutchAuction.spec.js.snap
@@ -0,0 +1,34 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`CrowdsalSetupBlockDutchAuction should render the component  1`] = `
+<div
+  className="cs-CrowdsaleSetupBlockDutchAuction"
+>
+  <DisplayField
+    description="Where the money goes after contributors' transactions."
+    extraClassName="pb-DisplayField-WalletAddress"
+    title="Wallet Address"
+    value="0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1"
+  />
+  <DisplayField
+    description="Whether the unsold tokens will be burnt on finalization, or be sent to the team wallet"
+    extraClassName="pb-DisplayField-BurnExcess"
+    title="Burn Excess"
+    value="No"
+  />
+  <DisplayField
+    description="Date and time when the crowdsale starts."
+    extraClassName="pb-DisplayField-CrowdsaleStartTime"
+    mobileTextSize="small"
+    title="Crowdsale Start time"
+    value="Invalid date"
+  />
+  <DisplayField
+    description="Date and time when the crowdsale ends."
+    extraClassName="pb-DisplayField-CrowdsaleEndTime"
+    mobileTextSize="small"
+    title="Crowdsale End time"
+    value="1970-01-01 00:00 (UTC +0000)"
+  />
+</div>
+`;
diff --git a/test/components/StepFour/__snapshots__/CrowdsaleSetupBlockWhitelistWithCap.spec.js.snap b/test/components/StepFour/__snapshots__/CrowdsaleSetupBlockWhitelistWithCap.spec.js.snap
new file mode 100644
index 000000000..6e100cc15
--- /dev/null
+++ b/test/components/StepFour/__snapshots__/CrowdsaleSetupBlockWhitelistWithCap.spec.js.snap
@@ -0,0 +1,28 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`CrowdsaleSetupBlockWhitelistWithCap should render the component  1`] = `
+<div
+  className="cs-CrowdsaleSetupBlockWhitelistWithCap"
+>
+  <DisplayField
+    description="Where the money goes after contributors' transactions."
+    extraClassName="pb-DisplayField-WalletAddress"
+    title="Wallet Address"
+    value="0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1"
+  />
+  <DisplayField
+    description="Date and time when the crowdsale starts."
+    extraClassName="pb-DisplayField-CrowdsaleStartTime"
+    mobileTextSize="small"
+    title="Crowdsale Start time"
+    value="Invalid date"
+  />
+  <DisplayField
+    description="Date and time when the crowdsale ends."
+    extraClassName="pb-DisplayField-CrowdsaleEndTime"
+    mobileTextSize="small"
+    title="Crowdsale End time"
+    value="1970-01-01 00:00 (UTC +0000)"
+  />
+</div>
+`;
diff --git a/test/components/StepFour/__snapshots__/TierSetupDutchAuction.spec.js.snap b/test/components/StepFour/__snapshots__/TierSetupDutchAuction.spec.js.snap
new file mode 100644
index 000000000..b9367281b
--- /dev/null
+++ b/test/components/StepFour/__snapshots__/TierSetupDutchAuction.spec.js.snap
@@ -0,0 +1,45 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`TierSetupDutchAuction should render the component  1`] = `
+<div
+  className="ts-TierSetupDutchAuction"
+>
+  <DisplayField
+    description="Date and time when the tier starts."
+    mobileTextSize="small"
+    title="Start Time"
+    value="Invalid date"
+  />
+  <DisplayField
+    description="Date and time when the tier ends."
+    mobileTextSize="small"
+    title="End Time"
+    value="1970-01-01 00:00 (UTC +0000)"
+  />
+  <DisplayField
+    description="Global Min Cap for all contributors for the 1st contribution transaction."
+    title="Global Min Cap"
+    value="0"
+  />
+  <DisplayField
+    description="How many tokens will be sold on this tier."
+    title="Max cap"
+    value=""
+  />
+  <DisplayField
+    description="Exchange rate Ethereum to Tokens. If it's 100, then for 1 Ether you can buy 100 tokens"
+    title="Min Rate"
+    value={0}
+  />
+  <DisplayField
+    description="Exchange rate Ethereum to Tokens. If it's 100, then for 1 Ether you can buy 100 tokens"
+    title="Max Rate"
+    value={0}
+  />
+  <DisplayField
+    description="Is whitelist enabled on this tier?"
+    title="Enable whitelisting"
+    value="No"
+  />
+</div>
+`;
diff --git a/test/components/StepFour/__snapshots__/TierSetupWhitelistWithCap.spec.js.snap b/test/components/StepFour/__snapshots__/TierSetupWhitelistWithCap.spec.js.snap
new file mode 100644
index 000000000..1db5a957a
--- /dev/null
+++ b/test/components/StepFour/__snapshots__/TierSetupWhitelistWithCap.spec.js.snap
@@ -0,0 +1,45 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`TierSetupWhitelistWithCap should render the component  1`] = `
+<div
+  className="ts-TierSetupWhitelistWithCap"
+>
+  <DisplayField
+    description="Date and time when the tier starts."
+    mobileTextSize="small"
+    title="Start Time"
+    value="Invalid date"
+  />
+  <DisplayField
+    description="Date and time when the tier ends."
+    mobileTextSize="small"
+    title="End Time"
+    value="1970-01-01 00:00 (UTC +0000)"
+  />
+  <DisplayField
+    description="Is whitelist enabled on this tier?"
+    title="Enable whitelisting"
+    value="No"
+  />
+  <DisplayField
+    description="If it's enabled, a creator of the crowdsale can modify crowdsale duration after publishing."
+    title="Allow modifying"
+    value="No"
+  />
+  <DisplayField
+    description="Global Min Cap for all contributors for the 1st contribution transaction."
+    title="Global Min Cap"
+    value="0"
+  />
+  <DisplayField
+    description="How many tokens will be sold on this tier."
+    title="Max cap"
+    value=""
+  />
+  <DisplayField
+    description="Exchange rate Ethereum to Tokens. If it's 100, then for 1 Ether you can buy 100 tokens"
+    title="Rate"
+    value={0}
+  />
+</div>
+`;
diff --git a/test/components/StepFour/__snapshots__/TokenSetupBlock.spec.js.snap b/test/components/StepFour/__snapshots__/TokenSetupBlock.spec.js.snap
new file mode 100644
index 000000000..56de2a522
--- /dev/null
+++ b/test/components/StepFour/__snapshots__/TokenSetupBlock.spec.js.snap
@@ -0,0 +1,29 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`TokenSetupBlock should render the component  1`] = `
+<div
+  className="ts-TokenSetupBlock"
+>
+  <DisplayField
+    description="The name of your token. Will be used by Etherscan and other token browsers."
+    title="Name"
+    value="This is a valid name"
+  />
+  <DisplayField
+    description="The five letter ticker for your token."
+    extraClassName="pb-DisplayField_Value-uppercase"
+    title="Ticker"
+    value="TTK"
+  />
+  <DisplayField
+    description="How your token is divisible."
+    title="Decimals"
+    value="14"
+  />
+  <DisplayField
+    description="Total token initial supply."
+    title="Supply"
+    value="0"
+  />
+</div>
+`;
diff --git a/test/components/StepFour/utils.spec.js b/test/components/StepFour/utils.spec.js
new file mode 100644
index 000000000..73ae155c5
--- /dev/null
+++ b/test/components/StepFour/utils.spec.js
@@ -0,0 +1,84 @@
+import React from 'react'
+import Adapter from 'enzyme-adapter-react-15'
+import { configure, shallow } from 'enzyme'
+import {
+  getVersionFlagByStore,
+  getOptimizationFlagByStore,
+  getPragmaVersion
+} from '../../../src/components/StepFour/utils'
+import { crowdsaleStore } from '../../../src/stores'
+import { CROWDSALE_STRATEGIES } from '../../../src/utils/constants'
+
+configure({ adapter: new Adapter() })
+
+describe('StepFourUtils', () => {
+  it(`should getVersionFlagByStore by Minted Capped `, () => {
+    crowdsaleStore.strategy = CROWDSALE_STRATEGIES.MINTED_CAPPED_CROWDSALE
+
+    const result = getVersionFlagByStore(crowdsaleStore)
+
+    expect(result).toBe('0.4.24')
+  })
+
+  it(`should getVersionFlagByStore by Dutch `, () => {
+    crowdsaleStore.strategy = CROWDSALE_STRATEGIES.DUTCH_AUCTION
+
+    const result = getVersionFlagByStore(crowdsaleStore)
+
+    expect(result).toBe('0.4.24')
+  })
+
+  it(`should getVersionFlagByStore throw an error `, () => {
+    crowdsaleStore.strategy = 'Throw Error!'
+
+    const result = () => getVersionFlagByStore(crowdsaleStore)
+
+    expect(result).toThrow()
+  })
+
+  it(`should getOptimizationFlagByStore by Minted Capped `, () => {
+    crowdsaleStore.strategy = CROWDSALE_STRATEGIES.MINTED_CAPPED_CROWDSALE
+
+    const result = getOptimizationFlagByStore(crowdsaleStore)
+
+    expect(result).toBe('Yes')
+  })
+
+  it(`should getOptimizationFlagByStore by Dutch `, () => {
+    crowdsaleStore.strategy = CROWDSALE_STRATEGIES.DUTCH_AUCTION
+
+    const result = getOptimizationFlagByStore(crowdsaleStore)
+
+    expect(result).toBe('Yes')
+  })
+
+  it(`should getOptimizationFlagByStore throw an error `, () => {
+    crowdsaleStore.strategy = 'Throw Error!'
+
+    const result = () => getOptimizationFlagByStore(crowdsaleStore)
+
+    expect(result).toThrow()
+  })
+
+  it(`should getPragmaVersionby by Minted Capped`, async () => {
+    const result = await getPragmaVersion('MintedCapped')
+
+    expect(result).toBe('0.4.24')
+  })
+
+  it(`should getPragmaVersionby by Dutch`, async () => {
+    const result = await getPragmaVersion('Dutch')
+
+    expect(result).toBe('0.4.24')
+  })
+
+  it(`should getPragmaVersionby throw an error `, async () => {
+    let error
+    try {
+      await getPragmaVersion('Throw Error!')
+    } catch (e) {
+      error = e
+    }
+    expect(error).toEqual(new Error('Strategy not exist'))
+  })
+})
diff --git a/test/components/StepOne/__snapshots__/StrategyItem.spec.js.snap b/test/components/StepOne/__snapshots__/StrategyItem.spec.js.snap
index 71da650e0..4f34f7ff7 100644
--- a/test/components/StepOne/__snapshots__/StrategyItem.spec.js.snap
+++ b/test/components/StepOne/__snapshots__/StrategyItem.spec.js.snap
@@ -1,36 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`StrategyItem should render screen with mount without throwing an error 1`] = `
-<input
-  checked={true}
-  className="sw-RadioItems_InputRadio"
-  id="white-list-with-cap"
-  name="contract-type"
-  onChange={[MockFunction]}
-  type="radio"
-  value="white-list-with-cap"
-/>
-`;
+exports[`StrategyItem should render screen with mount without throwing an error 1`] = `null`;
 
-exports[`StrategyItem should render screen with render without throwing an error 1`] = `
-<input
-  checked=""
-  class="sw-RadioItems_InputRadio"
-  id="white-list-with-cap"
-  name="contract-type"
-  type="radio"
-  value="white-list-with-cap"
-/>
-`;
+exports[`StrategyItem should render screen with render without throwing an error 1`] = `null`;
 
-exports[`StrategyItem should render screen with shallow without throwing an error 1`] = `
-<input
-  checked={true}
-  className="sw-RadioItems_InputRadio"
-  id="white-list-with-cap"
-  name="contract-type"
-  onChange={[MockFunction]}
-  type="radio"
-  value="white-list-with-cap"
-/>
-`;
+exports[`StrategyItem should render screen with shallow without throwing an error 1`] = `null`;
diff --git a/test/components/StepOne/__snapshots__/index.spec.js.snap b/test/components/StepOne/__snapshots__/index.spec.js.snap
index e1cb6aa45..07e7def80 100644
--- a/test/components/StepOne/__snapshots__/index.spec.js.snap
+++ b/test/components/StepOne/__snapshots__/index.spec.js.snap
@@ -125,11 +125,11 @@ exports[`StepOne should render StepOne screen 1`] = `
         className="sw-RadioItems"
       >
         <label
-          className="sw-RadioItems_Item"
+          className="st-StrategyItem_Item"
         >
           <input
             checked={true}
-            className="sw-RadioItems_InputRadio"
+            className="st-StrategyItem_InputRadio"
             id="white-list-with-cap"
             name="contract-type"
             onChange={[Function]}
@@ -137,33 +137,33 @@ exports[`StepOne should render StepOne screen 1`] = `
             value="white-list-with-cap"
           />
           <span
-            className="sw-RadioItems_ItemContent"
+            className="st-StrategyItem_ItemContent"
           >
             <span
-              className="sw-RadioItems_ItemContentText"
+              className="st-StrategyItem_ItemContentText"
             >
               <span
-                className="sw-RadioItems_ItemTitle"
+                className="st-StrategyItem_ItemTitle"
               >
                 Whitelist with Cap
               </span>
               <span
-                className="sw-RadioItems_ItemDescription"
+                className="st-StrategyItem_ItemDescription"
               >
                 Modern crowdsale strategy with multiple tiers, whitelists, and limits. Recommended for every crowdsale.
               </span>
             </span>
             <span
-              className="sw-RadioItems_Radio"
+              className="st-StrategyItem_Radio"
             />
           </span>
         </label>
         <label
-          className="sw-RadioItems_Item"
+          className="st-StrategyItem_Item"
         >
           <input
             checked={false}
-            className="sw-RadioItems_InputRadio"
+            className="st-StrategyItem_InputRadio"
             id="dutch-auction"
             name="contract-type"
             onChange={[Function]}
@@ -171,24 +171,24 @@ exports[`StepOne should render StepOne screen 1`] = `
             value="dutch-auction"
           />
           <span
-            className="sw-RadioItems_ItemContent"
+            className="st-StrategyItem_ItemContent"
           >
             <span
-              className="sw-RadioItems_ItemContentText"
+              className="st-StrategyItem_ItemContentText"
             >
               <span
-                className="sw-RadioItems_ItemTitle"
+                className="st-StrategyItem_ItemTitle"
               >
                 Dutch Auction
               </span>
               <span
-                className="sw-RadioItems_ItemDescription"
+                className="st-StrategyItem_ItemDescription"
               >
                 An auction with descending price.
               </span>
             </span>
             <span
-              className="sw-RadioItems_Radio"
+              className="st-StrategyItem_Radio"
             />
           </span>
         </label>
diff --git a/test/components/StepOne/index.spec.js b/test/components/StepOne/index.spec.js
index 15e1fea1c..1af944a68 100644
--- a/test/components/StepOne/index.spec.js
+++ b/test/components/StepOne/index.spec.js
@@ -1,6 +1,6 @@
 import React from 'react'
 import Adapter from 'enzyme-adapter-react-15'
-import { configure, mount } from 'enzyme'
+import { configure, mount, shallow } from 'enzyme'
 import renderer from 'react-test-renderer'
 import { MemoryRouter } from 'react-router'
 import { StepOne } from '../../../src/components/StepOne/index'
@@ -17,6 +17,7 @@ import {
   tokenStore
 } from '../../../src/stores'
 import { CROWDSALE_STRATEGIES } from '../../../src/utils/constants'
+import GasPriceInput from '../../../src/components/StepThree/GasPriceInput'
 
 configure({ adapter: new Adapter() })
 
@@ -106,4 +107,54 @@ describe('StepOne', () => {
     // Then
     expect(stepOneComponent.instance().state.strategy).toBe(MINTED_CAPPED_CROWDSALE)
   })
+
+  it(`should render StepOne screen and test load method`, async () => {
+    // Given
+    const wrapper = shallow(<StepOne {...stores} />)
+    // When
+    const result = await wrapper
+      .dive()
+      .instance()
+      .load()
+    // Then
+    expect(result).toEqual({ strategy: 'white-list-with-cap' })
+  })
+
+  it(`should render StepOne screen and test load method with clearStorage`, async () => {
+    // Given
+    global.localStorage.clearStorage = true
+    const wrapper = shallow(<StepOne {...stores} />)
+    // When
+    const result = await wrapper
+      .dive()
+      .instance()
+      .load()
+    // Then
+    setTimeout(() => {
+      expect(result).toEqual({ strategy: 'white-list-with-cap' })
+    }, 2000)
+  })
+
+  it(`should render StepOne screen and test reload`, async () => {
+    // Given
+    global.localStorage.reload = true
+    global.location = jest.fn()
+    global.location.assign = jest.fn()
+    const wrapper = mount(<StepOne {...stores} />)
+
+    // When
+    setTimeout(() => {
+      // Then
+      expect(global.localStorage.reload).toBe(undefined)
+      expect(global.localStorage.clearStorage).toBeTruthy()
+    }, 2000)
+  })
+
+  it(`should render StepOne screen and test beforeUnloadSpy`, async () => {
+    const wrapper = mount(<StepOne {...stores} />)
+    window.location.reload()
+    setTimeout(() => {
+      expect(global.localStorage.reload).toBe(undefined)
+    }, 2000)
+  })
 })
diff --git a/test/components/StepThree/StepThreeFormDutchAuction.spec.js b/test/components/StepThree/StepThreeFormDutchAuction.spec.js
index 70382c03f..01dbae6ea 100644
--- a/test/components/StepThree/StepThreeFormDutchAuction.spec.js
+++ b/test/components/StepThree/StepThreeFormDutchAuction.spec.js
@@ -7,7 +7,7 @@ import Adapter from 'enzyme-adapter-react-15'
 import { configure, mount } from 'enzyme'
 import setFieldTouched from 'final-form-set-field-touched'
 import arrayMutators from 'final-form-arrays'
-import { GAS_PRICE } from '../../../src/utils/constants'
+import { CONTRIBUTION_OPTIONS, GAS_PRICE } from '../../../src/utils/constants'
 import {
   crowdsaleStore,
   gasPriceStore,
@@ -15,9 +15,10 @@ import {
   reservedTokenStore,
   tierStore,
   tokenStore
-} from '../../../src/stores/index'
+} from '../../../src/stores'
 import MockDate from 'mockdate'
 import { weiToGwei } from '../../../src/utils/utils'
+import { ReservedTokensInputBlock } from '../../../src/components/Common/ReservedTokensInputBlock'
 
 configure({ adapter: new Adapter() })
 jest.mock('react-dropzone', () => () => <span>Dropzone</span>)
@@ -39,34 +40,212 @@ describe('StepThreeFormDutchAuction', () => {
     generalStore.reset()
   })
 
-  it(`should render StepThreeFormDutchAuction`, () => {
-    // Given
-    const component = renderer.create(
+  it(`should render StepThreeFormDutchAuction- test snapshots`, () => {
+    const component = renderer
+      .create(
+        <Provider {...stores}>
+          <Form
+            onSubmit={jest.fn()}
+            decorators={[jest.fn()]}
+            initialValues={{
+              burnExcess: false,
+              gasPrice: GAS_PRICE.SLOW,
+              tiers: tierStore.tiers.slice(),
+              walletAddress: walletAddress,
+              whitelistEnabled: 'no'
+            }}
+            mutators={{ ...arrayMutators, setFieldTouched }}
+            history={{ push: jest.fn() }}
+            firstLoad={true}
+            updateGasTypeSelected={jest.fn()}
+            component={StepThreeFormDutchAuction}
+            {...stores}
+            goBack={jest.fn()}
+            goBackEnabled={jest.fn()}
+          />
+        </Provider>
+      )
+      .toJSON()
+
+    expect(component).toMatchSnapshot()
+  })
+
+  it(`should render StepThreeFormDutchAuction- test snapshot form`, () => {
+    const props = {
+      onSubmit: jest.fn(),
+      decorators: jest.fn(),
+      values: {
+        burnExcess: false,
+        gasPrice: GAS_PRICE.SLOW,
+        tiers: tierStore.tiers.slice(),
+        walletAddress: walletAddress,
+        whitelistEnabled: 'no'
+      },
+      generalStore: generalStore,
+      crowdsaleStore: crowdsaleStore,
+      gasPriceStore: gasPriceStore,
+      reservedTokenStore: reservedTokenStore,
+      tierStore: tierStore,
+      tokenStore: tokenStore,
+      form: { mutators: {} }
+    }
+    const FormComponent = mount(
+      <Provider {...stores}>
+        <StepThreeFormDutchAuction {...props} />
+      </Provider>
+    )
+
+    expect(FormComponent).toMatchSnapshot()
+  })
+
+  it(`should render StepThreeFormDutchAuction- test props I`, () => {
+    const props = {
+      onSubmit: jest.fn(),
+      decorators: jest.fn(),
+      values: {
+        burnExcess: false,
+        gasPrice: GAS_PRICE.SLOW,
+        tiers: tierStore.tiers.slice(),
+        walletAddress: walletAddress,
+        whitelistEnabled: 'no'
+      },
+      generalStore: generalStore,
+      crowdsaleStore: crowdsaleStore,
+      gasPriceStore: gasPriceStore,
+      reservedTokenStore: reservedTokenStore,
+      tierStore: tierStore,
+      tokenStore: tokenStore,
+      form: { mutators: {} }
+    }
+    const FormComponent = mount(
+      <Provider {...stores}>
+        <StepThreeFormDutchAuction {...props} />
+      </Provider>
+    )
+
+    const componentInstance = FormComponent.instance()
+
+    FormComponent.find('input[name="burnExcessRadioButtons"]')
+      .at(0)
+      .simulate('click')
+
+    expect(
+      FormComponent.find('input[name="burnExcessRadioButtons"]')
+        .find(`[value="yes"]`)
+        .props('checked')
+    ).toBeTruthy()
+  })
+
+  it(`should render StepThreeFormDutchAuction- test props II`, () => {
+    const props = {
+      onSubmit: jest.fn(),
+      decorators: jest.fn(),
+      values: {
+        burnExcess: false,
+        gasPrice: GAS_PRICE.SLOW,
+        tiers: tierStore.tiers.slice(),
+        walletAddress: walletAddress,
+        whitelistEnabled: 'no'
+      },
+      generalStore: generalStore,
+      crowdsaleStore: crowdsaleStore,
+      gasPriceStore: gasPriceStore,
+      reservedTokenStore: reservedTokenStore,
+      tierStore: tierStore,
+      tokenStore: tokenStore,
+      form: { mutators: {} }
+    }
+    const FormComponent = mount(
+      <Provider {...stores}>
+        <StepThreeFormDutchAuction {...props} />
+      </Provider>
+    )
+
+    const componentInstance = FormComponent.instance()
+
+    FormComponent.find('input[name="burnExcessRadioButtons"]')
+      .at(1)
+      .simulate('click')
+
+    expect(
+      FormComponent.find('input[name="burnExcessRadioButtons"]')
+        .find(`[value="no"]`)
+        .props('checked')
+    ).toBeTruthy()
+  })
+
+  it(`should render StepThreeFormDutchAuction- test props III`, () => {
+    const props = {
+      onSubmit: jest.fn(),
+      decorators: jest.fn(),
+      values: {
+        burnExcess: false,
+        gasPrice: GAS_PRICE.SLOW,
+        tiers: tierStore.tiers.slice(),
+        walletAddress: walletAddress,
+        whitelistEnabled: 'no'
+      },
+      generalStore: generalStore,
+      crowdsaleStore: crowdsaleStore,
+      gasPriceStore: gasPriceStore,
+      reservedTokenStore: reservedTokenStore,
+      tierStore: tierStore,
+      tokenStore: tokenStore,
+      form: { mutators: {} }
+    }
+    const FormComponent = mount(
+      <Provider {...stores}>
+        <StepThreeFormDutchAuction {...props} />
+      </Provider>
+    )
+
+    const componentInstance = FormComponent.instance()
+
+    FormComponent.find('input[name="burnExcessRadioButtons"]')
+      .at(1)
+      .simulate('change', { target: { value: 'yes' } })
+
+    expect(
+      FormComponent.find('input[name="burnExcessRadioButtons"]')
+        .find(`[value="yes"]`)
+        .props('checked')
+    ).toBeTruthy()
+  })
+
+  it(`should render StepThreeFormDutchAuction- test submit`, () => {
+    const onSubmit = jest.fn()
+
+    const props = {
+      handleSubmit: onSubmit,
+      decorators: jest.fn(),
+      values: {
+        burnExcess: false,
+        gasPrice: GAS_PRICE.SLOW,
+        tiers: tierStore.tiers.slice(),
+        walletAddress: walletAddress,
+        whitelistEnabled: 'no'
+      },
+      generalStore: generalStore,
+      crowdsaleStore: crowdsaleStore,
+      gasPriceStore: gasPriceStore,
+      reservedTokenStore: reservedTokenStore,
+      tierStore: tierStore,
+      tokenStore: tokenStore,
+      form: { mutators: {} }
+    }
+    const FormComponent = mount(
       <Provider {...stores}>
-        <Form
-          onSubmit={jest.fn()}
-          decorators={[jest.fn()]}
-          initialValues={{
-            burnExcess: false,
-            gasPrice: GAS_PRICE.SLOW,
-            tiers: tierStore.tiers.slice(),
-            walletAddress: walletAddress,
-            whitelistEnabled: 'no'
-          }}
-          mutators={{ ...arrayMutators, setFieldTouched }}
-          history={{ push: jest.fn() }}
-          firstLoad={true}
-          updateGasTypeSelected={jest.fn()}
-          component={StepThreeFormDutchAuction}
-          {...stores}
-        />
+        <StepThreeFormDutchAuction {...props} />
       </Provider>
     )
 
-    // When
-    const tree = component.toJSON()
+    const form = FormComponent.find('form').at(0)
+    const children = form
+      .render()
+      .children()
+      .children()
+    form.simulate('submit', { target: { children } })
 
-    // Then
-    expect(tree).toMatchSnapshot()
+    expect(onSubmit).toHaveBeenCalledTimes(1)
   })
 })
diff --git a/test/components/StepThree/__snapshots__/GasPriceInput.spec.js.snap b/test/components/StepThree/__snapshots__/GasPriceInput.spec.js.snap
index f74dda8f4..91bb2ac8e 100644
--- a/test/components/StepThree/__snapshots__/GasPriceInput.spec.js.snap
+++ b/test/components/StepThree/__snapshots__/GasPriceInput.spec.js.snap
@@ -422,6 +422,7 @@ exports[`GasPriceInput should render GasPriceInput component with custom gasType
           value={0.1}
         >
           <input
+            autoComplete="off"
             className="sw-TextField"
             id="gas-price-custom-value"
             min={0.1}
diff --git a/test/components/StepThree/__snapshots__/StepThreeFormDutchAuction.spec.js.snap b/test/components/StepThree/__snapshots__/StepThreeFormDutchAuction.spec.js.snap
index 73cdf2b45..a35cd66b1 100644
--- a/test/components/StepThree/__snapshots__/StepThreeFormDutchAuction.spec.js.snap
+++ b/test/components/StepThree/__snapshots__/StepThreeFormDutchAuction.spec.js.snap
@@ -1,6 +1,965 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`StepThreeFormDutchAuction should render StepThreeFormDutchAuction 1`] = `
+exports[`StepThreeFormDutchAuction should render StepThreeFormDutchAuction- test snapshot form 1`] = `
+<Provider
+  crowdsaleStore={
+    CrowdsaleStore {
+      "crowdsales": Array [],
+      "endTime": "2018-03-16T00:00",
+      "maximumSellableTokens": undefined,
+      "maximumSellableTokensInWei": undefined,
+      "selected": Object {
+        "initialTiersValues": Array [],
+        "updatable": false,
+      },
+      "strategy": undefined,
+      "supply": "0",
+    }
+  }
+  gasPriceStore={
+    GasPriceStore {
+      "block_number": undefined,
+      "block_time": undefined,
+      "custom": Object {
+        "id": "custom",
+        "price": 0.1,
+      },
+      "fast": Object {
+        "id": "fast",
+        "price": 15000000000,
+      },
+      "health": undefined,
+      "instant": Object {
+        "id": "instant",
+        "price": 45000000000,
+      },
+      "slow": Object {
+        "id": "slow",
+        "price": 5000000000,
+      },
+      "standard": Object {
+        "id": "normal",
+        "price": 10000000000,
+      },
+    }
+  }
+  generalStore={
+    GeneralStore {
+      "burnExcess": "no",
+      "gasPrice": 5000000000,
+      "gasTypeSelected": Object {
+        "description": "Safe and Cheap",
+        "id": "slow",
+        "price": 5000000000,
+      },
+      "networkID": undefined,
+    }
+  }
+  reservedTokenStore={
+    ReservedTokenStore {
+      "tokens": Array [],
+    }
+  }
+  tierStore={
+    TierStore {
+      "tiers": Array [
+        Object {
+          "endTime": "2018-03-16T00:00",
+          "minCap": "0",
+          "rate": "",
+          "startTime": "2018-03-12T11:05",
+          "supply": "",
+          "tier": "Tier 1",
+          "updatable": "off",
+          "walletAddress": "0xAC7022d55dA6C8BB229b1Ba3Ce8A16724FF79c4A",
+          "whitelist": Array [],
+          "whitelistEnabled": "no",
+        },
+      ],
+      "validTiers": Array [
+        Object {
+          "endTime": "VALIDATED",
+          "rate": "EMPTY",
+          "startTime": "VALIDATED",
+          "supply": "EMPTY",
+          "tier": "VALIDATED",
+          "updatable": "VALIDATED",
+        },
+      ],
+    }
+  }
+  tokenStore={
+    TokenStore {
+      "decimals": undefined,
+      "name": undefined,
+      "reservedTokensInput": Object {},
+      "supply": 0,
+      "ticker": undefined,
+      "validToken": Object {
+        "decimals": "EMPTY",
+        "name": "EMPTY",
+        "ticker": "EMPTY",
+      },
+    }
+  }
+>
+  <StepThreeFormDutchAuction
+    crowdsaleStore={
+      CrowdsaleStore {
+        "crowdsales": Array [],
+        "endTime": "2018-03-16T00:00",
+        "maximumSellableTokens": undefined,
+        "maximumSellableTokensInWei": undefined,
+        "selected": Object {
+          "initialTiersValues": Array [],
+          "updatable": false,
+        },
+        "strategy": undefined,
+        "supply": "0",
+      }
+    }
+    decorators={[MockFunction]}
+    form={
+      Object {
+        "mutators": Object {},
+      }
+    }
+    gasPriceStore={
+      GasPriceStore {
+        "block_number": undefined,
+        "block_time": undefined,
+        "custom": Object {
+          "id": "custom",
+          "price": 0.1,
+        },
+        "fast": Object {
+          "id": "fast",
+          "price": 15000000000,
+        },
+        "health": undefined,
+        "instant": Object {
+          "id": "instant",
+          "price": 45000000000,
+        },
+        "slow": Object {
+          "id": "slow",
+          "price": 5000000000,
+        },
+        "standard": Object {
+          "id": "normal",
+          "price": 10000000000,
+        },
+      }
+    }
+    generalStore={
+      GeneralStore {
+        "burnExcess": "no",
+        "gasPrice": 5000000000,
+        "gasTypeSelected": Object {
+          "description": "Safe and Cheap",
+          "id": "slow",
+          "price": 5000000000,
+        },
+        "networkID": undefined,
+      }
+    }
+    onSubmit={[MockFunction]}
+    reservedTokenStore={
+      ReservedTokenStore {
+        "tokens": Array [],
+      }
+    }
+    tierStore={
+      TierStore {
+        "tiers": Array [
+          Object {
+            "endTime": "2018-03-16T00:00",
+            "minCap": "0",
+            "rate": "",
+            "startTime": "2018-03-12T11:05",
+            "supply": "",
+            "tier": "Tier 1",
+            "updatable": "off",
+            "walletAddress": "0xAC7022d55dA6C8BB229b1Ba3Ce8A16724FF79c4A",
+            "whitelist": Array [],
+            "whitelistEnabled": "no",
+          },
+        ],
+        "validTiers": Array [
+          Object {
+            "endTime": "VALIDATED",
+            "rate": "EMPTY",
+            "startTime": "VALIDATED",
+            "supply": "EMPTY",
+            "tier": "VALIDATED",
+            "updatable": "VALIDATED",
+          },
+        ],
+      }
+    }
+    tokenStore={
+      TokenStore {
+        "decimals": undefined,
+        "name": undefined,
+        "reservedTokensInput": Object {},
+        "supply": 0,
+        "ticker": undefined,
+        "validToken": Object {
+          "decimals": "EMPTY",
+          "name": "EMPTY",
+          "ticker": "EMPTY",
+        },
+      }
+    }
+    values={
+      Object {
+        "burnExcess": false,
+        "gasPrice": Object {
+          "description": "Safe and Cheap",
+          "id": "slow",
+          "price": 5000000000,
+        },
+        "tiers": Array [
+          Object {
+            "endTime": "2018-03-16T00:00",
+            "minCap": "0",
+            "rate": "",
+            "startTime": "2018-03-12T11:05",
+            "supply": "",
+            "tier": "Tier 1",
+            "updatable": "off",
+            "walletAddress": "0xAC7022d55dA6C8BB229b1Ba3Ce8A16724FF79c4A",
+            "whitelist": Array [],
+            "whitelistEnabled": "no",
+          },
+        ],
+        "walletAddress": "0xAC7022d55dA6C8BB229b1Ba3Ce8A16724FF79c4A",
+        "whitelistEnabled": "no",
+      }
+    }
+  >
+    <form
+      className="st-StepContent_FormFullHeight"
+    >
+      <WhenFieldChanges
+        becomes="yes"
+        field="tiers[0].whitelistEnabled"
+        set="tiers[0].minCap"
+        to={0}
+      >
+        <Field
+          format={[Function]}
+          name="tiers[0].minCap"
+          parse={[Function]}
+          subscription={Object {}}
+        >
+          <OnChange
+            name="tiers[0].whitelistEnabled"
+          >
+            <Field
+              allowNull={true}
+              format={[Function]}
+              name="tiers[0].whitelistEnabled"
+              parse={[Function]}
+              render={[Function]}
+              subscription={
+                Object {
+                  "value": true,
+                }
+              }
+            >
+              <OnChangeState
+                input={
+                  Object {
+                    "name": "tiers[0].whitelistEnabled",
+                    "onBlur": [Function],
+                    "onChange": [Function],
+                    "onFocus": [Function],
+                    "value": "",
+                  }
+                }
+                meta={
+                  Object {
+                    "active": undefined,
+                    "data": undefined,
+                    "dirty": undefined,
+                    "dirtySinceLastSubmit": undefined,
+                    "error": undefined,
+                    "initial": undefined,
+                    "invalid": undefined,
+                    "pristine": undefined,
+                    "submitError": undefined,
+                    "submitFailed": undefined,
+                    "submitSucceeded": undefined,
+                    "touched": undefined,
+                    "valid": undefined,
+                    "visited": undefined,
+                  }
+                }
+              />
+            </Field>
+          </OnChange>
+        </Field>
+      </WhenFieldChanges>
+      <h2
+        className="sw-BorderedBlockTitle"
+      >
+        Global settings
+      </h2>
+      <div
+        className="sw-BorderedBlock sw-BorderedBlock-CrowdSaleSetupGlobalSettingsDutchAuction"
+        tabIndex="0"
+      >
+        <Field
+          component={[Function]}
+          description="Where the money goes after contributors transactions. Immediately after each transaction. We
+                        recommend to setup a multisig wallet with hardware based signers."
+          extraClassName="sw-InputField2-DutchAuctionWalletAddress"
+          format={[Function]}
+          label="Wallet Address"
+          name="walletAddress"
+          parse={[Function]}
+          placeholder="Enter here"
+          validate={[Function]}
+          value="0xAC7022d55dA6C8BB229b1Ba3Ce8A16724FF79c4A"
+        >
+          <InputField2
+            description="Where the money goes after contributors transactions. Immediately after each transaction. We
+                        recommend to setup a multisig wallet with hardware based signers."
+            extraClassName="sw-InputField2-DutchAuctionWalletAddress"
+            input={
+              Object {
+                "name": "walletAddress",
+                "onBlur": [Function],
+                "onChange": [Function],
+                "onFocus": [Function],
+                "value": "",
+              }
+            }
+            label="Wallet Address"
+            meta={
+              Object {
+                "active": undefined,
+                "data": undefined,
+                "dirty": undefined,
+                "dirtySinceLastSubmit": undefined,
+                "error": undefined,
+                "initial": undefined,
+                "invalid": undefined,
+                "pristine": undefined,
+                "submitError": undefined,
+                "submitFailed": undefined,
+                "submitSucceeded": undefined,
+                "touched": undefined,
+                "valid": undefined,
+                "visited": undefined,
+              }
+            }
+            placeholder="Enter here"
+          >
+            <div
+              className="sw-InputField2 sw-InputField2-DutchAuctionWalletAddress"
+            >
+              <FormControlTitle
+                description="Where the money goes after contributors transactions. Immediately after each transaction. We
+                        recommend to setup a multisig wallet with hardware based signers."
+                title="Wallet Address"
+              >
+                <div
+                  className="sw-FormControlTitle"
+                >
+                  <label
+                    className="sw-FormControlTitle_Label"
+                  >
+                    Wallet Address
+                  </label>
+                  <div
+                    className="sw-FormControlTitle_Info"
+                    tabIndex="-1"
+                  >
+                    <span
+                      className="sw-FormControlTitle_Tooltip"
+                    >
+                      Where the money goes after contributors transactions. Immediately after each transaction. We
+                        recommend to setup a multisig wallet with hardware based signers.
+                    </span>
+                  </div>
+                </div>
+              </FormControlTitle>
+              <TextField
+                id="walletAddress"
+                name="walletAddress"
+                onBlur={[Function]}
+                onChange={[Function]}
+                onFocus={[Function]}
+                placeholder="Enter here"
+                value=""
+              >
+                <input
+                  autoComplete="off"
+                  className="sw-TextField"
+                  id="walletAddress"
+                  name="walletAddress"
+                  onBlur={[Function]}
+                  onChange={[Function]}
+                  onFocus={[Function]}
+                  placeholder="Enter here"
+                  value=""
+                />
+              </TextField>
+              <Errors
+                name="walletAddress"
+              >
+                <Field
+                  format={[Function]}
+                  name="walletAddress"
+                  parse={[Function]}
+                  render={[Function]}
+                  subscription={
+                    Object {
+                      "error": true,
+                      "pristine": true,
+                      "touched": true,
+                    }
+                  }
+                />
+              </Errors>
+            </div>
+          </InputField2>
+        </Field>
+        <Field
+          component={[Function]}
+          extraClassName="sw-GasPriceInput-DutchAuction"
+          format={[Function]}
+          gasPrices={
+            Array [
+              Object {
+                "description": "Safe and Cheap (5 GWei)",
+                "id": "slow",
+                "price": 5,
+              },
+              Object {
+                "description": "Normal (10 GWei)",
+                "id": "normal",
+                "price": 10,
+              },
+              Object {
+                "description": "Fast and Expensive (15 GWei)",
+                "id": "fast",
+                "price": 15,
+              },
+              Object {
+                "description": "Custom",
+                "id": "custom",
+                "price": 1e-10,
+              },
+            ]
+          }
+          id="gasPrice"
+          name="gasPrice"
+          parse={[Function]}
+          side="right"
+          updateGasTypeSelected={[Function]}
+          validate={[Function]}
+        >
+          <inject-GasPriceInput-with-generalStore
+            extraClassName="sw-GasPriceInput-DutchAuction"
+            gasPrices={
+              Array [
+                Object {
+                  "description": "Safe and Cheap (5 GWei)",
+                  "id": "slow",
+                  "price": 5,
+                },
+                Object {
+                  "description": "Normal (10 GWei)",
+                  "id": "normal",
+                  "price": 10,
+                },
+                Object {
+                  "description": "Fast and Expensive (15 GWei)",
+                  "id": "fast",
+                  "price": 15,
+                },
+                Object {
+                  "description": "Custom",
+                  "id": "custom",
+                  "price": 1e-10,
+                },
+              ]
+            }
+            id="gasPrice"
+            input={
+              Object {
+                "name": "gasPrice",
+                "onBlur": [Function],
+                "onChange": [Function],
+                "onFocus": [Function],
+                "value": "",
+              }
+            }
+            meta={
+              Object {
+                "active": undefined,
+                "data": undefined,
+                "dirty": undefined,
+                "dirtySinceLastSubmit": undefined,
+                "error": undefined,
+                "initial": undefined,
+                "invalid": undefined,
+                "pristine": undefined,
+                "submitError": undefined,
+                "submitFailed": undefined,
+                "submitSucceeded": undefined,
+                "touched": undefined,
+                "valid": undefined,
+                "visited": undefined,
+              }
+            }
+            side="right"
+            updateGasTypeSelected={[Function]}
+          >
+            <GasPriceInput
+              extraClassName="sw-GasPriceInput-DutchAuction"
+              gasPrices={
+                Array [
+                  Object {
+                    "description": "Safe and Cheap (5 GWei)",
+                    "id": "slow",
+                    "price": 5,
+                  },
+                  Object {
+                    "description": "Normal (10 GWei)",
+                    "id": "normal",
+                    "price": 10,
+                  },
+                  Object {
+                    "description": "Fast and Expensive (15 GWei)",
+                    "id": "fast",
+                    "price": 15,
+                  },
+                  Object {
+                    "description": "Custom",
+                    "id": "custom",
+                    "price": 1e-10,
+                  },
+                ]
+              }
+              generalStore={
+                GeneralStore {
+                  "burnExcess": "no",
+                  "gasPrice": 5000000000,
+                  "gasTypeSelected": Object {
+                    "description": "Safe and Cheap",
+                    "id": "slow",
+                    "price": 5000000000,
+                  },
+                  "networkID": undefined,
+                }
+              }
+              id="gasPrice"
+              input={
+                Object {
+                  "name": "gasPrice",
+                  "onBlur": [Function],
+                  "onChange": [Function],
+                  "onFocus": [Function],
+                  "value": "",
+                }
+              }
+              meta={
+                Object {
+                  "active": undefined,
+                  "data": undefined,
+                  "dirty": undefined,
+                  "dirtySinceLastSubmit": undefined,
+                  "error": undefined,
+                  "initial": undefined,
+                  "invalid": undefined,
+                  "pristine": undefined,
+                  "submitError": undefined,
+                  "submitFailed": undefined,
+                  "submitSucceeded": undefined,
+                  "touched": undefined,
+                  "valid": undefined,
+                  "visited": undefined,
+                }
+              }
+              side="right"
+              updateGasTypeSelected={[Function]}
+            >
+              <div
+                className="sw-GasPriceInput sw-GasPriceInput-DutchAuction"
+              >
+                <FormControlTitle
+                  description="Slow is cheap, fast is expensive."
+                  title="Gas Price"
+                >
+                  <div
+                    className="sw-FormControlTitle"
+                  >
+                    <label
+                      className="sw-FormControlTitle_Label"
+                    >
+                      Gas Price
+                    </label>
+                    <div
+                      className="sw-FormControlTitle_Info"
+                      tabIndex="-1"
+                    >
+                      <span
+                        className="sw-FormControlTitle_Tooltip"
+                      >
+                        Slow is cheap, fast is expensive.
+                      </span>
+                    </div>
+                  </div>
+                </FormControlTitle>
+                <div
+                  className="sw-GasPriceInput_Select"
+                >
+                  <button
+                    className="sw-GasPriceInput_SelectButton"
+                    onClick={[Function]}
+                    type="button"
+                  >
+                    <span
+                      className="sw-GasPriceInput_SelectButtonText"
+                    >
+                      Safe and Cheap (5 GWei)
+                    </span>
+                    <span
+                      className="sw-GasPriceInput_SelectButtonChevron"
+                    />
+                  </button>
+                  <div
+                    className="sw-GasPriceInput_SelectList"
+                    onClick={[Function]}
+                  >
+                    <label
+                      className="sw-GasPriceInput_SelectItem"
+                      key="0"
+                      onClick={[Function]}
+                    >
+                      <input
+                        checked={true}
+                        className="sw-GasPriceInput_SelectInput"
+                        id="slow"
+                        name="gas-price"
+                        type="radio"
+                        value="slow"
+                      />
+                      <span
+                        className="sw-GasPriceInput_SelectText"
+                      >
+                        Safe and Cheap (5 GWei)
+                      </span>
+                    </label>
+                    <label
+                      className="sw-GasPriceInput_SelectItem"
+                      key="1"
+                      onClick={[Function]}
+                    >
+                      <input
+                        checked={false}
+                        className="sw-GasPriceInput_SelectInput"
+                        id="normal"
+                        name="gas-price"
+                        type="radio"
+                        value="normal"
+                      />
+                      <span
+                        className="sw-GasPriceInput_SelectText"
+                      >
+                        Normal (10 GWei)
+                      </span>
+                    </label>
+                    <label
+                      className="sw-GasPriceInput_SelectItem"
+                      key="2"
+                      onClick={[Function]}
+                    >
+                      <input
+                        checked={false}
+                        className="sw-GasPriceInput_SelectInput"
+                        id="fast"
+                        name="gas-price"
+                        type="radio"
+                        value="fast"
+                      />
+                      <span
+                        className="sw-GasPriceInput_SelectText"
+                      >
+                        Fast and Expensive (15 GWei)
+                      </span>
+                    </label>
+                    <label
+                      className="sw-GasPriceInput_SelectItem"
+                      key="3"
+                      onClick={[Function]}
+                    >
+                      <input
+                        checked={false}
+                        className="sw-GasPriceInput_SelectInput"
+                        id="custom"
+                        name="gas-price"
+                        type="radio"
+                        value="custom"
+                      />
+                      <span
+                        className="sw-GasPriceInput_SelectText"
+                      >
+                        Custom
+                      </span>
+                    </label>
+                  </div>
+                </div>
+                <Errors
+                  name="gasPrice"
+                >
+                  <Field
+                    format={[Function]}
+                    name="gasPrice"
+                    parse={[Function]}
+                    render={[Function]}
+                    subscription={
+                      Object {
+                        "error": true,
+                        "pristine": true,
+                        "touched": true,
+                      }
+                    }
+                  />
+                </Errors>
+              </div>
+            </GasPriceInput>
+          </inject-GasPriceInput-with-generalStore>
+        </Field>
+        <Field
+          format={[Function]}
+          name="burnExcess"
+          parse={[Function]}
+          render={[Function]}
+        >
+          <RadioButton
+            buttons={
+              Array [
+                Object {
+                  "checked": false,
+                  "id": "burnExcessRadioButtons.enable_whitelisting_yes",
+                  "label": "Yes",
+                  "name": "burnExcessRadioButtons",
+                  "onChange": [Function],
+                  "value": "yes",
+                },
+                Object {
+                  "checked": false,
+                  "id": "burnExcessRadioButtons.enable_whitelisting_no",
+                  "label": "No",
+                  "name": "burnExcessRadioButtons",
+                  "onChange": [Function],
+                  "value": "no",
+                },
+              ]
+            }
+            description="Whether the unsold tokens will be burnt on finalization, or be sent to the team wallet"
+            extraClassName="sw-RadioButton-DutchAuctionBurnExcess"
+            title="Burn Excess"
+          >
+            <div
+              className="sw-RadioButton sw-RadioButton-DutchAuctionBurnExcess"
+            >
+              <FormControlTitle
+                description="Whether the unsold tokens will be burnt on finalization, or be sent to the team wallet"
+                title="Burn Excess"
+              >
+                <div
+                  className="sw-FormControlTitle"
+                >
+                  <label
+                    className="sw-FormControlTitle_Label"
+                  >
+                    Burn Excess
+                  </label>
+                  <div
+                    className="sw-FormControlTitle_Info"
+                    tabIndex="-1"
+                  >
+                    <span
+                      className="sw-FormControlTitle_Tooltip"
+                    >
+                      Whether the unsold tokens will be burnt on finalization, or be sent to the team wallet
+                    </span>
+                  </div>
+                </div>
+              </FormControlTitle>
+              <div
+                className="sw-RadioButton_Container"
+              >
+                <label
+                  className="sw-RadioButton_Label"
+                  key="0"
+                >
+                  <input
+                    checked={false}
+                    className="sw-RadioButton_Input"
+                    id="burnExcessRadioButtons.enable_whitelisting_yes"
+                    name="burnExcessRadioButtons"
+                    onChange={[Function]}
+                    type="radio"
+                    value="yes"
+                  />
+                  <span
+                    className="sw-RadioButton_Button"
+                  >
+                    Yes
+                  </span>
+                </label>
+                <label
+                  className="sw-RadioButton_Label"
+                  key="1"
+                >
+                  <input
+                    checked={false}
+                    className="sw-RadioButton_Input"
+                    id="burnExcessRadioButtons.enable_whitelisting_no"
+                    name="burnExcessRadioButtons"
+                    onChange={[Function]}
+                    type="radio"
+                    value="no"
+                  />
+                  <span
+                    className="sw-RadioButton_Button"
+                  >
+                    No
+                  </span>
+                </label>
+              </div>
+            </div>
+          </RadioButton>
+        </Field>
+        <ReactFinalFormFieldArray(4.6.1)(undefined)
+          name="tiers"
+        >
+          <DutchAuctionBlock
+            fields={
+              Object {
+                "active": undefined,
+                "dirty": undefined,
+                "error": undefined,
+                "forEach": [Function],
+                "initial": undefined,
+                "invalid": undefined,
+                "length": undefined,
+                "map": [Function],
+                "name": "tiers",
+                "pristine": undefined,
+                "submitError": undefined,
+                "submitFailed": undefined,
+                "submitSucceeded": undefined,
+                "touched": undefined,
+                "valid": undefined,
+                "visited": undefined,
+              }
+            }
+            form={
+              Object {
+                "mutators": Object {},
+              }
+            }
+            tierStore={
+              TierStore {
+                "tiers": Array [
+                  Object {
+                    "endTime": "2018-03-16T00:00",
+                    "minCap": "0",
+                    "rate": "",
+                    "startTime": "2018-03-12T11:05",
+                    "supply": "",
+                    "tier": "Tier 1",
+                    "updatable": "off",
+                    "walletAddress": "0xAC7022d55dA6C8BB229b1Ba3Ce8A16724FF79c4A",
+                    "whitelist": Array [],
+                    "whitelistEnabled": "no",
+                  },
+                ],
+                "validTiers": Array [
+                  Object {
+                    "endTime": "VALIDATED",
+                    "rate": "EMPTY",
+                    "startTime": "VALIDATED",
+                    "supply": "EMPTY",
+                    "tier": "VALIDATED",
+                    "updatable": "VALIDATED",
+                  },
+                ],
+              }
+            }
+            tokenStore={
+              TokenStore {
+                "decimals": undefined,
+                "name": undefined,
+                "reservedTokensInput": Object {},
+                "supply": 0,
+                "ticker": undefined,
+                "validToken": Object {
+                  "decimals": "EMPTY",
+                  "name": "EMPTY",
+                  "ticker": "EMPTY",
+                },
+              }
+            }
+          >
+            <div
+              className="sw-DutchAuctionBlock"
+            />
+          </DutchAuctionBlock>
+        </ReactFinalFormFieldArray(4.6.1)(undefined)>
+      </div>
+      <div
+        className="st-StepContent_Buttons"
+      >
+        <ButtonBack
+          disabled={true}
+        >
+          <button
+            className="sw-ButtonBack "
+            disabled={true}
+            type="button"
+          >
+            Back
+          </button>
+        </ButtonBack>
+        <ButtonContinue
+          type="submit"
+        >
+          <button
+            className="sw-ButtonContinue "
+            disabled={false}
+            type="submit"
+          >
+            <span
+              className="sw-ButtonContinue_Text"
+            >
+              Continue
+            </span>
+          </button>
+        </ButtonContinue>
+      </div>
+      <FormSpy
+        onChange={[Function]}
+        subscription={
+          Object {
+            "values": true,
+          }
+        }
+      />
+    </form>
+  </StepThreeFormDutchAuction>
+</Provider>
+`;
+
+exports[`StepThreeFormDutchAuction should render StepThreeFormDutchAuction- test snapshots 1`] = `
 <form
   className="st-StepContent_FormFullHeight"
   onSubmit={[Function]}
@@ -38,6 +997,7 @@ exports[`StepThreeFormDutchAuction should render StepThreeFormDutchAuction 1`] =
         </div>
       </div>
       <input
+        autoComplete="off"
         className="sw-TextField"
         id="walletAddress"
         name="walletAddress"
@@ -256,6 +1216,7 @@ exports[`StepThreeFormDutchAuction should render StepThreeFormDutchAuction 1`] =
             </div>
           </div>
           <input
+            autoComplete="off"
             className="sw-TextField"
             id="tiers[0].startTime"
             name="tiers[0].startTime"
@@ -289,6 +1250,7 @@ exports[`StepThreeFormDutchAuction should render StepThreeFormDutchAuction 1`] =
             </div>
           </div>
           <input
+            autoComplete="off"
             className="sw-TextField"
             id="tiers[0].endTime"
             name="tiers[0].endTime"
@@ -322,6 +1284,7 @@ exports[`StepThreeFormDutchAuction should render StepThreeFormDutchAuction 1`] =
             </div>
           </div>
           <input
+            autoComplete="off"
             className="sw-TextField"
             id="tiers[0].minRate"
             min="0"
@@ -366,6 +1329,7 @@ exports[`StepThreeFormDutchAuction should render StepThreeFormDutchAuction 1`] =
             </div>
           </div>
           <input
+            autoComplete="off"
             className="sw-TextField"
             id="tiers[0].maxRate"
             min="0"
@@ -410,6 +1374,7 @@ exports[`StepThreeFormDutchAuction should render StepThreeFormDutchAuction 1`] =
             </div>
           </div>
           <input
+            autoComplete="off"
             className="sw-TextField"
             disabled={false}
             id="tiers[0].supply"
@@ -457,6 +1422,7 @@ exports[`StepThreeFormDutchAuction should render StepThreeFormDutchAuction 1`] =
             </div>
           </div>
           <input
+            autoComplete="off"
             className="sw-TextField"
             disabled={false}
             id="tiers[0].minCap"
@@ -553,7 +1519,8 @@ exports[`StepThreeFormDutchAuction should render StepThreeFormDutchAuction 1`] =
   >
     <button
       className="sw-ButtonBack "
-      disabled={true}
+      disabled={false}
+      onClick={[MockFunction]}
       type="button"
     >
       Back
diff --git a/test/components/StepThree/__snapshots__/StepThreeFormMintedCapped.spec.js.snap b/test/components/StepThree/__snapshots__/StepThreeFormMintedCapped.spec.js.snap
index b8d50441b..4caf7e0d5 100644
--- a/test/components/StepThree/__snapshots__/StepThreeFormMintedCapped.spec.js.snap
+++ b/test/components/StepThree/__snapshots__/StepThreeFormMintedCapped.spec.js.snap
@@ -39,6 +39,7 @@ exports[`StepThreeFormMintedCapped should render StepThreeFormMintedCapped 1`] =
         </div>
       </div>
       <input
+        autoComplete="off"
         className="sw-TextField"
         id="walletAddress"
         name="walletAddress"
@@ -197,6 +198,7 @@ exports[`StepThreeFormMintedCapped should render StepThreeFormMintedCapped 1`] =
           </div>
         </div>
         <input
+          autoComplete="off"
           className="sw-TextField"
           id="tiers[0].tier"
           name="tiers[0].tier"
@@ -231,6 +233,7 @@ exports[`StepThreeFormMintedCapped should render StepThreeFormMintedCapped 1`] =
           </div>
         </div>
         <input
+          autoComplete="off"
           className="sw-TextField"
           disabled={false}
           id="tiers[0].startTime"
@@ -265,6 +268,7 @@ exports[`StepThreeFormMintedCapped should render StepThreeFormMintedCapped 1`] =
           </div>
         </div>
         <input
+          autoComplete="off"
           className="sw-TextField"
           id="tiers[0].endTime"
           name="tiers[0].endTime"
@@ -298,6 +302,7 @@ exports[`StepThreeFormMintedCapped should render StepThreeFormMintedCapped 1`] =
           </div>
         </div>
         <input
+          autoComplete="off"
           className="sw-TextField"
           id="tiers[0].rate"
           max="1000000000000000000"
@@ -353,6 +358,7 @@ exports[`StepThreeFormMintedCapped should render StepThreeFormMintedCapped 1`] =
           </div>
         </div>
         <input
+          autoComplete="off"
           className="sw-TextField"
           disabled={false}
           id="tiers[0].supply"
@@ -399,6 +405,7 @@ exports[`StepThreeFormMintedCapped should render StepThreeFormMintedCapped 1`] =
           </div>
         </div>
         <input
+          autoComplete="off"
           className="sw-TextField"
           disabled={false}
           id="tiers[0].minCap"
diff --git a/test/components/StepThree/__snapshots__/index.spec.js.snap b/test/components/StepThree/__snapshots__/index.spec.js.snap
index eb8e439d2..d721b405a 100644
--- a/test/components/StepThree/__snapshots__/index.spec.js.snap
+++ b/test/components/StepThree/__snapshots__/index.spec.js.snap
@@ -158,6 +158,7 @@ exports[`StepThree StepThree - renders should render StepThree for Dutch Auction
               </div>
             </div>
             <input
+              autoComplete="off"
               className="sw-TextField"
               id="walletAddress"
               name="walletAddress"
@@ -376,6 +377,7 @@ exports[`StepThree StepThree - renders should render StepThree for Dutch Auction
                   </div>
                 </div>
                 <input
+                  autoComplete="off"
                   className="sw-TextField"
                   id="tiers[0].startTime"
                   name="tiers[0].startTime"
@@ -409,6 +411,7 @@ exports[`StepThree StepThree - renders should render StepThree for Dutch Auction
                   </div>
                 </div>
                 <input
+                  autoComplete="off"
                   className="sw-TextField"
                   id="tiers[0].endTime"
                   name="tiers[0].endTime"
@@ -442,6 +445,7 @@ exports[`StepThree StepThree - renders should render StepThree for Dutch Auction
                   </div>
                 </div>
                 <input
+                  autoComplete="off"
                   className="sw-TextField"
                   id="tiers[0].minRate"
                   min="0"
@@ -477,6 +481,7 @@ exports[`StepThree StepThree - renders should render StepThree for Dutch Auction
                   </div>
                 </div>
                 <input
+                  autoComplete="off"
                   className="sw-TextField"
                   id="tiers[0].maxRate"
                   min="0"
@@ -512,6 +517,7 @@ exports[`StepThree StepThree - renders should render StepThree for Dutch Auction
                   </div>
                 </div>
                 <input
+                  autoComplete="off"
                   className="sw-TextField"
                   disabled={false}
                   id="tiers[0].supply"
@@ -550,6 +556,7 @@ exports[`StepThree StepThree - renders should render StepThree for Dutch Auction
                   </div>
                 </div>
                 <input
+                  autoComplete="off"
                   className="sw-TextField"
                   disabled={false}
                   id="tiers[0].minCap"
@@ -820,6 +827,7 @@ exports[`StepThree StepThree - renders should render StepThree for Whitelist wit
               </div>
             </div>
             <input
+              autoComplete="off"
               className="sw-TextField"
               id="walletAddress"
               name="walletAddress"
@@ -978,6 +986,7 @@ exports[`StepThree StepThree - renders should render StepThree for Whitelist wit
                 </div>
               </div>
               <input
+                autoComplete="off"
                 className="sw-TextField"
                 id="tiers[0].tier"
                 name="tiers[0].tier"
@@ -1012,6 +1021,7 @@ exports[`StepThree StepThree - renders should render StepThree for Whitelist wit
                 </div>
               </div>
               <input
+                autoComplete="off"
                 className="sw-TextField"
                 disabled={false}
                 id="tiers[0].startTime"
@@ -1046,6 +1056,7 @@ exports[`StepThree StepThree - renders should render StepThree for Whitelist wit
                 </div>
               </div>
               <input
+                autoComplete="off"
                 className="sw-TextField"
                 id="tiers[0].endTime"
                 name="tiers[0].endTime"
@@ -1079,6 +1090,7 @@ exports[`StepThree StepThree - renders should render StepThree for Whitelist wit
                 </div>
               </div>
               <input
+                autoComplete="off"
                 className="sw-TextField"
                 id="tiers[0].rate"
                 max="1000000000000000000"
@@ -1115,6 +1127,7 @@ exports[`StepThree StepThree - renders should render StepThree for Whitelist wit
                 </div>
               </div>
               <input
+                autoComplete="off"
                 className="sw-TextField"
                 disabled={false}
                 id="tiers[0].supply"
@@ -1152,6 +1165,7 @@ exports[`StepThree StepThree - renders should render StepThree for Whitelist wit
                 </div>
               </div>
               <input
+                autoComplete="off"
                 className="sw-TextField"
                 disabled={false}
                 id="tiers[0].minCap"
diff --git a/test/components/StepThree/index.spec.js b/test/components/StepThree/index.spec.js
index 099436845..46ce52274 100644
--- a/test/components/StepThree/index.spec.js
+++ b/test/components/StepThree/index.spec.js
@@ -18,6 +18,7 @@ import {
 import { MemoryRouter } from 'react-router'
 import { Provider } from 'mobx-react'
 import MockDate from 'mockdate'
+import { mount } from 'enzyme/build/index'
 
 configure({ adapter: new Adapter() })
 
@@ -41,6 +42,9 @@ describe('StepThree', () => {
     tokenStore,
     crowdsaleStore
   }
+  const history = {
+    push: jest.fn()
+  }
 
   describe('StepThree - renders', () => {
     strategies.forEach(strategy => {
@@ -65,35 +69,94 @@ describe('StepThree', () => {
     })
   })
 
+  it(`should execute goBack`, () => {
+    const wrapper = mount(
+      <Provider {...stores}>
+        <MemoryRouter initialEntries={['/', '1', '2']} initialIndex={2}>
+          <StepThree />
+        </MemoryRouter>
+      </Provider>
+    )
+    // Then
+    const stepThreeComponent = wrapper.find('StepThree')
+    const stepThreeComponentInstance = stepThreeComponent.instance()
+    stepThreeComponentInstance.goBack()
+
+    // When
+    expect(stepThreeComponentInstance.state.backButtonTriggered).toBeTruthy()
+  })
+
+  it(`should execute goNextStep`, () => {
+    const wrapper = mount(
+      <Provider {...stores}>
+        <MemoryRouter initialEntries={['/', '1', '2']} initialIndex={2}>
+          <StepThree />
+        </MemoryRouter>
+      </Provider>
+    )
+    // Then
+    const stepThreeComponent = wrapper.find('StepThree')
+    const stepThreeComponentInstance = stepThreeComponent.instance()
+    stepThreeComponentInstance.goNextStep()
+
+    // When
+    expect(stepThreeComponentInstance.state.nextButtonTriggered).toBeTruthy()
+  })
+
+  it(`should execute goBackEnabled`, () => {
+    const wrapper = mount(
+      <Provider {...stores}>
+        <MemoryRouter initialEntries={['/', '1', '2']} initialIndex={2}>
+          <StepThree history={history} />
+        </MemoryRouter>
+      </Provider>
+    )
+    // Then
+    const stepThreeComponent = wrapper.find('StepThree')
+    const stepThreeComponentInstance = stepThreeComponent.instance()
+    stepThreeComponentInstance.goBackEnabled()
+
+    // When
+    expect(stepThreeComponentInstance.state.goBackEnabledTriggered).toBeTruthy()
+  })
   // This tests is expected to trigger 'handleOnSubmit' method... but up to this point it wasn't working
-  // describe('StepThree - methods', () => {
-  //   it(`should call onSubmit handler if form is valid`, () => {
-  //     // Given
-  //     const walletAddress = '0xAC7022d55dA6C8BB229b1Ba3Ce8A16724FF79c4A'
-  //     const [{ type: strategy }] = strategies
-  //     stores.crowdsaleStore.setProperty('strategy', strategy)
-  //     stores.tierStore.addCrowdsale(walletAddress)
-  //     stores.tokenStore.setProperty('decimals', 18)
-  //
-  //     const wrapper = mount(
-  //       <Provider {...stores}>
-  //         <MemoryRouter initialEntries={['/']}>
-  //           <StepThree {...stores} />
-  //         </MemoryRouter>
-  //       </Provider>
-  //     )
-  //     const handleOnSubmit = jest.spyOn(wrapper.find('StepThree').instance(), 'handleOnSubmit')
-  //     // wrapper.update()
-  //
-  //     // When
-  //     wrapper.find('input[name="walletAddress"]').simulate('change', { target: { value: walletAddress } })
-  //     wrapper.find('input[name="tiers[0].endTime"]').simulate('change', { target: { value: '2018-03-14T12:00:00' } })
-  //     wrapper.find('input[name="tiers[0].rate"]').simulate('change', { target: { value: '100000' } })
-  //     wrapper.find('input[name="tiers[0].supply"]').simulate('change', { target: { value: '100' } })
-  //     wrapper.find('ButtonContinue').simulate('submit')
-  //
-  //     // Then
-  //     expect(handleOnSubmit).toHaveBeenCalledTimes(1)
-  //   })
-  // })
+
+  it(`should call onSubmit handler if form is valid`, () => {
+    // Given
+    process.NODE_ENV = 'test'
+    const walletAddress = '0xAC7022d55dA6C8BB229b1Ba3Ce8A16724FF79c4A'
+    const [{ type: strategy }] = strategies
+    stores.crowdsaleStore.setProperty('strategy', strategy)
+    stores.tierStore.addCrowdsale(walletAddress)
+    stores.tokenStore.setProperty('decimals', 18)
+
+    const wrapper = mount(
+      <Provider {...stores}>
+        <MemoryRouter initialEntries={['/']}>
+          <StepThree {...stores} history={history} />
+        </MemoryRouter>
+      </Provider>
+    )
+    const handleOnSubmit = jest.spyOn(wrapper.find('StepThree').instance(), 'handleOnSubmit')
+
+    // When
+    wrapper.find('input[name="walletAddress"]').simulate('change', { target: { value: walletAddress } })
+    wrapper.find('input[name="tiers[0].endTime"]').simulate('change', { target: { value: '2018-03-14T12:00:00' } })
+    wrapper.find('input[name="tiers[0].rate"]').simulate('change', { target: { value: '100000' } })
+    wrapper.find('input[name="tiers[0].supply"]').simulate('change', { target: { value: '100' } })
+
+    // Then
+
+    const form = wrapper.find('form').at(0)
+    const children = form
+      .render()
+      .children()
+      .children()
+    form.simulate('submit', { target: { children } })
+
+    setTimeout(() => {
+      wrapper.update()
+      expect(handleOnSubmit).toHaveBeenCalledTimes(1)
+    }, 2000)
+  })
 })
diff --git a/test/components/StepTwo/StepTwoForm.spec.js b/test/components/StepTwo/StepTwoForm.spec.js
index 3d062c484..1ec75064f 100644
--- a/test/components/StepTwo/StepTwoForm.spec.js
+++ b/test/components/StepTwo/StepTwoForm.spec.js
@@ -34,6 +34,8 @@ describe('StepTwoForm', () => {
           component={StepTwoForm}
           id="tokenData"
           reload={true}
+          goBack={jest.fn()}
+          goBackEnabled={jest.fn()}
         />
       </Provider>
     )
@@ -59,6 +61,8 @@ describe('StepTwoForm', () => {
           component={StepTwoForm}
           id="tokenData"
           reload={false}
+          goBack={jest.fn()}
+          goBackEnabled={jest.fn()}
         />
       </Provider>
     )
@@ -81,6 +85,9 @@ describe('StepTwoForm', () => {
           }}
           component={StepTwoForm}
           id="tokenData"
+          reload={false}
+          goBack={jest.fn()}
+          goBackEnabled={jest.fn()}
         />
       </Provider>
     )
@@ -103,6 +110,9 @@ describe('StepTwoForm', () => {
           }}
           component={StepTwoForm}
           id="tokenData"
+          reload={false}
+          goBack={jest.fn()}
+          goBackEnabled={jest.fn()}
         />
       </Provider>
     )
diff --git a/test/components/StepTwo/__snapshots__/StepTwoForm.spec.js.snap b/test/components/StepTwo/__snapshots__/StepTwoForm.spec.js.snap
index c5af858f6..6159a4964 100644
--- a/test/components/StepTwo/__snapshots__/StepTwoForm.spec.js.snap
+++ b/test/components/StepTwo/__snapshots__/StepTwoForm.spec.js.snap
@@ -32,6 +32,7 @@ exports[`StepTwoForm should render StepTwoForm for Dutch Auction Crowdsale 1`] =
         </div>
       </div>
       <input
+        autoComplete="off"
         className="sw-TextField"
         id="name"
         name="name"
@@ -66,6 +67,7 @@ exports[`StepTwoForm should render StepTwoForm for Dutch Auction Crowdsale 1`] =
         </div>
       </div>
       <input
+        autoComplete="off"
         className="sw-TextField"
         id="ticker"
         name="ticker"
@@ -100,6 +102,7 @@ exports[`StepTwoForm should render StepTwoForm for Dutch Auction Crowdsale 1`] =
         </div>
       </div>
       <input
+        autoComplete="off"
         className="sw-TextField"
         disabled={false}
         id="decimals"
@@ -137,6 +140,7 @@ exports[`StepTwoForm should render StepTwoForm for Dutch Auction Crowdsale 1`] =
         </div>
       </div>
       <input
+        autoComplete="off"
         className="sw-TextField"
         id="supply"
         min="0"
@@ -155,7 +159,8 @@ exports[`StepTwoForm should render StepTwoForm for Dutch Auction Crowdsale 1`] =
   >
     <button
       className="sw-ButtonBack "
-      disabled={true}
+      disabled={false}
+      onClick={[MockFunction]}
       type="button"
     >
       Back
@@ -207,6 +212,7 @@ exports[`StepTwoForm should render StepTwoForm for Minted Capped Crowdsale 1`] =
         </div>
       </div>
       <input
+        autoComplete="off"
         className="sw-TextField"
         id="name"
         name="name"
@@ -241,6 +247,7 @@ exports[`StepTwoForm should render StepTwoForm for Minted Capped Crowdsale 1`] =
         </div>
       </div>
       <input
+        autoComplete="off"
         className="sw-TextField"
         id="ticker"
         name="ticker"
@@ -275,6 +282,7 @@ exports[`StepTwoForm should render StepTwoForm for Minted Capped Crowdsale 1`] =
         </div>
       </div>
       <input
+        autoComplete="off"
         className="sw-TextField"
         disabled={false}
         id="decimals"
@@ -322,6 +330,7 @@ exports[`StepTwoForm should render StepTwoForm for Minted Capped Crowdsale 1`] =
           </div>
         </div>
         <input
+          autoComplete="off"
           className="sw-TextField"
           onChange={[Function]}
           placeholder="Enter here"
@@ -417,6 +426,7 @@ exports[`StepTwoForm should render StepTwoForm for Minted Capped Crowdsale 1`] =
             </div>
           </div>
           <input
+            autoComplete="off"
             className="sw-TextField"
             min="0.00000000000001"
             onChange={[Function]}
@@ -456,7 +466,8 @@ exports[`StepTwoForm should render StepTwoForm for Minted Capped Crowdsale 1`] =
   >
     <button
       className="sw-ButtonBack "
-      disabled={true}
+      disabled={false}
+      onClick={[MockFunction]}
       type="button"
     >
       Back
diff --git a/test/components/StepTwo/__snapshots__/index.spec.js.snap b/test/components/StepTwo/__snapshots__/index.spec.js.snap
index 1c9533d2a..a51dab459 100644
--- a/test/components/StepTwo/__snapshots__/index.spec.js.snap
+++ b/test/components/StepTwo/__snapshots__/index.spec.js.snap
@@ -152,6 +152,7 @@ exports[`StepTwo should render StepTwo for Dutch Auction strategy 1`] = `
               </div>
             </div>
             <input
+              autoComplete="off"
               className="sw-TextField"
               id="name"
               name="name"
@@ -186,6 +187,7 @@ exports[`StepTwo should render StepTwo for Dutch Auction strategy 1`] = `
               </div>
             </div>
             <input
+              autoComplete="off"
               className="sw-TextField"
               id="ticker"
               name="ticker"
@@ -220,6 +222,7 @@ exports[`StepTwo should render StepTwo for Dutch Auction strategy 1`] = `
               </div>
             </div>
             <input
+              autoComplete="off"
               className="sw-TextField"
               disabled={false}
               id="decimals"
@@ -257,6 +260,7 @@ exports[`StepTwo should render StepTwo for Dutch Auction strategy 1`] = `
               </div>
             </div>
             <input
+              autoComplete="off"
               className="sw-TextField"
               id="supply"
               min="0"
@@ -451,6 +455,7 @@ exports[`StepTwo should render StepTwo for Minted Capped strategy 1`] = `
               </div>
             </div>
             <input
+              autoComplete="off"
               className="sw-TextField"
               id="name"
               name="name"
@@ -485,6 +490,7 @@ exports[`StepTwo should render StepTwo for Minted Capped strategy 1`] = `
               </div>
             </div>
             <input
+              autoComplete="off"
               className="sw-TextField"
               id="ticker"
               name="ticker"
@@ -519,6 +525,7 @@ exports[`StepTwo should render StepTwo for Minted Capped strategy 1`] = `
               </div>
             </div>
             <input
+              autoComplete="off"
               className="sw-TextField"
               disabled={false}
               id="decimals"
diff --git a/test/components/StepTwo/index.spec.js b/test/components/StepTwo/index.spec.js
index bda70fa23..b9d38512b 100644
--- a/test/components/StepTwo/index.spec.js
+++ b/test/components/StepTwo/index.spec.js
@@ -1,7 +1,7 @@
 import React from 'react'
 import Adapter from 'enzyme-adapter-react-15'
 import { Provider } from 'mobx-react'
-import { configure } from 'enzyme'
+import { configure, mount, shallow } from 'enzyme'
 import renderer from 'react-test-renderer'
 import { MemoryRouter } from 'react-router'
 import { StepTwo } from '../../../src/components/StepTwo/index'
@@ -12,6 +12,9 @@ configure({ adapter: new Adapter() })
 
 describe('StepTwo', () => {
   const stores = { tokenStore, crowdsaleStore, reservedTokenStore }
+  const history = {
+    push: jest.fn()
+  }
 
   it(`should render StepTwo for Minted Capped strategy`, () => {
     // Given
@@ -47,4 +50,91 @@ describe('StepTwo', () => {
     // Then
     expect(tree).toMatchSnapshot()
   })
+
+  it(`should click go back button`, () => {
+    const wrapper = mount(
+      <Provider {...stores}>
+        <MemoryRouter initialEntries={['/', '1', '2']} initialIndex={2}>
+          <StepTwo />
+        </MemoryRouter>
+      </Provider>
+    )
+    const stepTwoComponent = wrapper.find('StepTwo')
+
+    // When
+    stepTwoComponent.find('button.sw-ButtonBack').simulate('click')
+
+    // Then
+    expect(stepTwoComponent.instance().state.backButtonTriggered).toBeTruthy()
+  })
+
+  it(`should click next button`, () => {
+    const wrapper = mount(
+      <Provider {...stores}>
+        <MemoryRouter initialEntries={['/', '1', '2']} initialIndex={2}>
+          <StepTwo />
+        </MemoryRouter>
+      </Provider>
+    )
+    const stepTwoComponent = wrapper.find('StepTwo')
+
+    // When
+    stepTwoComponent.find('button.sw-ButtonContinue').simulate('click')
+
+    setTimeout(() => {
+      // Then
+      expect(stepTwoComponent.instance().state.nextButtonTriggered).toBeTruthy()
+    }, 2000)
+  })
+
+  it(`should execute goBack`, () => {
+    const wrapper = mount(
+      <Provider {...stores}>
+        <MemoryRouter initialEntries={['/', '1', '2']} initialIndex={2}>
+          <StepTwo />
+        </MemoryRouter>
+      </Provider>
+    )
+    // Then
+    const stepTwoComponent = wrapper.find('StepTwo')
+    const stepTwoComponentInstance = stepTwoComponent.instance()
+    stepTwoComponentInstance.goBack()
+
+    // When
+    expect(stepTwoComponentInstance.state.backButtonTriggered).toBeTruthy()
+  })
+
+  it(`should execute goNextStep`, () => {
+    const wrapper = mount(
+      <Provider {...stores}>
+        <MemoryRouter initialEntries={['/', '1', '2']} initialIndex={2}>
+          <StepTwo />
+        </MemoryRouter>
+      </Provider>
+    )
+    // Then
+    const stepTwoComponent = wrapper.find('StepTwo')
+    const stepTwoComponentInstance = stepTwoComponent.instance()
+    stepTwoComponentInstance.goNextStep()
+
+    // When
+    expect(stepTwoComponentInstance.state.nextButtonTriggered).toBeTruthy()
+  })
+
+  it(`should execute goBackEnabled`, () => {
+    const wrapper = mount(
+      <Provider {...stores}>
+        <MemoryRouter initialEntries={['/', '1', '2']} initialIndex={2}>
+          <StepTwo history={history} />
+        </MemoryRouter>
+      </Provider>
+    )
+    // Then
+    const stepTwoComponent = wrapper.find('StepTwo')
+    const stepTwoComponentInstance = stepTwoComponent.instance()
+    stepTwoComponentInstance.goBackEnabled()
+
+    // When
+    expect(stepTwoComponentInstance.state.goBackEnabledTriggered).toBeTruthy()
+  })
 })
diff --git a/test/components/manage/AboutCrowdsale.spec.js b/test/components/manage/AboutCrowdsale.spec.js
deleted file mode 100644
index f3d3aac7b..000000000
--- a/test/components/manage/AboutCrowdsale.spec.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import React from 'react'
-import { StaticRouter } from 'react-router'
-import { AboutCrowdsale } from '../../../src/components/manage/AboutCrowdsale'
-import renderer from 'react-test-renderer'
-import Adapter from 'enzyme-adapter-react-15'
-import { configure } from 'enzyme'
-
-configure({ adapter: new Adapter() })
-
-describe('AboutCrowdsale', () => {
-  it('should render the component', () => {
-    const aboutCrowdsaleParams = {
-      name: 'MyToken',
-      ticker: 'MTK',
-      execID: '0x461451505864e9dfe45bac39478a4ed689d74a737c0c3308cb0c8607ca0c14bd',
-      networkID: '12648430'
-    }
-
-    expect(
-      renderer
-        .create(
-          <StaticRouter location="testLocation" context={{}}>
-            <AboutCrowdsale {...aboutCrowdsaleParams} />
-          </StaticRouter>
-        )
-        .toJSON()
-    ).toMatchSnapshot()
-  })
-})
diff --git a/test/components/manage/ReadOnlyWhitelistAddresses.spec.js b/test/components/manage/ReadOnlyWhitelistAddresses.spec.js
deleted file mode 100644
index 11f358d13..000000000
--- a/test/components/manage/ReadOnlyWhitelistAddresses.spec.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import React from 'react'
-import { ReadOnlyWhitelistAddresses } from '../../../src/components/manage/ReadOnlyWhitelistAddresses'
-import renderer from 'react-test-renderer'
-import Adapter from 'enzyme-adapter-react-15'
-import { configure, mount } from 'enzyme'
-
-const noAddressMessage = 'no addresses loaded'
-
-const whitelistsAddresses = [
-  { addr: '0x1dF62f291b2E969fB0849d99D9Ce41e2F137006e', min: 1234, max: 50505, stored: true },
-  { addr: '0x22d491Bde2303f2f43325b2108D26f1eAbA1e32b', min: 1234, max: 50505, stored: true },
-  { addr: '0x3E5e9111Ae8eB78Fe1CC3bb8915d5D461F3Ef9A9', min: 1234, max: 50505, stored: true },
-  { addr: '0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1', min: 1234, max: 50505, stored: true },
-  { addr: '0x95cED938F7991cd0dFcb48F0a06a40FA1aF46EBC', min: 1234, max: 50505, stored: true },
-  { addr: '0xACa94ef8bD5ffEE41947b4585a84BdA5a3d3DA6E', min: 1234, max: 50505, stored: true },
-  { addr: '0xd03ea8624C8C5987235048901fB614fDcA89b117', min: 1234, max: 50505, stored: true },
-  { addr: '0xE11BA2b4D45Eaed5996Cd0823791E0C93114882d', min: 1234, max: 50505, stored: true },
-  { addr: '0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0', min: 1234, max: 50505, stored: true }
-]
-
-configure({ adapter: new Adapter() })
-
-describe('ManageForm', () => {
-  it('should render the whitelist addresses', () => {
-    expect(
-      renderer.create(<ReadOnlyWhitelistAddresses tier={{ whitelist: whitelistsAddresses }} />).toJSON()
-    ).toMatchSnapshot()
-  })
-
-  it(`should render "${noAddressMessage}" message if no whitelist available`, () => {
-    const wrapper = mount(<ReadOnlyWhitelistAddresses tier={{ whitelist: [] }} />)
-
-    const message = wrapper.find('span')
-
-    expect(message.text()).toBe(noAddressMessage)
-  })
-})
diff --git a/test/components/manage/__snapshots__/AboutCrowdsale.spec.js.snap b/test/components/manage/__snapshots__/AboutCrowdsale.spec.js.snap
deleted file mode 100644
index e24d93e0a..000000000
--- a/test/components/manage/__snapshots__/AboutCrowdsale.spec.js.snap
+++ /dev/null
@@ -1,32 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`AboutCrowdsale should render the component 1`] = `
-<div
-  className="about-step"
->
-  <div
-    className="step-icons step-icons_crowdsale-setup"
-  />
-  <p
-    className="title"
-  >
-    MyToken
-     (
-    MTK
-    ) Settings
-  </p>
-  <p
-    className="description"
-  >
-    The most important and exciting part of the crowdsale process. Here you can
-              define parameters of your crowdsale campaign.
-  </p>
-  <a
-    className="crowdsale-page-link"
-    href="/crowdsale/?undefined=undefined&networkID=12648430"
-    onClick={[Function]}
-  >
-    Crowdsale page
-  </a>
-</div>
-`;
diff --git a/test/components/manage/__snapshots__/FinalizeCrowdsaleStep.spec.js.snap b/test/components/manage/__snapshots__/FinalizeCrowdsaleStep.spec.js.snap
deleted file mode 100644
index b67d6f798..000000000
--- a/test/components/manage/__snapshots__/FinalizeCrowdsaleStep.spec.js.snap
+++ /dev/null
@@ -1,73 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`FinalizeCrowdsaleStep should render the component with active button 1`] = `
-<div
-  className="steps-content container"
->
-  <div
-    className="about-step"
-  >
-    <div
-      className="swal2-icon swal2-info warning-logo"
-    >
-      !
-    </div>
-    <p
-      className="title"
-    >
-      Finalize Crowdsale
-    </p>
-    <p
-      className="description"
-    >
-      Finalize - Finalization is the last step of the crowdsale. You can make it only after the end of the last tier. After finalization, it's not possible to update tiers, buy tokens. All tokens will be movable, reserved tokens will be issued.
-    </p>
-    <a
-      href="/#"
-      onClick={[Function]}
-    >
-      <span
-        className="button button_fill"
-      >
-        Finalize Crowdsale
-      </span>
-    </a>
-  </div>
-</div>
-`;
-
-exports[`FinalizeCrowdsaleStep should render the component with disabled button 1`] = `
-<div
-  className="steps-content container"
->
-  <div
-    className="about-step"
-  >
-    <div
-      className="swal2-icon swal2-info warning-logo"
-    >
-      !
-    </div>
-    <p
-      className="title"
-    >
-      Finalize Crowdsale
-    </p>
-    <p
-      className="description"
-    >
-      Finalize - Finalization is the last step of the crowdsale. You can make it only after the end of the last tier. After finalization, it's not possible to update tiers, buy tokens. All tokens will be movable, reserved tokens will be issued.
-    </p>
-    <a
-      href="/#"
-      onClick={[Function]}
-    >
-      <span
-        className="button button_disabled"
-      >
-        Finalize Crowdsale
-      </span>
-    </a>
-  </div>
-</div>
-`;
diff --git a/test/components/manage/__snapshots__/ManageTierBlock.spec.js.snap b/test/components/manage/__snapshots__/ManageTierBlock.spec.js.snap
deleted file mode 100644
index 7343aaca5..000000000
--- a/test/components/manage/__snapshots__/ManageTierBlock.spec.js.snap
+++ /dev/null
@@ -1,1061 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`ManageTierBlock should render the ManageTierBlock component with tiers for Dutch Auction Crowdsale 1`] = `
-<div>
-  <div
-    className="steps"
-  >
-    <div
-      className="steps-content container"
-    >
-      <div
-        className="divisor"
-      >
-        <div
-          className="input-block-container"
-        >
-          <div
-            className="sw-InputField "
-          >
-            <div
-              className="sw-FormControlTitle"
-            >
-              <label
-                className="sw-FormControlTitle_Label"
-              >
-                Tier setup name
-              </label>
-            </div>
-            <input
-              className="sw-TextField"
-              disabled={true}
-              type="text"
-              value="Tier 1"
-            />
-            
-          </div>
-        </div>
-        <div
-          className="input-block-container"
-        >
-          <div
-            className="sw-InputField2 "
-          >
-            <div
-              className="sw-FormControlTitle"
-            >
-              <label
-                className="sw-FormControlTitle_Label"
-              >
-                Start Time
-              </label>
-              <div
-                className="sw-FormControlTitle_Info"
-                tabIndex="-1"
-              >
-                <span
-                  className="sw-FormControlTitle_Tooltip"
-                >
-                  Date and time when the tier starts. Can't be in the past from the current moment.
-                </span>
-              </div>
-            </div>
-            <input
-              className="sw-TextField"
-              disabled={true}
-              id="tiers[0].0.startTime"
-              name="tiers[0].0.startTime"
-              onBlur={[Function]}
-              onChange={[Function]}
-              onFocus={[Function]}
-              type="datetime-local"
-              value=""
-            />
-          </div>
-          <div
-            className="sw-InputField2 "
-          >
-            <div
-              className="sw-FormControlTitle"
-            >
-              <label
-                className="sw-FormControlTitle_Label"
-              >
-                End Time
-              </label>
-              <div
-                className="sw-FormControlTitle_Info"
-                tabIndex="-1"
-              >
-                <span
-                  className="sw-FormControlTitle_Tooltip"
-                >
-                  Date and time when the tier ends. Can be only in the future.
-                </span>
-              </div>
-            </div>
-            <input
-              className="sw-TextField"
-              disabled={true}
-              id="tiers[0].0.endTime"
-              name="tiers[0].0.endTime"
-              onBlur={[Function]}
-              onChange={[Function]}
-              onFocus={[Function]}
-              type="datetime-local"
-              value=""
-            />
-          </div>
-        </div>
-        <div
-          className="input-block-container"
-        >
-          <div
-            className="sw-InputField2 "
-          >
-            <div
-              className="sw-FormControlTitle"
-            >
-              <label
-                className="sw-FormControlTitle_Label"
-              >
-                Rate
-              </label>
-              <div
-                className="sw-FormControlTitle_Info"
-                tabIndex="-1"
-              >
-                <span
-                  className="sw-FormControlTitle_Tooltip"
-                >
-                  Exchange rate Ethereum to Tokens. If it's 100, then for 1 Ether you can buy 100 tokens
-                </span>
-              </div>
-            </div>
-            <input
-              className="sw-TextField"
-              disabled={true}
-              id="tiers[0].0.rate"
-              name="tiers[0].0.rate"
-              onBlur={[Function]}
-              onChange={[Function]}
-              onFocus={[Function]}
-              placeholder="Enter here"
-              type="text"
-              value=""
-            />
-          </div>
-          <div
-            className="sw-InputField2 "
-          >
-            <div
-              className="sw-FormControlTitle"
-            >
-              <label
-                className="sw-FormControlTitle_Label"
-              >
-                Supply
-              </label>
-              <div
-                className="sw-FormControlTitle_Info"
-                tabIndex="-1"
-              >
-                <span
-                  className="sw-FormControlTitle_Tooltip"
-                >
-                  How many tokens will be sold on this tier. Cap of crowdsale equals to sum of supply of all tiers
-                </span>
-              </div>
-            </div>
-            <input
-              className="sw-TextField"
-              disabled={true}
-              id="tiers[0].0.supply"
-              name="tiers[0].0.supply"
-              onBlur={[Function]}
-              onChange={[Function]}
-              onFocus={[Function]}
-              placeholder="Enter here"
-              type="text"
-              value=""
-            />
-          </div>
-        </div>
-        <div
-          className="input-block-container"
-        >
-          <div
-            className="sw-InputField2 "
-          >
-            <div
-              className="sw-FormControlTitle"
-            >
-              <label
-                className="sw-FormControlTitle_Label"
-              >
-                Contributor min cap
-              </label>
-            </div>
-            <input
-              className="sw-TextField"
-              disabled={true}
-              id="tiers[0].0.minCap"
-              name="tiers[0].0.minCap"
-              onBlur={[Function]}
-              onChange={[Function]}
-              onFocus={[Function]}
-              type="number"
-              value=""
-            />
-          </div>
-        </div>
-      </div>
-      <div>
-        <div
-          className="section-title"
-        >
-          <p
-            className="title"
-          >
-            Whitelist
-          </p>
-        </div>
-        <div>
-          <div
-            className="white-list-item-container no-style"
-          >
-            <div
-              className="white-list-item-container-inner"
-            >
-              <span
-                className="white-list-item white-list-item-left"
-              >
-                0x22d491Bde2303f2f43325b2108D26f1eAbA1e32b
-              </span>
-              <span
-                className="white-list-item white-list-item-middle"
-              >
-                1234
-              </span>
-              <span
-                className="white-list-item white-list-item-right"
-              >
-                50505
-              </span>
-            </div>
-          </div>
-          <div
-            className="white-list-item-container no-style"
-          >
-            <div
-              className="white-list-item-container-inner"
-            >
-              <span
-                className="white-list-item white-list-item-left"
-              >
-                0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1
-              </span>
-              <span
-                className="white-list-item white-list-item-middle"
-              >
-                1234
-              </span>
-              <span
-                className="white-list-item white-list-item-right"
-              >
-                50505
-              </span>
-            </div>
-          </div>
-          <div
-            className="white-list-item-container no-style"
-          >
-            <div
-              className="white-list-item-container-inner"
-            >
-              <span
-                className="white-list-item white-list-item-left"
-              >
-                0xE11BA2b4D45Eaed5996Cd0823791E0C93114882d
-              </span>
-              <span
-                className="white-list-item white-list-item-middle"
-              >
-                1234
-              </span>
-              <span
-                className="white-list-item white-list-item-right"
-              >
-                50505
-              </span>
-            </div>
-          </div>
-          <div
-            className="white-list-item-container no-style"
-          >
-            <div
-              className="white-list-item-container-inner"
-            >
-              <span
-                className="white-list-item white-list-item-left"
-              >
-                0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0
-              </span>
-              <span
-                className="white-list-item white-list-item-middle"
-              >
-                1234
-              </span>
-              <span
-                className="white-list-item white-list-item-right"
-              >
-                50505
-              </span>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div
-    className="steps"
-  >
-    <div
-      className="steps-content container"
-    >
-      <div
-        className=""
-      >
-        <div
-          className="input-block-container"
-        >
-          <div
-            className="sw-InputField "
-          >
-            <div
-              className="sw-FormControlTitle"
-            >
-              <label
-                className="sw-FormControlTitle_Label"
-              >
-                Tier setup name
-              </label>
-            </div>
-            <input
-              className="sw-TextField"
-              disabled={true}
-              type="text"
-              value="Tier 2"
-            />
-            
-          </div>
-        </div>
-        <div
-          className="input-block-container"
-        >
-          <div
-            className="sw-InputField2 "
-          >
-            <div
-              className="sw-FormControlTitle"
-            >
-              <label
-                className="sw-FormControlTitle_Label"
-              >
-                Start Time
-              </label>
-              <div
-                className="sw-FormControlTitle_Info"
-                tabIndex="-1"
-              >
-                <span
-                  className="sw-FormControlTitle_Tooltip"
-                >
-                  Date and time when the tier starts. Can't be in the past from the current moment.
-                </span>
-              </div>
-            </div>
-            <input
-              className="sw-TextField"
-              disabled={true}
-              id="tiers[1].1.startTime"
-              name="tiers[1].1.startTime"
-              onBlur={[Function]}
-              onChange={[Function]}
-              onFocus={[Function]}
-              type="datetime-local"
-              value=""
-            />
-          </div>
-          <div
-            className="sw-InputField2 "
-          >
-            <div
-              className="sw-FormControlTitle"
-            >
-              <label
-                className="sw-FormControlTitle_Label"
-              >
-                End Time
-              </label>
-              <div
-                className="sw-FormControlTitle_Info"
-                tabIndex="-1"
-              >
-                <span
-                  className="sw-FormControlTitle_Tooltip"
-                >
-                  Date and time when the tier ends. Can be only in the future.
-                </span>
-              </div>
-            </div>
-            <input
-              className="sw-TextField"
-              disabled={true}
-              id="tiers[1].1.endTime"
-              name="tiers[1].1.endTime"
-              onBlur={[Function]}
-              onChange={[Function]}
-              onFocus={[Function]}
-              type="datetime-local"
-              value=""
-            />
-          </div>
-        </div>
-        <div
-          className="input-block-container"
-        >
-          <div
-            className="sw-InputField2 "
-          >
-            <div
-              className="sw-FormControlTitle"
-            >
-              <label
-                className="sw-FormControlTitle_Label"
-              >
-                Rate
-              </label>
-              <div
-                className="sw-FormControlTitle_Info"
-                tabIndex="-1"
-              >
-                <span
-                  className="sw-FormControlTitle_Tooltip"
-                >
-                  Exchange rate Ethereum to Tokens. If it's 100, then for 1 Ether you can buy 100 tokens
-                </span>
-              </div>
-            </div>
-            <input
-              className="sw-TextField"
-              disabled={true}
-              id="tiers[1].1.rate"
-              name="tiers[1].1.rate"
-              onBlur={[Function]}
-              onChange={[Function]}
-              onFocus={[Function]}
-              placeholder="Enter here"
-              type="text"
-              value=""
-            />
-          </div>
-          <div
-            className="sw-InputField2 "
-          >
-            <div
-              className="sw-FormControlTitle"
-            >
-              <label
-                className="sw-FormControlTitle_Label"
-              >
-                Supply
-              </label>
-              <div
-                className="sw-FormControlTitle_Info"
-                tabIndex="-1"
-              >
-                <span
-                  className="sw-FormControlTitle_Tooltip"
-                >
-                  How many tokens will be sold on this tier. Cap of crowdsale equals to sum of supply of all tiers
-                </span>
-              </div>
-            </div>
-            <input
-              className="sw-TextField"
-              disabled={true}
-              id="tiers[1].1.supply"
-              name="tiers[1].1.supply"
-              onBlur={[Function]}
-              onChange={[Function]}
-              onFocus={[Function]}
-              placeholder="Enter here"
-              type="text"
-              value=""
-            />
-          </div>
-        </div>
-        <div
-          className="input-block-container"
-        >
-          <div
-            className="sw-InputField2 "
-          >
-            <div
-              className="sw-FormControlTitle"
-            >
-              <label
-                className="sw-FormControlTitle_Label"
-              >
-                Contributor min cap
-              </label>
-            </div>
-            <input
-              className="sw-TextField"
-              disabled={true}
-              id="tiers[1].1.minCap"
-              name="tiers[1].1.minCap"
-              onBlur={[Function]}
-              onChange={[Function]}
-              onFocus={[Function]}
-              type="number"
-              value=""
-            />
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`ManageTierBlock should render the ManageTierBlock component with tiers for Minted Capped Crowdsale 1`] = `
-<div>
-  <div
-    className="steps"
-  >
-    <div
-      className="steps-content container"
-    >
-      <div
-        className="divisor"
-      >
-        <div
-          className="input-block-container"
-        >
-          <div
-            className="sw-InputField "
-          >
-            <div
-              className="sw-FormControlTitle"
-            >
-              <label
-                className="sw-FormControlTitle_Label"
-              >
-                Tier setup name
-              </label>
-            </div>
-            <input
-              className="sw-TextField"
-              disabled={true}
-              type="text"
-              value="Tier 1"
-            />
-            
-          </div>
-        </div>
-        <div
-          className="input-block-container"
-        >
-          <div
-            className="sw-InputField2 "
-          >
-            <div
-              className="sw-FormControlTitle"
-            >
-              <label
-                className="sw-FormControlTitle_Label"
-              >
-                Start Time
-              </label>
-              <div
-                className="sw-FormControlTitle_Info"
-                tabIndex="-1"
-              >
-                <span
-                  className="sw-FormControlTitle_Tooltip"
-                >
-                  Date and time when the tier starts. Can't be in the past from the current moment.
-                </span>
-              </div>
-            </div>
-            <input
-              className="sw-TextField"
-              disabled={true}
-              id="tiers[0].0.startTime"
-              name="tiers[0].0.startTime"
-              onBlur={[Function]}
-              onChange={[Function]}
-              onFocus={[Function]}
-              type="datetime-local"
-              value=""
-            />
-          </div>
-          <div
-            className="sw-InputField2 "
-          >
-            <div
-              className="sw-FormControlTitle"
-            >
-              <label
-                className="sw-FormControlTitle_Label"
-              >
-                End Time
-              </label>
-              <div
-                className="sw-FormControlTitle_Info"
-                tabIndex="-1"
-              >
-                <span
-                  className="sw-FormControlTitle_Tooltip"
-                >
-                  Date and time when the tier ends. Can be only in the future.
-                </span>
-              </div>
-            </div>
-            <input
-              className="sw-TextField"
-              disabled={true}
-              id="tiers[0].0.endTime"
-              name="tiers[0].0.endTime"
-              onBlur={[Function]}
-              onChange={[Function]}
-              onFocus={[Function]}
-              type="datetime-local"
-              value=""
-            />
-          </div>
-        </div>
-        <div
-          className="input-block-container"
-        >
-          <div
-            className="sw-InputField2 "
-          >
-            <div
-              className="sw-FormControlTitle"
-            >
-              <label
-                className="sw-FormControlTitle_Label"
-              >
-                Rate
-              </label>
-              <div
-                className="sw-FormControlTitle_Info"
-                tabIndex="-1"
-              >
-                <span
-                  className="sw-FormControlTitle_Tooltip"
-                >
-                  Exchange rate Ethereum to Tokens. If it's 100, then for 1 Ether you can buy 100 tokens
-                </span>
-              </div>
-            </div>
-            <input
-              className="sw-TextField"
-              disabled={true}
-              id="tiers[0].0.rate"
-              name="tiers[0].0.rate"
-              onBlur={[Function]}
-              onChange={[Function]}
-              onFocus={[Function]}
-              placeholder="Enter here"
-              type="text"
-              value=""
-            />
-          </div>
-          <div
-            className="sw-InputField2 "
-          >
-            <div
-              className="sw-FormControlTitle"
-            >
-              <label
-                className="sw-FormControlTitle_Label"
-              >
-                Supply
-              </label>
-              <div
-                className="sw-FormControlTitle_Info"
-                tabIndex="-1"
-              >
-                <span
-                  className="sw-FormControlTitle_Tooltip"
-                >
-                  How many tokens will be sold on this tier. Cap of crowdsale equals to sum of supply of all tiers
-                </span>
-              </div>
-            </div>
-            <input
-              className="sw-TextField"
-              disabled={true}
-              id="tiers[0].0.supply"
-              name="tiers[0].0.supply"
-              onBlur={[Function]}
-              onChange={[Function]}
-              onFocus={[Function]}
-              placeholder="Enter here"
-              type="text"
-              value=""
-            />
-          </div>
-        </div>
-        <div
-          className="input-block-container"
-        >
-          <div
-            className="sw-InputField2 "
-          >
-            <div
-              className="sw-FormControlTitle"
-            >
-              <label
-                className="sw-FormControlTitle_Label"
-              >
-                Contributor min cap
-              </label>
-            </div>
-            <input
-              className="sw-TextField"
-              disabled={true}
-              id="tiers[0].0.minCap"
-              name="tiers[0].0.minCap"
-              onBlur={[Function]}
-              onChange={[Function]}
-              onFocus={[Function]}
-              type="number"
-              value=""
-            />
-          </div>
-        </div>
-      </div>
-      <div>
-        <div
-          className="section-title"
-        >
-          <p
-            className="title"
-          >
-            Whitelist
-          </p>
-        </div>
-        <div>
-          <div
-            className="white-list-item-container no-style"
-          >
-            <div
-              className="white-list-item-container-inner"
-            >
-              <span
-                className="white-list-item white-list-item-left"
-              >
-                0x22d491Bde2303f2f43325b2108D26f1eAbA1e32b
-              </span>
-              <span
-                className="white-list-item white-list-item-middle"
-              >
-                1234
-              </span>
-              <span
-                className="white-list-item white-list-item-right"
-              >
-                50505
-              </span>
-            </div>
-          </div>
-          <div
-            className="white-list-item-container no-style"
-          >
-            <div
-              className="white-list-item-container-inner"
-            >
-              <span
-                className="white-list-item white-list-item-left"
-              >
-                0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1
-              </span>
-              <span
-                className="white-list-item white-list-item-middle"
-              >
-                1234
-              </span>
-              <span
-                className="white-list-item white-list-item-right"
-              >
-                50505
-              </span>
-            </div>
-          </div>
-          <div
-            className="white-list-item-container no-style"
-          >
-            <div
-              className="white-list-item-container-inner"
-            >
-              <span
-                className="white-list-item white-list-item-left"
-              >
-                0xE11BA2b4D45Eaed5996Cd0823791E0C93114882d
-              </span>
-              <span
-                className="white-list-item white-list-item-middle"
-              >
-                1234
-              </span>
-              <span
-                className="white-list-item white-list-item-right"
-              >
-                50505
-              </span>
-            </div>
-          </div>
-          <div
-            className="white-list-item-container no-style"
-          >
-            <div
-              className="white-list-item-container-inner"
-            >
-              <span
-                className="white-list-item white-list-item-left"
-              >
-                0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0
-              </span>
-              <span
-                className="white-list-item white-list-item-middle"
-              >
-                1234
-              </span>
-              <span
-                className="white-list-item white-list-item-right"
-              >
-                50505
-              </span>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div
-    className="steps"
-  >
-    <div
-      className="steps-content container"
-    >
-      <div
-        className=""
-      >
-        <div
-          className="input-block-container"
-        >
-          <div
-            className="sw-InputField "
-          >
-            <div
-              className="sw-FormControlTitle"
-            >
-              <label
-                className="sw-FormControlTitle_Label"
-              >
-                Tier setup name
-              </label>
-            </div>
-            <input
-              className="sw-TextField"
-              disabled={true}
-              type="text"
-              value="Tier 2"
-            />
-            
-          </div>
-        </div>
-        <div
-          className="input-block-container"
-        >
-          <div
-            className="sw-InputField2 "
-          >
-            <div
-              className="sw-FormControlTitle"
-            >
-              <label
-                className="sw-FormControlTitle_Label"
-              >
-                Start Time
-              </label>
-              <div
-                className="sw-FormControlTitle_Info"
-                tabIndex="-1"
-              >
-                <span
-                  className="sw-FormControlTitle_Tooltip"
-                >
-                  Date and time when the tier starts. Can't be in the past from the current moment.
-                </span>
-              </div>
-            </div>
-            <input
-              className="sw-TextField"
-              disabled={true}
-              id="tiers[1].1.startTime"
-              name="tiers[1].1.startTime"
-              onBlur={[Function]}
-              onChange={[Function]}
-              onFocus={[Function]}
-              type="datetime-local"
-              value=""
-            />
-          </div>
-          <div
-            className="sw-InputField2 "
-          >
-            <div
-              className="sw-FormControlTitle"
-            >
-              <label
-                className="sw-FormControlTitle_Label"
-              >
-                End Time
-              </label>
-              <div
-                className="sw-FormControlTitle_Info"
-                tabIndex="-1"
-              >
-                <span
-                  className="sw-FormControlTitle_Tooltip"
-                >
-                  Date and time when the tier ends. Can be only in the future.
-                </span>
-              </div>
-            </div>
-            <input
-              className="sw-TextField"
-              disabled={true}
-              id="tiers[1].1.endTime"
-              name="tiers[1].1.endTime"
-              onBlur={[Function]}
-              onChange={[Function]}
-              onFocus={[Function]}
-              type="datetime-local"
-              value=""
-            />
-          </div>
-        </div>
-        <div
-          className="input-block-container"
-        >
-          <div
-            className="sw-InputField2 "
-          >
-            <div
-              className="sw-FormControlTitle"
-            >
-              <label
-                className="sw-FormControlTitle_Label"
-              >
-                Rate
-              </label>
-              <div
-                className="sw-FormControlTitle_Info"
-                tabIndex="-1"
-              >
-                <span
-                  className="sw-FormControlTitle_Tooltip"
-                >
-                  Exchange rate Ethereum to Tokens. If it's 100, then for 1 Ether you can buy 100 tokens
-                </span>
-              </div>
-            </div>
-            <input
-              className="sw-TextField"
-              disabled={true}
-              id="tiers[1].1.rate"
-              name="tiers[1].1.rate"
-              onBlur={[Function]}
-              onChange={[Function]}
-              onFocus={[Function]}
-              placeholder="Enter here"
-              type="text"
-              value=""
-            />
-          </div>
-          <div
-            className="sw-InputField2 "
-          >
-            <div
-              className="sw-FormControlTitle"
-            >
-              <label
-                className="sw-FormControlTitle_Label"
-              >
-                Supply
-              </label>
-              <div
-                className="sw-FormControlTitle_Info"
-                tabIndex="-1"
-              >
-                <span
-                  className="sw-FormControlTitle_Tooltip"
-                >
-                  How many tokens will be sold on this tier. Cap of crowdsale equals to sum of supply of all tiers
-                </span>
-              </div>
-            </div>
-            <input
-              className="sw-TextField"
-              disabled={true}
-              id="tiers[1].1.supply"
-              name="tiers[1].1.supply"
-              onBlur={[Function]}
-              onChange={[Function]}
-              onFocus={[Function]}
-              placeholder="Enter here"
-              type="text"
-              value=""
-            />
-          </div>
-        </div>
-        <div
-          className="input-block-container"
-        >
-          <div
-            className="sw-InputField2 "
-          >
-            <div
-              className="sw-FormControlTitle"
-            >
-              <label
-                className="sw-FormControlTitle_Label"
-              >
-                Contributor min cap
-              </label>
-            </div>
-            <input
-              className="sw-TextField"
-              disabled={true}
-              id="tiers[1].1.minCap"
-              name="tiers[1].1.minCap"
-              onBlur={[Function]}
-              onChange={[Function]}
-              onFocus={[Function]}
-              type="number"
-              value=""
-            />
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
diff --git a/test/components/manage/__snapshots__/ReadOnlyWhitelistAddresses.spec.js.snap b/test/components/manage/__snapshots__/ReadOnlyWhitelistAddresses.spec.js.snap
deleted file mode 100644
index f63ed97be..000000000
--- a/test/components/manage/__snapshots__/ReadOnlyWhitelistAddresses.spec.js.snap
+++ /dev/null
@@ -1,213 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`ManageForm should render the whitelist addresses 1`] = `
-<div>
-  <div
-    className="white-list-item-container no-style"
-  >
-    <div
-      className="white-list-item-container-inner"
-    >
-      <span
-        className="white-list-item white-list-item-left"
-      >
-        0x1dF62f291b2E969fB0849d99D9Ce41e2F137006e
-      </span>
-      <span
-        className="white-list-item white-list-item-middle"
-      >
-        1234
-      </span>
-      <span
-        className="white-list-item white-list-item-right"
-      >
-        50505
-      </span>
-    </div>
-  </div>
-  <div
-    className="white-list-item-container no-style"
-  >
-    <div
-      className="white-list-item-container-inner"
-    >
-      <span
-        className="white-list-item white-list-item-left"
-      >
-        0x22d491Bde2303f2f43325b2108D26f1eAbA1e32b
-      </span>
-      <span
-        className="white-list-item white-list-item-middle"
-      >
-        1234
-      </span>
-      <span
-        className="white-list-item white-list-item-right"
-      >
-        50505
-      </span>
-    </div>
-  </div>
-  <div
-    className="white-list-item-container no-style"
-  >
-    <div
-      className="white-list-item-container-inner"
-    >
-      <span
-        className="white-list-item white-list-item-left"
-      >
-        0x3E5e9111Ae8eB78Fe1CC3bb8915d5D461F3Ef9A9
-      </span>
-      <span
-        className="white-list-item white-list-item-middle"
-      >
-        1234
-      </span>
-      <span
-        className="white-list-item white-list-item-right"
-      >
-        50505
-      </span>
-    </div>
-  </div>
-  <div
-    className="white-list-item-container no-style"
-  >
-    <div
-      className="white-list-item-container-inner"
-    >
-      <span
-        className="white-list-item white-list-item-left"
-      >
-        0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1
-      </span>
-      <span
-        className="white-list-item white-list-item-middle"
-      >
-        1234
-      </span>
-      <span
-        className="white-list-item white-list-item-right"
-      >
-        50505
-      </span>
-    </div>
-  </div>
-  <div
-    className="white-list-item-container no-style"
-  >
-    <div
-      className="white-list-item-container-inner"
-    >
-      <span
-        className="white-list-item white-list-item-left"
-      >
-        0x95cED938F7991cd0dFcb48F0a06a40FA1aF46EBC
-      </span>
-      <span
-        className="white-list-item white-list-item-middle"
-      >
-        1234
-      </span>
-      <span
-        className="white-list-item white-list-item-right"
-      >
-        50505
-      </span>
-    </div>
-  </div>
-  <div
-    className="white-list-item-container no-style"
-  >
-    <div
-      className="white-list-item-container-inner"
-    >
-      <span
-        className="white-list-item white-list-item-left"
-      >
-        0xACa94ef8bD5ffEE41947b4585a84BdA5a3d3DA6E
-      </span>
-      <span
-        className="white-list-item white-list-item-middle"
-      >
-        1234
-      </span>
-      <span
-        className="white-list-item white-list-item-right"
-      >
-        50505
-      </span>
-    </div>
-  </div>
-  <div
-    className="white-list-item-container no-style"
-  >
-    <div
-      className="white-list-item-container-inner"
-    >
-      <span
-        className="white-list-item white-list-item-left"
-      >
-        0xd03ea8624C8C5987235048901fB614fDcA89b117
-      </span>
-      <span
-        className="white-list-item white-list-item-middle"
-      >
-        1234
-      </span>
-      <span
-        className="white-list-item white-list-item-right"
-      >
-        50505
-      </span>
-    </div>
-  </div>
-  <div
-    className="white-list-item-container no-style"
-  >
-    <div
-      className="white-list-item-container-inner"
-    >
-      <span
-        className="white-list-item white-list-item-left"
-      >
-        0xE11BA2b4D45Eaed5996Cd0823791E0C93114882d
-      </span>
-      <span
-        className="white-list-item white-list-item-middle"
-      >
-        1234
-      </span>
-      <span
-        className="white-list-item white-list-item-right"
-      >
-        50505
-      </span>
-    </div>
-  </div>
-  <div
-    className="white-list-item-container no-style"
-  >
-    <div
-      className="white-list-item-container-inner"
-    >
-      <span
-        className="white-list-item white-list-item-left"
-      >
-        0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0
-      </span>
-      <span
-        className="white-list-item white-list-item-middle"
-      >
-        1234
-      </span>
-      <span
-        className="white-list-item white-list-item-right"
-      >
-        50505
-      </span>
-    </div>
-  </div>
-</div>
-`;
diff --git a/test/react-web3/Web3Provider.spec.js b/test/react-web3/Web3Provider.spec.js
new file mode 100644
index 000000000..cd7cc3504
--- /dev/null
+++ b/test/react-web3/Web3Provider.spec.js
@@ -0,0 +1,16 @@
+import React from 'react'
+import Adapter from 'enzyme-adapter-react-15'
+import { configure, mount, shallow } from 'enzyme'
+import Web3Provider from '../../src/react-web3/Web3Provider'
+import renderer from 'react-test-renderer'
+import DeploymentStore from '../../src/stores/DeploymentStore'
+
+configure({ adapter: new Adapter() })
+
+describe('Web3Provider', () => {
+  it(`should render the component `, () => {
+    const wrapper = renderer.create(<Web3Provider />)
+
+    expect(wrapper).toMatchSnapshot()
+  })
+})
diff --git a/test/react-web3/__snapshots__/Web3Provider.spec.js.snap b/test/react-web3/__snapshots__/Web3Provider.spec.js.snap
new file mode 100644
index 000000000..2dcc5dfa6
--- /dev/null
+++ b/test/react-web3/__snapshots__/Web3Provider.spec.js.snap
@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Web3Provider should render the component  1`] = `null`;
diff --git a/test/stores/CrowdsalePageStore.spec.js b/test/stores/CrowdsalePageStore.spec.js
index 9973f8241..89e2bbcfb 100644
--- a/test/stores/CrowdsalePageStore.spec.js
+++ b/test/stores/CrowdsalePageStore.spec.js
@@ -8,6 +8,7 @@ describe('CrowdsalePageStore', () => {
   let sortedTiers
   let ticks
   let crowdsalePageStore
+
   beforeEach(() => {
     crowdsalePageStore = new CrowdsalePageStore()
     MockDate.set(currentTime)
@@ -25,12 +26,12 @@ describe('CrowdsalePageStore', () => {
       { startDate: 1523563542000, endDate: 1552421142000 }
     ]
     ticks = [
-      { type: 'start', time: 1520885142000, order: 1 },
-      { type: 'end', time: 1520888742000, order: 1 },
-      { type: 'end', time: 1520971542000, order: 2 },
-      { type: 'start', time: 1521489942000, order: 3 },
-      { type: 'end', time: 1523563542000, order: 3 },
-      { type: 'end', time: 1552421142000, order: 4 }
+      { type: 'start', startDate: 1520885142000, order: 1 },
+      { type: 'end', startDate: 1520888742000, order: 1 },
+      { type: 'end', startDate: 1520971542000, order: 2 },
+      { type: 'start', startDate: 1521489942000, order: 3 },
+      { type: 'end', startDate: 1523563542000, order: 3 },
+      { type: 'end', startDate: 1552421142000, order: 4 }
     ]
   })
 
@@ -51,29 +52,6 @@ describe('CrowdsalePageStore', () => {
     })
   })
 
-  it('Should build ticks from tiers collection', () => {
-    tiers.forEach(tier => crowdsalePageStore.addTier(tier))
-    crowdsalePageStore.ticks.forEach((tick, index) => {
-      expect(tick.type).toBe(ticks[index].type)
-      expect(tick.time).toBe(ticks[index].time)
-      expect(tick.order).toBe(ticks[index].order)
-    })
-  })
-
-  it('Should discard past ticks already closed', () => {
-    MockDate.set('2018-03-13T12:00:00')
-
-    tiers.forEach(tier => crowdsalePageStore.addTier(tier))
-    expect(crowdsalePageStore.ticks.length).toBe(4)
-
-    const activeTicks = ticks.slice(2)
-    crowdsalePageStore.ticks.forEach((tick, index) => {
-      expect(tick.type).toBe(activeTicks[index].type)
-      expect(tick.time).toBe(activeTicks[index].time)
-      expect(tick.order).toBe(activeTicks[index].order)
-    })
-  })
-
   it('Should mutate ticks collection on extract', () => {
     tiers.forEach(tier => crowdsalePageStore.addTier(tier))
 
@@ -81,13 +59,4 @@ describe('CrowdsalePageStore', () => {
     crowdsalePageStore.extractNextTick()
     expect(crowdsalePageStore.ticks.length).toBe(5)
   })
-
-  it('Should return the nearest tick in collection', () => {
-    tiers.forEach(tier => crowdsalePageStore.addTier(tier))
-
-    const nextTick = crowdsalePageStore.extractNextTick()
-    expect(nextTick.type).toBe(ticks[0].type)
-    expect(nextTick.time).toBe(ticks[0].time)
-    expect(nextTick.order).toBe(ticks[0].order)
-  })
 })
diff --git a/test/stores/DeploymentStore.spec.js b/test/stores/DeploymentStore.spec.js
new file mode 100644
index 000000000..adacd849c
--- /dev/null
+++ b/test/stores/DeploymentStore.spec.js
@@ -0,0 +1,477 @@
+import DeploymentStore from '../../src/stores/DeploymentStore'
+import storage from 'store2'
+import { getCrowdSaleParams, getDutchAuctionCrowdSaleParams } from '../../src/components/StepFour/utils'
+
+describe('DeploymentStore', () => {
+  let deploymentStore
+  let tiers = [
+    {
+      tier: 'tier 1',
+      supply: 1000,
+      startTime: Date.now() * 1000,
+      endTime: Date.now() * 1000,
+      whitelistEnabled: 'yes',
+      whitelist: [
+        { addr: '0x90f8bf6a479f320ead074411a4b0e7944ea8c9c1', min: 1234, max: 50505 },
+        { addr: '0xffcf8fdee72ac11b5c542428b35eef5769c409f0', min: 1234, max: 50505 },
+        { addr: '0x22d491bde2303f2f43325b2108d26f1eaba1e32b', min: 1234, max: 50505 },
+        { addr: '0xe11ba2b4d45eaed5996cd0823791e0c93114882d', min: 1234, max: 50505 },
+        { addr: '0xd03ea8624c8c5987235048901fb614fdca89b117', min: 1234, max: 50505 },
+        { addr: '0x95ced938f7991cd0dfcb48f0a06a40fa1af46ebc', min: 1234, max: 50505 },
+        { addr: '0x3e5e9111ae8eb78fe1cc3bb8915d5d461f3ef9a9', min: 1234, max: 50505 },
+        { addr: '0x28a8746e75304c0780e011bed21c72cd78cd535e', min: 1234, max: 50505 },
+        { addr: '0xaca94ef8bd5ffee41947b4585a84bda5a3d3da6e', min: 1234, max: 50505 },
+        { addr: '0x1df62f291b2e969fb0849d99d9ce41e2f137006e', min: 1234, max: 50505 }
+      ]
+    },
+    {
+      tier: 'tier 2',
+      supply: 1000,
+      startTime: Date.now() * 1000,
+      endTime: Date.now() * 1000,
+      whitelistEnabled: 'yes',
+      whitelist: [
+        { addr: '0x90f8bf6a479f320ead074411a4b0e7944ea8c9c1', min: 1234, max: 50505 },
+        { addr: '0xffcf8fdee72ac11b5c542428b35eef5769c409f0', min: 1234, max: 50505 },
+        { addr: '0x22d491bde2303f2f43325b2108d26f1eaba1e32b', min: 1234, max: 50505 },
+        { addr: '0xe11ba2b4d45eaed5996cd0823791e0c93114882d', min: 1234, max: 50505 },
+        { addr: '0xd03ea8624c8c5987235048901fb614fdca89b117', min: 1234, max: 50505 },
+        { addr: '0x95ced938f7991cd0dfcb48f0a06a40fa1af46ebc', min: 1234, max: 50505 },
+        { addr: '0x3e5e9111ae8eb78fe1cc3bb8915d5d461f3ef9a9', min: 1234, max: 50505 },
+        { addr: '0x28a8746e75304c0780e011bed21c72cd78cd535e', min: 1234, max: 50505 },
+        { addr: '0xaca94ef8bd5ffee41947b4585a84bda5a3d3da6e', min: 1234, max: 50505 },
+        { addr: '0x1df62f291b2e969fb0849d99d9ce41e2f137006e', min: 1234, max: 50505 }
+      ]
+    },
+    {
+      tier: 'tier 3',
+      supply: 1000,
+      startTime: Date.now() * 1000,
+      endTime: Date.now() * 1000,
+      whitelistEnabled: 'yes',
+      whitelist: [
+        { addr: '0x90f8bf6a479f320ead074411a4b0e7944ea8c9c1', min: 1234, max: 50505 },
+        { addr: '0xffcf8fdee72ac11b5c542428b35eef5769c409f0', min: 1234, max: 50505 },
+        { addr: '0x22d491bde2303f2f43325b2108d26f1eaba1e32b', min: 1234, max: 50505 },
+        { addr: '0xe11ba2b4d45eaed5996cd0823791e0c93114882d', min: 1234, max: 50505 },
+        { addr: '0xd03ea8624c8c5987235048901fb614fdca89b117', min: 1234, max: 50505 },
+        { addr: '0x95ced938f7991cd0dfcb48f0a06a40fa1af46ebc', min: 1234, max: 50505 },
+        { addr: '0x3e5e9111ae8eb78fe1cc3bb8915d5d461f3ef9a9', min: 1234, max: 50505 },
+        { addr: '0x28a8746e75304c0780e011bed21c72cd78cd535e', min: 1234, max: 50505 },
+        { addr: '0xaca94ef8bd5ffee41947b4585a84bda5a3d3da6e', min: 1234, max: 50505 },
+        { addr: '0x1df62f291b2e969fb0849d99d9ce41e2f137006e', min: 1234, max: 50505 }
+      ]
+    },
+    {
+      tier: 'tier 4',
+      supply: 1000,
+      startTime: Date.now() * 1000,
+      endTime: Date.now() * 1000,
+      whitelist: [
+        { addr: '0x90f8bf6a479f320ead074411a4b0e7944ea8c9c1', min: 1234, max: 50505 },
+        { addr: '0xffcf8fdee72ac11b5c542428b35eef5769c409f0', min: 1234, max: 50505 },
+        { addr: '0x22d491bde2303f2f43325b2108d26f1eaba1e32b', min: 1234, max: 50505 },
+        { addr: '0xe11ba2b4d45eaed5996cd0823791e0c93114882d', min: 1234, max: 50505 },
+        { addr: '0xd03ea8624c8c5987235048901fb614fdca89b117', min: 1234, max: 50505 },
+        { addr: '0x95ced938f7991cd0dfcb48f0a06a40fa1af46ebc', min: 1234, max: 50505 },
+        { addr: '0x3e5e9111ae8eb78fe1cc3bb8915d5d461f3ef9a9', min: 1234, max: 50505 },
+        { addr: '0x28a8746e75304c0780e011bed21c72cd78cd535e', min: 1234, max: 50505 },
+        { addr: '0xaca94ef8bd5ffee41947b4585a84bda5a3d3da6e', min: 1234, max: 50505 },
+        { addr: '0x1df62f291b2e969fb0849d99d9ce41e2f137006e', min: 1234, max: 50505 }
+      ]
+    }
+  ]
+
+  beforeEach(() => {
+    deploymentStore = new DeploymentStore()
+  })
+
+  afterEach(() => {
+    deploymentStore.reset()
+  })
+
+  it('should instantiates store properly', () => {
+    expect(deploymentStore.txMap).toBeDefined()
+    expect(deploymentStore.deploymentStep).toBeNull()
+    expect(deploymentStore.hasEnded).toBeFalsy()
+    expect(deploymentStore.deployerAccount).toBeNull()
+    expect(deploymentStore.invalidAccount).toBeFalsy()
+  })
+
+  it('should check is tx map is correctly defined', () => {
+    const deploymentStoreTxMap = new DeploymentStore()
+    const deploymentStoreObject = storage.get('DeploymentStore')
+
+    expect(deploymentStoreObject.txMap).toBeDefined()
+    expect(deploymentStoreObject.deploymentStep).toBeNull()
+    expect(deploymentStoreObject.hasEnded).toBeFalsy()
+    expect(deploymentStoreObject.deployerAccount).toBeNull()
+    expect(deploymentStoreObject.invalidAccount).toBeFalsy()
+  })
+
+  it('should initialize a deploymentStore', () => {
+    deploymentStore.initialize(false, true, false, tiers, false)
+
+    expect(deploymentStore.txMap.get('deployProxy')).toBeDefined()
+    expect(deploymentStore.txMap.get('crowdsaleCreate')).toBeDefined()
+    expect(deploymentStore.txMap.get('token')).toBeDefined()
+    expect(deploymentStore.txMap.get('setReservedTokens')).toBeDefined()
+    expect(deploymentStore.txMap.get('updateGlobalMinContribution')).toBeDefined()
+    expect(deploymentStore.txMap.get('createCrowdsaleTiers')).toBeDefined()
+    expect(deploymentStore.txMap.get('whitelist')).toBeDefined()
+    expect(deploymentStore.txMap.get('crowdsaleInit')).toBeDefined()
+    expect(deploymentStore.txMap.get('trackProxy')).toBeDefined()
+  })
+
+  it('should set a transaction as successfully', () => {
+    deploymentStore.initialize(false, true, false, tiers, false)
+
+    expect(deploymentStore.txMap.get('deployProxy')).toBeDefined()
+    expect(deploymentStore.txMap.get('crowdsaleCreate')).toBeDefined()
+    expect(deploymentStore.txMap.get('token')).toBeDefined()
+    expect(deploymentStore.txMap.get('setReservedTokens')).toBeDefined()
+    expect(deploymentStore.txMap.get('updateGlobalMinContribution')).toBeDefined()
+    expect(deploymentStore.txMap.get('createCrowdsaleTiers')).toBeDefined()
+    expect(deploymentStore.txMap.get('whitelist')).toBeDefined()
+    expect(deploymentStore.txMap.get('crowdsaleInit')).toBeDefined()
+    expect(deploymentStore.txMap.get('trackProxy')).toBeDefined()
+
+    deploymentStore.setAsSuccessful('deployProxy')
+    deploymentStore.setAsSuccessful('crowdsaleCreate')
+
+    deploymentStore.txMap.forEach((steps, name) => {
+      const step = steps[0]
+      if (name === 'deployProxy' || name === 'crowdsaleCreate') {
+        expect(step.mined).toBeTruthy()
+      }
+    })
+  })
+
+  it('should set deployment step', () => {
+    deploymentStore.initialize(false, true, false, tiers, false)
+
+    deploymentStore.setDeploymentStep(1)
+
+    expect(deploymentStore.deploymentStep).toBe(1)
+    expect(deploymentStore.deployInProgress).toBeTruthy()
+
+    deploymentStore.resetDeploymentStep()
+    expect(deploymentStore.deploymentStep).toBeNull()
+  })
+
+  it('should set deployer account', () => {
+    deploymentStore.initialize(false, true, false, tiers, false)
+
+    expect(deploymentStore.deployerAccount).toBeNull()
+
+    deploymentStore.setDeployerAccount('account1')
+
+    expect(deploymentStore.deployerAccount).toBe('account1')
+  })
+
+  it('should set deployer account check handle account undefined', () => {
+    deploymentStore.initialize(false, true, false, tiers, false)
+
+    expect(deploymentStore.deployerAccount).toBeNull()
+
+    expect(deploymentStore.handleAccountChange('account1')).toBeUndefined()
+  })
+
+  it('should set deployer account check handle account ', () => {
+    deploymentStore.initialize(false, true, false, tiers, false)
+
+    expect(deploymentStore.deployerAccount).toBeNull()
+
+    deploymentStore.setDeployerAccount('account1')
+
+    expect(deploymentStore.deployerAccount).toBe('account1')
+
+    deploymentStore.handleAccountChange('account1')
+    expect(deploymentStore.invalidAccount).toBeFalsy()
+
+    deploymentStore.handleAccountChange('account2')
+    expect(deploymentStore.invalidAccount).toBeTruthy()
+  })
+
+  it('should set hasEnded property ', () => {
+    deploymentStore.initialize(false, true, false, tiers, false)
+
+    expect(deploymentStore.deployerAccount).toBeNull()
+
+    deploymentStore.setHasEnded(true)
+
+    expect(deploymentStore.hasEnded).toBeTruthy()
+
+    deploymentStore.setHasEnded(false)
+
+    expect(deploymentStore.hasEnded).toBeFalsy()
+  })
+
+  it('should get nex pending transaction', () => {
+    deploymentStore.initialize(false, true, false, tiers, false)
+
+    expect(deploymentStore.txMap.get('deployProxy')).toBeDefined()
+    expect(deploymentStore.txMap.get('crowdsaleCreate')).toBeDefined()
+    expect(deploymentStore.txMap.get('token')).toBeDefined()
+    expect(deploymentStore.txMap.get('setReservedTokens')).toBeDefined()
+    expect(deploymentStore.txMap.get('updateGlobalMinContribution')).toBeDefined()
+    expect(deploymentStore.txMap.get('createCrowdsaleTiers')).toBeDefined()
+    expect(deploymentStore.txMap.get('whitelist')).toBeDefined()
+    expect(deploymentStore.txMap.get('crowdsaleInit')).toBeDefined()
+    expect(deploymentStore.txMap.get('trackProxy')).toBeDefined()
+
+    deploymentStore.setAsSuccessful('deployProxy')
+    deploymentStore.setAsSuccessful('crowdsaleCreate')
+
+    deploymentStore.txMap.forEach((steps, name) => {
+      const step = steps[0]
+      if (name === 'deployProxy' || name === 'crowdsaleCreate') {
+        expect(step.mined).toBeTruthy()
+      }
+    })
+
+    expect(deploymentStore.nextPendingTransaction).toBe('token')
+
+    deploymentStore.setAsSuccessful('token')
+    expect(deploymentStore.nextPendingTransaction).toBe('createCrowdsaleTiers')
+
+    expect(deploymentStore.deploymentHasFinished).toBeFalsy()
+
+    deploymentStore.setAsSuccessful('whitelist')
+    deploymentStore.setAsSuccessful('setReservedTokens')
+    deploymentStore.setAsSuccessful('updateGlobalMinContribution')
+    deploymentStore.setAsSuccessful('createCrowdsaleTiers')
+    deploymentStore.setAsSuccessful('crowdsaleInit')
+    deploymentStore.setAsSuccessful('trackProxy')
+
+    setTimeout(() => {
+      // Then
+      expect(deploymentStore.deploymentHasFinished).toBeTruthy()
+    }, 2000)
+  })
+
+  it('should get active steps', () => {
+    deploymentStore.initialize(false, true, false, tiers, false)
+
+    expect(deploymentStore.txMap.get('deployProxy')).toBeDefined()
+    expect(deploymentStore.txMap.get('crowdsaleCreate')).toBeDefined()
+    expect(deploymentStore.txMap.get('token')).toBeDefined()
+    expect(deploymentStore.txMap.get('setReservedTokens')).toBeDefined()
+    expect(deploymentStore.txMap.get('updateGlobalMinContribution')).toBeDefined()
+    expect(deploymentStore.txMap.get('createCrowdsaleTiers')).toBeDefined()
+    expect(deploymentStore.txMap.get('whitelist')).toBeDefined()
+    expect(deploymentStore.txMap.get('crowdsaleInit')).toBeDefined()
+    expect(deploymentStore.txMap.get('trackProxy')).toBeDefined()
+
+    deploymentStore.setAsSuccessful('deployProxy')
+    deploymentStore.setAsSuccessful('crowdsaleCreate')
+
+    deploymentStore.activeSteps.forEach((step, index) => {
+      if (step.name === 'deployProxy' || step.name === 'crowdsaleCreate') {
+        expect(step.mined).toBeTruthy()
+      } else {
+        expect(step.mined).toBeFalsy()
+      }
+    })
+  })
+
+  it('should get txRecoverable I', () => {
+    deploymentStore.initialize(false, true, false, tiers, false)
+
+    expect(deploymentStore.txMap.get('deployProxy')).toBeDefined()
+    expect(deploymentStore.txMap.get('crowdsaleCreate')).toBeDefined()
+    expect(deploymentStore.txMap.get('token')).toBeDefined()
+    expect(deploymentStore.txMap.get('setReservedTokens')).toBeDefined()
+    expect(deploymentStore.txMap.get('updateGlobalMinContribution')).toBeDefined()
+    expect(deploymentStore.txMap.get('createCrowdsaleTiers')).toBeDefined()
+    expect(deploymentStore.txMap.get('whitelist')).toBeDefined()
+    expect(deploymentStore.txMap.get('crowdsaleInit')).toBeDefined()
+    expect(deploymentStore.txMap.get('trackProxy')).toBeDefined()
+
+    deploymentStore.setDeploymentStepTxHash({ executionOrder: 0, txHash: 'asdasd' })
+    expect(deploymentStore.txRecoverable.name).toBe('deployProxy')
+  })
+
+  it('should get txRecoverable II', () => {
+    deploymentStore.initialize(false, true, false, tiers, false)
+
+    expect(deploymentStore.txMap.get('deployProxy')).toBeDefined()
+    expect(deploymentStore.txMap.get('crowdsaleCreate')).toBeDefined()
+    expect(deploymentStore.txMap.get('token')).toBeDefined()
+    expect(deploymentStore.txMap.get('setReservedTokens')).toBeDefined()
+    expect(deploymentStore.txMap.get('updateGlobalMinContribution')).toBeDefined()
+    expect(deploymentStore.txMap.get('createCrowdsaleTiers')).toBeDefined()
+    expect(deploymentStore.txMap.get('whitelist')).toBeDefined()
+    expect(deploymentStore.txMap.get('crowdsaleInit')).toBeDefined()
+    expect(deploymentStore.txMap.get('trackProxy')).toBeDefined()
+
+    deploymentStore.setDeploymentStepTxHash({ executionOrder: 1, txHash: 'asdasd' })
+    expect(deploymentStore.txRecoverable.name).toBe('crowdsaleCreate')
+  })
+
+  it('should get getStepExecutionOrder I', () => {
+    deploymentStore.initialize(false, true, false, tiers, false)
+
+    expect(deploymentStore.txMap.get('deployProxy')).toBeDefined()
+    expect(deploymentStore.txMap.get('crowdsaleCreate')).toBeDefined()
+    expect(deploymentStore.txMap.get('token')).toBeDefined()
+    expect(deploymentStore.txMap.get('setReservedTokens')).toBeDefined()
+    expect(deploymentStore.txMap.get('updateGlobalMinContribution')).toBeDefined()
+    expect(deploymentStore.txMap.get('createCrowdsaleTiers')).toBeDefined()
+    expect(deploymentStore.txMap.get('whitelist')).toBeDefined()
+    expect(deploymentStore.txMap.get('crowdsaleInit')).toBeDefined()
+    expect(deploymentStore.txMap.get('trackProxy')).toBeDefined()
+
+    const step = deploymentStore.getStepExecutionOrder()
+    expect(step).toBeUndefined()
+  })
+
+  it('should get getStepExecutionOrder II', () => {
+    deploymentStore.initialize(false, true, false, tiers, false)
+
+    expect(deploymentStore.txMap.get('deployProxy')).toBeDefined()
+    expect(deploymentStore.txMap.get('crowdsaleCreate')).toBeDefined()
+    expect(deploymentStore.txMap.get('token')).toBeDefined()
+    expect(deploymentStore.txMap.get('setReservedTokens')).toBeDefined()
+    expect(deploymentStore.txMap.get('updateGlobalMinContribution')).toBeDefined()
+    expect(deploymentStore.txMap.get('createCrowdsaleTiers')).toBeDefined()
+    expect(deploymentStore.txMap.get('whitelist')).toBeDefined()
+    expect(deploymentStore.txMap.get('crowdsaleInit')).toBeDefined()
+    expect(deploymentStore.txMap.get('trackProxy')).toBeDefined()
+
+    const stepsValues = [
+      {
+        value: {
+          name: 'deployProxy',
+          innerIndex: 0
+        },
+        expected: 0
+      },
+      {
+        value: {
+          name: 'crowdsaleCreate',
+          innerIndex: 0
+        },
+        expected: 1
+      },
+      {
+        value: {
+          name: 'token',
+          innerIndex: 0
+        },
+        expected: 2
+      }
+    ]
+
+    stepsValues.forEach((step, index) => {
+      const stepIndex = deploymentStore.getStepExecutionOrder(step.value)
+      expect(stepIndex).toBe(step.expected)
+    })
+  })
+
+  it('should get resetTx I', () => {
+    deploymentStore.initialize(false, true, false, tiers, false)
+
+    expect(deploymentStore.txMap.get('deployProxy')).toBeDefined()
+    expect(deploymentStore.txMap.get('crowdsaleCreate')).toBeDefined()
+    expect(deploymentStore.txMap.get('token')).toBeDefined()
+    expect(deploymentStore.txMap.get('setReservedTokens')).toBeDefined()
+    expect(deploymentStore.txMap.get('updateGlobalMinContribution')).toBeDefined()
+    expect(deploymentStore.txMap.get('createCrowdsaleTiers')).toBeDefined()
+    expect(deploymentStore.txMap.get('whitelist')).toBeDefined()
+    expect(deploymentStore.txMap.get('crowdsaleInit')).toBeDefined()
+    expect(deploymentStore.txMap.get('trackProxy')).toBeDefined()
+
+    const step = deploymentStore.resetTx()
+    expect(step).toBeUndefined()
+  })
+
+  it('should get resetTx II', () => {
+    deploymentStore.initialize(false, true, false, tiers, false)
+
+    expect(deploymentStore.txMap.get('deployProxy')).toBeDefined()
+    expect(deploymentStore.txMap.get('crowdsaleCreate')).toBeDefined()
+    expect(deploymentStore.txMap.get('token')).toBeDefined()
+    expect(deploymentStore.txMap.get('setReservedTokens')).toBeDefined()
+    expect(deploymentStore.txMap.get('updateGlobalMinContribution')).toBeDefined()
+    expect(deploymentStore.txMap.get('createCrowdsaleTiers')).toBeDefined()
+    expect(deploymentStore.txMap.get('whitelist')).toBeDefined()
+    expect(deploymentStore.txMap.get('crowdsaleInit')).toBeDefined()
+    expect(deploymentStore.txMap.get('trackProxy')).toBeDefined()
+
+    const step = deploymentStore.resetTx({
+      name: 'deployProxy',
+      innerIndex: 0
+    })
+
+    const getStep = deploymentStore.txMap.get('deployProxy').slice()[0]
+    expect(getStep.active).toBeFalsy()
+    expect(getStep.confirmationPending).toBeFalsy()
+    expect(getStep.miningPending).toBeFalsy()
+    expect(getStep.mined).toBeFalsy()
+    expect(getStep.txHash).toBe('')
+  })
+
+  it('should setDeploymentStepStatus I', () => {
+    deploymentStore.initialize(false, true, false, tiers, false)
+
+    expect(deploymentStore.txMap.get('deployProxy')).toBeDefined()
+    expect(deploymentStore.txMap.get('crowdsaleCreate')).toBeDefined()
+    expect(deploymentStore.txMap.get('token')).toBeDefined()
+    expect(deploymentStore.txMap.get('setReservedTokens')).toBeDefined()
+    expect(deploymentStore.txMap.get('updateGlobalMinContribution')).toBeDefined()
+    expect(deploymentStore.txMap.get('createCrowdsaleTiers')).toBeDefined()
+    expect(deploymentStore.txMap.get('whitelist')).toBeDefined()
+    expect(deploymentStore.txMap.get('crowdsaleInit')).toBeDefined()
+    expect(deploymentStore.txMap.get('trackProxy')).toBeDefined()
+
+    const step = deploymentStore.setDeploymentStepStatus({ executionOrder: null, status: null })
+    expect(step).toBeUndefined()
+  })
+
+  it('should setDeploymentStepStatus II', () => {
+    deploymentStore.initialize(false, true, false, tiers, false)
+
+    expect(deploymentStore.txMap.get('deployProxy')).toBeDefined()
+    expect(deploymentStore.txMap.get('crowdsaleCreate')).toBeDefined()
+    expect(deploymentStore.txMap.get('token')).toBeDefined()
+    expect(deploymentStore.txMap.get('setReservedTokens')).toBeDefined()
+    expect(deploymentStore.txMap.get('updateGlobalMinContribution')).toBeDefined()
+    expect(deploymentStore.txMap.get('createCrowdsaleTiers')).toBeDefined()
+    expect(deploymentStore.txMap.get('whitelist')).toBeDefined()
+    expect(deploymentStore.txMap.get('crowdsaleInit')).toBeDefined()
+    expect(deploymentStore.txMap.get('trackProxy')).toBeDefined()
+
+    deploymentStore.setDeploymentStepStatus({ executionOrder: 0, status: 'active' })
+    deploymentStore.activeSteps.forEach((step, index) => {
+      if (step.name === 'deployProxy') {
+        expect(step.active).toBeTruthy()
+      } else {
+        expect(step.active).toBeFalsy()
+      }
+    })
+  })
+
+  it('should setDeploymentStepStatus III', () => {
+    deploymentStore.initialize(false, true, false, tiers, false)
+
+    expect(deploymentStore.txMap.get('deployProxy')).toBeDefined()
+    expect(deploymentStore.txMap.get('crowdsaleCreate')).toBeDefined()
+    expect(deploymentStore.txMap.get('token')).toBeDefined()
+    expect(deploymentStore.txMap.get('setReservedTokens')).toBeDefined()
+    expect(deploymentStore.txMap.get('updateGlobalMinContribution')).toBeDefined()
+    expect(deploymentStore.txMap.get('createCrowdsaleTiers')).toBeDefined()
+    expect(deploymentStore.txMap.get('whitelist')).toBeDefined()
+    expect(deploymentStore.txMap.get('crowdsaleInit')).toBeDefined()
+    expect(deploymentStore.txMap.get('trackProxy')).toBeDefined()
+
+    deploymentStore.setDeploymentStepStatus({ executionOrder: 1, status: 'active' })
+    deploymentStore.activeSteps.forEach((step, index) => {
+      if (step.name === 'crowdsaleCreate') {
+        expect(step.active).toBeTruthy()
+      } else {
+        expect(step.active).toBeFalsy()
+      }
+    })
+  })
+})
diff --git a/test/utils/api.spec.js b/test/utils/api.spec.js
new file mode 100644
index 000000000..10a9fbb32
--- /dev/null
+++ b/test/utils/api.spec.js
@@ -0,0 +1,11 @@
+import { gasPriceValues } from '../../src/utils/api'
+
+// jest.mock('../../src/utils/api')
+
+describe('Api spec', function() {
+  it(`Should get gas price values`, () => {
+    const gasPricevaluesPromised = async () => await gasPriceValues()
+
+    expect(typeof gasPricevaluesPromised()).toBe('object')
+  })
+})
diff --git a/test/utils/cancelDeploy.spec.js b/test/utils/cancelDeploy.spec.js
new file mode 100644
index 000000000..7e2f93bf0
--- /dev/null
+++ b/test/utils/cancelDeploy.spec.js
@@ -0,0 +1,15 @@
+import cancelDeploy from '../../src/utils/cancelDeploy'
+
+jest.mock('../../src/utils/alerts')
+
+describe('cancelDeploy test', () => {
+  it('should copy a content', async () => {
+    const window = global
+
+    window.localStorage.test = 'test'
+    expect(window.localStorage.test).toBe('test')
+
+    const results = await cancelDeploy()
+    expect(window.localStorage.test).toBeUndefined()
+  })
+})
diff --git a/test/utils/utils.spec.js b/test/utils/utils.spec.js
index 5f6922658..f1017be71 100644
--- a/test/utils/utils.spec.js
+++ b/test/utils/utils.spec.js
@@ -8,9 +8,16 @@ import {
   validateTier,
   navigateTo,
   downloadFile,
+  toFixed,
   goBackMustBeEnabled,
   goBack,
+  toast,
   convertLocationToPath,
+  convertDateToLocalTimezoneInUnix,
+  convertDateToUTCTimezoneToDisplay,
+  getContractBySourceType,
+  getSourceTypeTitle,
+  updateProxyContractInfo,
   uniqueElementsBy
 } from '../../src/utils/utils'
 
@@ -355,4 +362,66 @@ describe('Utils', () => {
       })
     })
   })
+
+  describe('toFixed', () => {
+    let testsValues = [
+      { value: '1.123', expected: '1.123' },
+      { value: '1.12', expected: '1.12' },
+      { value: '1.', expected: '1.' },
+      { value: '1', expected: '1' },
+      { value: '.123', expected: '.123' },
+      { value: 0.123, expected: 0.123 },
+      { value: '1e-3', expected: '0.001' },
+      { value: '1e-2', expected: '0.01' },
+      { value: '1.2e-2', expected: '0.012' },
+      { value: '1.e-2', expected: '0.01' },
+      { value: '1.e-22', expected: '0.0000000000000000000001' },
+      { value: '1.23123e2', expected: '1.23123e2' },
+      { value: '123.123e+2', expected: '123.123e+2' },
+      { value: 123.123e2, expected: 12312.3 },
+      { value: '.2e-2', expected: '0.002' },
+      { value: '1', expected: '1' },
+      { value: '123', expected: '123' },
+      { value: '0', expected: '0' },
+      { value: '-123', expected: '-123' },
+      { value: 'abc', expected: 'abc' },
+      { value: 'e', expected: 'e' },
+      { value: '', expected: '' }
+    ]
+    testsValues.forEach(testCase => {
+      it(`Should apply toFixed to ${testCase.value}`, () => {
+        expect(toFixed(testCase.value)).toBe(testCase.expected)
+      })
+    })
+  })
+
+  describe('toast', () => {
+    it(`Should use toast with empty message and return undefined`, () => {
+      expect(toast.showToaster({ message: '' })).toBeUndefined()
+    })
+
+    it(`Should use toast with a message and return undefined`, () => {
+      toast.showToaster({ message: 'heelo' })
+      expect(toast.msg.info).toBeUndefined()
+    })
+
+    it(`Should use toast with a message and return a valid message`, () => {
+      toast.msg = {
+        info: (message, options) => {
+          return message
+        }
+      }
+      toast.showToaster({ message: 'hello' })
+      expect(toast.msg.info()).toBeUndefined()
+    })
+  })
+
+  describe('convertDateToLocalTimezoneInUnix', function() {
+    let testsValues = [{ value: '2018-10-10' }, { value: '2018-01-01' }]
+    testsValues.forEach(testCase => {
+      it(`Should apply toFixed to ${testCase.value}`, () => {
+        expect(typeof convertDateToLocalTimezoneInUnix(testCase.value)).toBe('number')
+      })
+    })
+  })
 })